Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OFFI-78: Support different base path for OC app #386

Merged
merged 13 commits into from
Jul 17, 2024
Merged

OFFI-78: Support different base path for OC app #386

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
431459c
Support different base uris
wAsnk Jul 6, 2024
93fb7aa
Adding possibility for giving basepath prefix
wAsnk Jul 6, 2024
1b9b670
Using new property instead
wAsnk Jul 7, 2024
046d4ab
We do not use this variable
wAsnk Jul 7, 2024
f22080d
Fixing "S3878: Remove this array creation and simply pass the element…
wAsnk Jul 7, 2024
89910f9
Merge remote-tracking branch 'origin/dev' into issue/OFFI-78
wAsnk Jul 7, 2024
53ca9ba
We are going in circles bro
wAsnk Jul 7, 2024
6d65d81
Merge remote-tracking branch 'origin/dev' into issue/OFFI-78
sarahelsaig Jul 16, 2024
1d743e6
Going back one circle
wAsnk Jul 16, 2024
1c565e9
Improvements ✨
wAsnk Jul 16, 2024
a173cc7
Reverting
wAsnk Jul 16, 2024
b0aea17
Using UrlPrefix
wAsnk Jul 16, 2024
f0bafc4
Apply suggestions from code review
sarahelsaig Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Lombiq.Tests.UI/BasicOrchardFeaturesTesting/MediaOperationsTestingUITestContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static Task TestMediaOperationsAsync(this UITestContext context) =>
context.Exists(By.XPath($"//span[contains(text(), '{imageName}')]"));

await context
.Get(By.CssSelector($"a[href=\"/media/{imageName}\"]").OfAnyVisibility())
sarahelsaig marked this conversation as resolved.
Show resolved Hide resolved
.Get(By.CssSelector($"a[href=\"{context.UrlPrefix}/media/{imageName}\"]").OfAnyVisibility())
sarahelsaig marked this conversation as resolved.
Show resolved Hide resolved
.ClickReliablyAsync(context);
// Closing the newly opened tab with the image, so the browser doesn't continue to switch the UI back
// and forth.
Expand All @@ -56,7 +56,7 @@ await context
.ClickReliablyAsync(context);

await context
.Get(By.CssSelector($"a[href=\"/media/{documentName}\"]"))
.Get(By.CssSelector($"a[href=\"{context.UrlPrefix}/media/{documentName}\"]"))
sarahelsaig marked this conversation as resolved.
Show resolved Hide resolved
.ClickReliablyAsync(context);
context.SwitchToLastWindow();
context.Driver.Close();
Expand Down
6 changes: 5 additions & 1 deletion Lombiq.Tests.UI/SecurityScanning/SecurityScanConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,11 @@ internal async Task ApplyToPlanAsync(YamlDocument yamlDocument, UITestContext co
// pollPostData: ""
}

yamlDocument.AddExcludePathsRegex([.. _excludedUrlRegexPatterns]);
// We can do this or use collection expression which results S3878: Remove this array creation and simply pass
// the elements.
#pragma warning disable IDE0305 // IDE0305: Collection initialization can be simplified
yamlDocument.AddExcludePathsRegex(_excludedUrlRegexPatterns.ToArray());
#pragma warning restore IDE0305
if (AdminIsExcluded) yamlDocument.AddExcludePathsRegex($".*{context.AdminUrlPrefix}.*");

if (UnusedDatabaseTechnologiesAreExcluded)
Expand Down