Privacy Policy
diff --git a/src/OrchardCore.Themes/TheAgencyTheme/Recipes/Snippets/landingpage.liquid b/src/OrchardCore.Themes/TheAgencyTheme/Recipes/Snippets/landingpage.liquid
index eca0a8227a0..52d7ddc96fd 100644
--- a/src/OrchardCore.Themes/TheAgencyTheme/Recipes/Snippets/landingpage.liquid
+++ b/src/OrchardCore.Themes/TheAgencyTheme/Recipes/Snippets/landingpage.liquid
@@ -118,17 +118,17 @@
{{ member.DisplayText }}
{{ member.TeamMember.Occupation.Text }}
{% if member.TeamMember.Twitter.Text.size > 0 %} - + {% endif %} {% if member.TeamMember.Facebook.Text.size > 0 %} - + {% endif %} {% if member.TeamMember.LinkedIn.Text.size > 0 %} - + {% endif %} @@ -152,8 +152,8 @@
{% for client in Model.ContentItem.Content.Clients.ContentItems %}
{% endfor %}
diff --git a/src/OrchardCore.Themes/TheBlogTheme/Recipes/Snippets/footer.html b/src/OrchardCore.Themes/TheBlogTheme/Recipes/Snippets/footer.html
index e62908b413a..3ff6cea2c27 100644
--- a/src/OrchardCore.Themes/TheBlogTheme/Recipes/Snippets/footer.html
+++ b/src/OrchardCore.Themes/TheBlogTheme/Recipes/Snippets/footer.html
@@ -4,7 +4,7 @@
- - + @@ -12,7 +12,7 @@
- - + @@ -20,7 +20,7 @@
-
-
+
diff --git a/src/docs/resources/libraries/README.md b/src/docs/resources/libraries/README.md
index 3cc2f3a2336..a0c922d8a9a 100644
--- a/src/docs/resources/libraries/README.md
+++ b/src/docs/resources/libraries/README.md
@@ -18,6 +18,7 @@ The below table lists the different .NET libraries used in Orchard Core:
| [Image Sharp](https://github.com/SixLabors/ImageSharp.Web) | Middleware for ASP.NET-Core for image manipulation. | 2.0.2 |[Apache-2.0](https://github.com/SixLabors/ImageSharp.Web/blob/master/LICENSE) |
| [Irony.Core](https://github.com/daxnet/irony) | A modified version of the Irony project with .NET Core support | 1.0.7 | [MIT](https://github.com/daxnet/irony/blob/master/LICENSE) |
| [Jint](https://github.com/sebastienros/jint) | Javascript Interpreter for .NET. | 3.0.0-beta-2043 | [MIT](https://github.com/sebastienros/jint/blob/dev/LICENSE) |
+| [Lombiq UI Testing Toolbox for Orchard Core](https://github.com/Lombiq/UI-Testing-Toolbox) | Web UI testing toolbox for Orchard Core applications with Selenium. | 4.0.1 | [BSD-3-Clause](https://github.com/Lombiq/UI-Testing-Toolbox/blob/dev/License.md) |
| [Lorem.NET for netstandard](https://github.com/trichards57/Lorem.Universal.NET) | A .NET library for all things random! | 4.0.80 | [MIT](https://github.com/trichards57/Lorem.Universal.NET/blob/master/license.md) |
| [Lucene.Net](https://github.com/apache/lucenenet) | .NET full-text search engine. | 4.8.0-beta00016 | [Apache-2.0](https://github.com/apache/lucenenet/blob/master/LICENSE.txt) |
| [MailKit](https://github.com/jstedfast/MailKit) | A cross-platform .NET library for IMAP, POP3, and SMTP. | 3.4.2 | [MIT](https://github.com/jstedfast/MailKit/blob/master/LICENSE) |
diff --git a/test/OrchardCore.Tests.UI.Mvc/NLog.config b/test/OrchardCore.Tests.UI.Mvc/NLog.config
new file mode 100644
index 00000000000..80b2911a6f4
--- /dev/null
+++ b/test/OrchardCore.Tests.UI.Mvc/NLog.config
@@ -0,0 +1,34 @@
+
+
+ + diff --git a/test/OrchardCore.Tests.UI.Mvc/OrchardCore.Tests.UI.Mvc.csproj b/test/OrchardCore.Tests.UI.Mvc/OrchardCore.Tests.UI.Mvc.csproj new file mode 100644 index 00000000000..4efda2038fe --- /dev/null +++ b/test/OrchardCore.Tests.UI.Mvc/OrchardCore.Tests.UI.Mvc.csproj @@ -0,0 +1,35 @@ ++ + ++ + + + + ++ + + + + + + ++ + + + + + diff --git a/test/OrchardCore.Tests.UI.Mvc/OrchardCore.Tests.UI.Mvc.sln b/test/OrchardCore.Tests.UI.Mvc/OrchardCore.Tests.UI.Mvc.sln new file mode 100644 index 00000000000..ddca45a4046 --- /dev/null +++ b/test/OrchardCore.Tests.UI.Mvc/OrchardCore.Tests.UI.Mvc.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Tests.UI.Mvc", "OrchardCore.Tests.UI.Mvc.csproj", "{7CE77458-A686-408A-98D5-6E0C29C469A9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7CE77458-A686-408A-98D5-6E0C29C469A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7CE77458-A686-408A-98D5-6E0C29C469A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7CE77458-A686-408A-98D5-6E0C29C469A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7CE77458-A686-408A-98D5-6E0C29C469A9}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D84ED0CF-D93B-43DC-A064-8FFE6C0C16FD} + EndGlobalSection +EndGlobal diff --git a/test/OrchardCore.Tests.UI.Mvc/Tests/MvcTests.cs b/test/OrchardCore.Tests.UI.Mvc/Tests/MvcTests.cs new file mode 100644 index 00000000000..43508557ae1 --- /dev/null +++ b/test/OrchardCore.Tests.UI.Mvc/Tests/MvcTests.cs @@ -0,0 +1,40 @@ +using System; +using System.Threading.Tasks; +using Lombiq.Tests.UI; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Services; +using OpenQA.Selenium; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class MvcTests : OrchardCoreUITestBase+ + + + +$(CommonTargetFrameworks) +false ++ + ++ + + ++ +PreserveNewest +true +PreserveNewest ++ + ++ + + + + ++ + + + + { + public MvcTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithBlank(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.GoToRelativeUrlAsync("/"); + Assert.Equal("Hello World", context.Get(By.TagName("h1")).Text); + }, + browser, + configuration => + { + configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false; + return Task.CompletedTask; + }); + + protected override Task ExecuteTestAfterSetupAsync(Func + + diff --git a/test/OrchardCore.Tests.UI/OrchardCore.Tests.UI.sln b/test/OrchardCore.Tests.UI/OrchardCore.Tests.UI.sln new file mode 100644 index 00000000000..26402c557e1 --- /dev/null +++ b/test/OrchardCore.Tests.UI/OrchardCore.Tests.UI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Tests.UI", "OrchardCore.Tests.UI.csproj", "{8F87345E-F88D-4EEC-8167-D575E64F9A72}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8F87345E-F88D-4EEC-8167-D575E64F9A72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8F87345E-F88D-4EEC-8167-D575E64F9A72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8F87345E-F88D-4EEC-8167-D575E64F9A72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8F87345E-F88D-4EEC-8167-D575E64F9A72}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {170EBED0-4781-43B5-8E5B-A09C84EDC4B2} + EndGlobalSection +EndGlobal diff --git a/test/OrchardCore.Tests.UI/Recipes/Agency.Tests.recipe.json b/test/OrchardCore.Tests.UI/Recipes/Agency.Tests.recipe.json new file mode 100644 index 00000000000..db238840008 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Recipes/Agency.Tests.recipe.json @@ -0,0 +1,26 @@ +{ + "name": "Agency.Tests", + "displayName": "Agency Tests", + "description": "Setup recipe for automated UI test execution using the Agency recipe.", + "author": "The Orchard Core Team", + "website": "https://orchardcore.net", + "version": "1.0.0", + "issetuprecipe": true, + "categories": [ "test" ], + "tags": [ "agency", "test" ], + "steps": [ + { + "name": "recipes", + "Values": [ + { + "executionid": "OrchardCore.Tests.UI", + "name": "Agency" + }, + { + "executionid": "OrchardCore.Tests.UI", + "name": "Configuration.Tests" + } + ] + } + ] +} diff --git a/test/OrchardCore.Tests.UI/Recipes/Blank.Tests.recipe.json b/test/OrchardCore.Tests.UI/Recipes/Blank.Tests.recipe.json new file mode 100644 index 00000000000..508b9502bb4 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Recipes/Blank.Tests.recipe.json @@ -0,0 +1,26 @@ +{ + "name": "Blank.Tests", + "displayName": "Blank Tests", + "description": "Setup recipe for automated UI test execution using the Blank recipe.", + "author": "The Orchard Core Team", + "website": "https://orchardcore.net", + "version": "1.0.0", + "issetuprecipe": true, + "categories": [ "test" ], + "tags": [ "agency", "test" ], + "steps": [ + { + "name": "recipes", + "Values": [ + { + "executionid": "OrchardCore.Tests.UI", + "name": "Blank" + }, + { + "executionid": "OrchardCore.Tests.UI", + "name": "Configuration.Tests" + } + ] + } + ] +} diff --git a/test/OrchardCore.Tests.UI/Recipes/Blog.Tests.recipe.json b/test/OrchardCore.Tests.UI/Recipes/Blog.Tests.recipe.json new file mode 100644 index 00000000000..b0a607bd144 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Recipes/Blog.Tests.recipe.json @@ -0,0 +1,26 @@ +{ + "name": "Blog.Tests", + "displayName": "Blog Tests", + "description": "Setup recipe for automated UI test execution using the Blog recipe.", + "author": "The Orchard Core Team", + "website": "https://orchardcore.net", + "version": "1.0.0", + "issetuprecipe": true, + "categories": [ "test" ], + "tags": [ "blog", "test" ], + "steps": [ + { + "name": "recipes", + "Values": [ + { + "executionid": "OrchardCore.Tests.UI", + "name": "Blog" + }, + { + "executionid": "OrchardCore.Tests.UI", + "name": "Configuration.Tests" + } + ] + } + ] +} diff --git a/test/OrchardCore.Tests.UI/Recipes/ComingSoon.Tests.recipe.json b/test/OrchardCore.Tests.UI/Recipes/ComingSoon.Tests.recipe.json new file mode 100644 index 00000000000..68293c15e5a --- /dev/null +++ b/test/OrchardCore.Tests.UI/Recipes/ComingSoon.Tests.recipe.json @@ -0,0 +1,26 @@ +{ + "name": "ComingSoon.Tests", + "displayName": "Coming Soon Tests", + "description": "Setup recipe for automated UI test execution using the Coming Soon recipe.", + "author": "The Orchard Core Team", + "website": "https://orchardcore.net", + "version": "1.0.0", + "issetuprecipe": true, + "categories": [ "test" ], + "tags": [ "comingsoon", "test" ], + "steps": [ + { + "name": "recipes", + "Values": [ + { + "executionid": "OrchardCore.Tests.UI", + "name": "ComingSoon" + }, + { + "executionid": "OrchardCore.Tests.UI", + "name": "Configuration.Tests" + } + ] + } + ] +} diff --git a/test/OrchardCore.Tests.UI/Recipes/Configuration.Tests.recipe.json b/test/OrchardCore.Tests.UI/Recipes/Configuration.Tests.recipe.json new file mode 100644 index 00000000000..e972c5a20c2 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Recipes/Configuration.Tests.recipe.json @@ -0,0 +1,50 @@ +{ + "name": "Configuration.Tests", + "displayName": "Configuration Tests", + "description": "Common configuration necessary for UI tests.", + "author": "The Orchard Core Team", + "website": "https://orchardcore.net", + "version": "1.0.0", + "issetuprecipe": false, + "categories": [ "test" ], + "tags": [ "blog", "test" ], + "steps": [ + { + "name": "feature", + "enable": [ + "OrchardCore.Localization", + "OrchardCore.Users.Registration" + ] + }, + { + "name": "settings", + "UseCdn": false, + "SmtpSettings": { + "DefaultSender": "sender@example.com" + }, + "LocalizationSettings": { + "DefaultCulture": "en-US", + "SupportedCultures": [ + "en-US" + ] + }, + "RegistrationSettings": { + "UsersCanRegister": 1, + "UsersMustValidateEmail": false, + "UsersAreModerated": false + } + }, + { + "name": "Roles", + "Roles": [ + { + "Name": "Anonymous", + "Description": "Anonymous role", + "Permissions": [ + "ViewContent" + ] + } + ] + } + ] +} diff --git a/test/OrchardCore.Tests.UI/Recipes/Headless.Tests.recipe.json b/test/OrchardCore.Tests.UI/Recipes/Headless.Tests.recipe.json new file mode 100644 index 00000000000..6026ffbd1f1 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Recipes/Headless.Tests.recipe.json @@ -0,0 +1,26 @@ +{ + "name": "Headless.Tests", + "displayName": "Headless Tests", + "description": "Setup recipe for automated UI test execution using the Headless recipe.", + "author": "The Orchard Core Team", + "website": "https://orchardcore.net", + "version": "1.0.0", + "issetuprecipe": true, + "categories": [ "test" ], + "tags": [ "agency", "test" ], + "steps": [ + { + "name": "recipes", + "Values": [ + { + "executionid": "OrchardCore.Tests.UI", + "name": "Headless" + }, + { + "executionid": "OrchardCore.Tests.UI", + "name": "Configuration.Tests" + } + ] + } + ] +} diff --git a/test/OrchardCore.Tests.UI/Recipes/SaaS.Tests.recipe.json b/test/OrchardCore.Tests.UI/Recipes/SaaS.Tests.recipe.json new file mode 100644 index 00000000000..4ca20a1753d --- /dev/null +++ b/test/OrchardCore.Tests.UI/Recipes/SaaS.Tests.recipe.json @@ -0,0 +1,26 @@ +{ + "name": "SaaS.Tests", + "displayName": "SaaS Tests", + "description": "Setup recipe for automated UI test execution using the SaaS recipe.", + "author": "The Orchard Core Team", + "website": "https://orchardcore.net", + "version": "1.0.0", + "issetuprecipe": true, + "categories": [ "test" ], + "tags": [ "developer", "test" ], + "steps": [ + { + "name": "recipes", + "Values": [ + { + "executionid": "OrchardCore.Tests.UI", + "name": "SaaS" + }, + { + "executionid": "OrchardCore.Tests.UI", + "name": "Configuration.Tests" + } + ] + } + ] +} diff --git a/test/OrchardCore.Tests.UI/Tests/AdminMonkeyTests.cs b/test/OrchardCore.Tests.UI/Tests/AdminMonkeyTests.cs new file mode 100644 index 00000000000..15f4b992c22 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/AdminMonkeyTests.cs @@ -0,0 +1,63 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using Atata; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.MonkeyTesting; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using OpenQA.Selenium; +using Shouldly; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class AdminMonkeyTests : UITestBase + { + public AdminMonkeyTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task TestAdminPagesAsMonkeyRecursivelyShouldWorkWithAdminUser(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.GoToSetupPageAndSetupOrchardCoreAsync( + new OrchardCoreSetupParameters(context) + { + SiteName = "Orchard Core - UI Testing", + RecipeId = "Blog.Tests", + SiteTimeZoneValue = "America/New_York", + }.ConfigureDatabaseSettings(context)); + + await context.TestAdminAsMonkeyRecursivelyAsync( + new MonkeyTestingOptions + { + PageTestTime = TimeSpan.FromSeconds(10) + }); + }, + browser, + configuration => + { + configuration.AccessibilityCheckingConfiguration.RunAccessibilityCheckingAssertionOnAllPageChanges = false; + + // This is necessary to work around this bug: https://github.com/OrchardCMS/OrchardCore/issues/11420. + configuration.AssertBrowserLog = logEntries => logEntries.ShouldNotContain( + logEntry => IsValidAdminBrowserLogEntry(logEntry), + logEntries.Where(IsValidAdminBrowserLogEntry).ToFormattedString()); + + return Task.CompletedTask; + }); + + private static bool IsValidAdminBrowserLogEntry(LogEntry logEntry) + { + return OrchardCoreUITestExecutorConfiguration.IsValidBrowserLogEntry(logEntry) && + !logEntry.Message.ContainsOrdinalIgnoreCase( + "Blocked attempt to show a 'beforeunload' confirmation panel for a frame that never had a user gesture since its load."); + } + } +} diff --git a/test/OrchardCore.Tests.UI/Tests/AgencyRecipeTests.cs b/test/OrchardCore.Tests.UI/Tests/AgencyRecipeTests.cs new file mode 100644 index 00000000000..f346aeecae2 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/AgencyRecipeTests.cs @@ -0,0 +1,73 @@ +using System.Threading.Tasks; +using Atata; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using OpenQA.Selenium; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class AgencyRecipeTests : UITestBase + { + public AgencyRecipeTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithAgency(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.TestSetupAsync(new OrchardCoreSetupParameters(context) + { + RecipeId = "Agency.Tests", + }.ConfigureDatabaseSettings(context)); + + await context.TestRegistrationWithInvalidDataAsync(); + await context.TestRegistrationAsync(); + await context.TestRegistrationWithAlreadyRegisteredEmailAsync(); + await context.TestLoginWithInvalidDataAsync(); + await context.TestLoginAsync(); + + // This is similar to BasicOrchardFeaturesTestingUITestContextExtensions.TestContentOperationsAsync(), + // but the original method can only check page titles that are inside an+ + + + +$(CommonTargetFrameworks) +false ++ + ++ + + + + + + + + + +Always ++ +PreserveNewest ++ +PreserveNewest ++ +PreserveNewest ++ +PreserveNewest ++ +PreserveNewest ++ +PreserveNewest ++ +PreserveNewest ++ +PreserveNewest ++ + ++ + + + + + ++ + + HTML tag. Here the page + // title is inside a
HTML tag. + var pageTitle = "Test page"; + + var contentItemsPage = await context.GoToContentItemsPageAsync(); + context.RefreshCurrentAtataContext(); + contentItemsPage + .CreateNewPage() + .Title.Set(pageTitle) + .Publish.ClickAndGo() + .AlertMessages.Should.Contain(message => message.IsSuccess) + .Items[item => item.Title == pageTitle].View.Click(); + + var page = new OrdinaryPage(pageTitle); + context.Scope.AtataContext.Go.ToNextWindow(page) + .AggregateAssert(page => page + .PageTitle.Should.Contain(pageTitle)); + + context.Driver.Exists(By.XPath($"//div[contains(text(), '" + pageTitle + "')]").Visible()); + + page.CloseWindow(); + + await context.TestTurningFeatureOnAndOffAsync(); + await context.TestLogoutAsync(); + }, + browser, + configuration => + { + configuration.AccessibilityCheckingConfiguration.AxeBuilderConfigurator += axeBuilder => + AccessibilityCheckingConfiguration + .ConfigureWcag21aa(axeBuilder) + .DisableRules("color-contrast"); + + return Task.CompletedTask; + }); + } +} diff --git a/test/OrchardCore.Tests.UI/Tests/AzureBlobStorageTests.cs b/test/OrchardCore.Tests.UI/Tests/AzureBlobStorageTests.cs new file mode 100644 index 00000000000..8e5ba1b2a81 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/AzureBlobStorageTests.cs @@ -0,0 +1,43 @@ +using System.Threading.Tasks; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class AzureBlobStorageTests : UITestBase + { + public AzureBlobStorageTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithBlogAndAzureBlobStorage(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.TestSetupAsync(new OrchardCoreSetupParameters(context) + { + RecipeId = "Blog.Tests", + }.ConfigureDatabaseSettings(context)); + + await context.TestBasicOrchardFeaturesExceptSetupAsync(); + }, + browser, + configuration => + { + configuration.UseAzureBlobStorage = true; + + configuration.AccessibilityCheckingConfiguration.AxeBuilderConfigurator += axeBuilder => + AccessibilityCheckingConfiguration + .ConfigureWcag21aa(axeBuilder) + .DisableRules("color-contrast"); + + return Task.CompletedTask; + }); + } +} diff --git a/test/OrchardCore.Tests.UI/Tests/BlankRecipeTests.cs b/test/OrchardCore.Tests.UI/Tests/BlankRecipeTests.cs new file mode 100644 index 00000000000..61dade3bf1d --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/BlankRecipeTests.cs @@ -0,0 +1,56 @@ +using System.Linq; +using System.Threading.Tasks; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using OpenQA.Selenium; +using Shouldly; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class BlankRecipeTests : UITestBase + { + public BlankRecipeTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithBlank(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.TestSetupAsync(new OrchardCoreSetupParameters(context) + { + RecipeId = "Blank.Tests", + }.ConfigureDatabaseSettings(context)); + + await context.TestLoginWithInvalidDataAsync(); + await context.TestLoginAsync(); + await context.TestTurningFeatureOnAndOffAsync(); + await context.TestLogoutAsync(); + }, + browser, + configuration => + { + configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false; + configuration.AccessibilityCheckingConfiguration.RunAccessibilityCheckingAssertionOnAllPageChanges = false; + + configuration.AssertBrowserLog = logEntries => + logEntries.ShouldNotContain( + logEntry => IsValidBrowserLogEntry(logEntry), + logEntries.Where(IsValidBrowserLogEntry).ToFormattedString()); + + return Task.CompletedTask; + }); + + private static bool IsValidBrowserLogEntry(LogEntry logEntry) + { + return OrchardCoreUITestExecutorConfiguration.IsValidBrowserLogEntry(logEntry) && + !logEntry.IsNotFoundLogEntry("/"); + } + } +} diff --git a/test/OrchardCore.Tests.UI/Tests/BlogRecipeTests.cs b/test/OrchardCore.Tests.UI/Tests/BlogRecipeTests.cs new file mode 100644 index 00000000000..24a346a3da0 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/BlogRecipeTests.cs @@ -0,0 +1,48 @@ +using System.Threading.Tasks; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using OpenQA.Selenium; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class BlogRecipeTests : UITestBase + { + public BlogRecipeTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithBlog(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.TestSetupAsync(new OrchardCoreSetupParameters(context) + { + RecipeId = "Blog.Tests", + }.ConfigureDatabaseSettings(context)); + + await context.TestBasicOrchardFeaturesExceptSetupAsync(); + }, + browser, + configuration => + { + configuration.AccessibilityCheckingConfiguration.AxeBuilderConfigurator += axeBuilder => + AccessibilityCheckingConfiguration + .ConfigureWcag21aa(axeBuilder) + .DisableRules("color-contrast"); + + return Task.CompletedTask; + }); + + [Theory(Skip = "Used to test artifact creation during build."), Chrome] + public Task IntentionallyFailingTest(Browser browser) => + ExecuteTestAfterSetupAsync( + context => context.Exists(By.Id("navbarasdfds")), + browser); + } +} diff --git a/test/OrchardCore.Tests.UI/Tests/ComingSoonRecipeTests.cs b/test/OrchardCore.Tests.UI/Tests/ComingSoonRecipeTests.cs new file mode 100644 index 00000000000..12f76caa987 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/ComingSoonRecipeTests.cs @@ -0,0 +1,44 @@ +using System.Threading.Tasks; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class ComingSoonRecipeTests : UITestBase + { + public ComingSoonRecipeTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithComingSoon(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.TestSetupAsync(new OrchardCoreSetupParameters(context) + { + RecipeId = "ComingSoon.Tests", + }.ConfigureDatabaseSettings(context)); + + await context.TestRegistrationWithInvalidDataAsync(); + await context.TestRegistrationAsync(); + await context.TestRegistrationWithAlreadyRegisteredEmailAsync(); + await context.TestLoginWithInvalidDataAsync(); + await context.TestLoginAsync(); + await context.TestTurningFeatureOnAndOffAsync(); + await context.TestLogoutAsync(); + }, + browser, + configuration => + { + // Axe crashes the WebDriver on the second page load for some reason. + configuration.AccessibilityCheckingConfiguration.RunAccessibilityCheckingAssertionOnAllPageChanges = false; + return Task.CompletedTask; + }); + } +} diff --git a/test/OrchardCore.Tests.UI/Tests/HeadlessRecipeTests.cs b/test/OrchardCore.Tests.UI/Tests/HeadlessRecipeTests.cs new file mode 100644 index 00000000000..eee1cc02ef7 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/HeadlessRecipeTests.cs @@ -0,0 +1,41 @@ +using System.Threading.Tasks; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class HeadlessRecipeTests : UITestBase + { + public HeadlessRecipeTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithHeadless(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.TestSetupAsync(new OrchardCoreSetupParameters(context) + { + RecipeId = "Headless.Tests", + }.ConfigureDatabaseSettings(context)); + + await context.TestLoginWithInvalidDataAsync(); + await context.TestLoginAsync(); + await context.TestTurningFeatureOnAndOffAsync(); + await context.TestLogoutAsync(); + }, + browser, + configuration => + { + configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false; + configuration.AccessibilityCheckingConfiguration.RunAccessibilityCheckingAssertionOnAllPageChanges = false; + return Task.CompletedTask; + }); + } +} diff --git a/test/OrchardCore.Tests.UI/Tests/InvalidSetupTests.cs b/test/OrchardCore.Tests.UI/Tests/InvalidSetupTests.cs new file mode 100644 index 00000000000..27254739c95 --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/InvalidSetupTests.cs @@ -0,0 +1,33 @@ +using System; +using System.Threading.Tasks; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class InvalidSetupTests : UITestBase + { + public InvalidSetupTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task SetupWithInvalidDataShouldFail(Browser browser) => + ExecuteTestAsync( + context => context.TestSetupWithInvalidDataAsync( + new OrchardCoreSetupParameters(context) + { + SiteName = String.Empty, + UserName = String.Empty, + Email = String.Empty, + Password = String.Empty, + }.ConfigureDatabaseSettings(context)), + browser); + } +} + diff --git a/test/OrchardCore.Tests.UI/Tests/SaaSRecipeTests.cs b/test/OrchardCore.Tests.UI/Tests/SaaSRecipeTests.cs new file mode 100644 index 00000000000..3cfa04a29ec --- /dev/null +++ b/test/OrchardCore.Tests.UI/Tests/SaaSRecipeTests.cs @@ -0,0 +1,79 @@ +using System.Threading.Tasks; +using Lombiq.Tests.UI.Attributes; +using Lombiq.Tests.UI.Extensions; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using Xunit; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI.Tests +{ + public class SaaSRecipeTests : UITestBase + { + public SaaSRecipeTests(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithSaaS(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.TestSetupAsync(new OrchardCoreSetupParameters(context) + { + RecipeId = "SaaS.Tests", + }.ConfigureDatabaseSettings(context)); + + await context.TestRegistrationWithInvalidDataAsync(); + await context.TestRegistrationAsync(); + await context.TestRegistrationWithAlreadyRegisteredEmailAsync(); + await context.TestLoginWithInvalidDataAsync(); + await context.TestLoginAsync(); + await context.TestTurningFeatureOnAndOffAsync(); + await context.TestLogoutAsync(); + }, + browser); + + [Theory, Chrome] + public Task BasicOrchardFeaturesShouldWorkWithNewTenant(Browser browser) => + ExecuteTestAsync( + async context => + { + await context.GoToSetupPageAndSetupOrchardCoreAsync( + new OrchardCoreSetupParameters(context) + { + SiteName = "Orchard Core - UI Testing", + RecipeId = "SaaS.Tests", + SiteTimeZoneValue = "America/New_York", + }.ConfigureDatabaseSettings(context)); + + await context.SignInDirectlyAsync(); + + await context.CreateAndSwitchToTenantManuallyAsync("test", "test"); + + var tenantSetupParameters = new OrchardCoreSetupParameters(context) + { + SiteName = "Test Tenant", + RecipeId = "Blog.Tests", + RunSetupOnCurrentPage = true, + }.ConfigureDatabaseSettings(context); + + tenantSetupParameters.TablePrefix += "t2"; + + await context.GoToSetupPageAndSetupOrchardCoreAsync(tenantSetupParameters); + + await context.TestBasicOrchardFeaturesExceptSetupAsync(); + }, + browser, + configuration => + { + configuration.AccessibilityCheckingConfiguration.AxeBuilderConfigurator += axeBuilder => + AccessibilityCheckingConfiguration + .ConfigureWcag21aa(axeBuilder) + .DisableRules("color-contrast"); + + return Task.CompletedTask; + }); + } +} diff --git a/test/OrchardCore.Tests.UI/UITestBase.cs b/test/OrchardCore.Tests.UI/UITestBase.cs new file mode 100644 index 00000000000..9c9e32943f6 --- /dev/null +++ b/test/OrchardCore.Tests.UI/UITestBase.cs @@ -0,0 +1,55 @@ +using System; +using System.Threading.Tasks; +using Lombiq.Tests.UI; +using Lombiq.Tests.UI.Pages; +using Lombiq.Tests.UI.Services; +using OrchardCore.Tests.UI.Helpers; +using Xunit.Abstractions; + +namespace OrchardCore.Tests.UI +{ + public class UITestBase : OrchardCoreUITestBase+ { + protected UITestBase(ITestOutputHelper testOutputHelper) + : base(testOutputHelper) + { + } + + protected override Task ExecuteTestAfterSetupAsync( + Func