diff --git a/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj b/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj index 29ed7ff4e..cbbe2a718 100644 --- a/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj +++ b/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj @@ -29,7 +29,7 @@ - + @@ -47,8 +47,8 @@ - - + + diff --git a/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Program.cs b/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Program.cs index 564ac2143..30c54fa7f 100644 --- a/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Program.cs +++ b/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Program.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Logging; using System.Collections.Generic; @@ -13,20 +12,15 @@ builder.Services .AddSingleton(configuration) - .AddOrchardCms(orchardCoreBuilder => - { - orchardCoreBuilder.AuthorizeApiRequestsIfEnabled(configuration); - orchardCoreBuilder.ConfigureFeaturesGuard( + .AddOrchardCms(orchardCoreBuilder => orchardCoreBuilder + .AddOrchardCoreApplicationInsightsTelemetry(configuration) + .AuthorizeApiRequestsIfEnabled(configuration) + .ConfigureFeaturesGuard( new Dictionary> { ["OrchardCore.Twitter"] = new[] { "Lombiq.UIKit", "Lombiq.ChartJs" }, - }); - - if (!configuration.IsUITesting()) - { - orchardCoreBuilder.AddSetupFeatures("OrchardCore.AutoSetup"); - } - }); + }) + .EnableAutoSetupIfNotUITesting(configuration)); var app = builder.Build(); diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj index c5765ecb1..c5d1ce1bd 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj @@ -20,7 +20,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BasicOrchardFeaturesTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BasicOrchardFeaturesTests.cs index 2a63b0c39..3c554c4d5 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BasicOrchardFeaturesTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BasicOrchardFeaturesTests.cs @@ -1,6 +1,4 @@ -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,8 @@ public BasicOrchardFeaturesTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task BasicOrchardFeaturesShouldWork(Browser browser) => + [Fact] + public Task BasicOrchardFeaturesShouldWork() => ExecuteTestAsync( - context => context.TestBasicOrchardFeaturesExceptRegistrationAsync("Lombiq.OSOCE.NuGet.BasicOrchardFeaturesTests"), - browser); + context => context.TestBasicOrchardFeaturesExceptRegistrationAsync("Lombiq.OSOCE.NuGet.BasicOrchardFeaturesTests")); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BehaviorFileUploadTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BehaviorFileUploadTests.cs index 7c788082b..02863a9dc 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BehaviorFileUploadTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/BehaviorFileUploadTests.cs @@ -1,7 +1,5 @@ -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; using Lombiq.Tests.UI.Helpers; -using Lombiq.Tests.UI.Services; using OpenQA.Selenium; using Shouldly; using System.Threading.Tasks; @@ -17,8 +15,8 @@ public BehaviorFileUploadTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task SampleFilesShouldBeAccessible(Browser browser) => + [Fact] + public Task SampleFilesShouldBeAccessible() => ExecuteTestAfterSetupAsync( async context => { @@ -29,6 +27,5 @@ public Task SampleFilesShouldBeAccessible(Browser browser) => context.Get(By.CssSelector(".message-error")) .Text .ShouldContain("Only zip or json files are supported."); - }, - browser); + }); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/LibraryTests/BehaviorOrchardCoreApiClientTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/LibraryTests/BehaviorOrchardCoreApiClientTests.cs index a77386b54..f1cb6dbc4 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/LibraryTests/BehaviorOrchardCoreApiClientTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/LibraryTests/BehaviorOrchardCoreApiClientTests.cs @@ -1,6 +1,4 @@ using Lombiq.OrchardCoreApiClient.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorOrchardCoreApiClientTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task OrchardCoreApiClientShouldWork(Browser browser) => - ExecuteTestAfterSetupAsync( - async context => await context.TestOrchardCoreApiClientBehaviorAsync(), - browser); + [Fact] + public Task OrchardCoreApiClientShouldWork() => + ExecuteTestAfterSetupAsync(context => context.TestOrchardCoreApiClientBehaviorAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorApplicationInsightsTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorApplicationInsightsTests.cs index 96bcc4aa1..66b45c2a0 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorApplicationInsightsTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorApplicationInsightsTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI.TestCases; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,7 +12,7 @@ public BehaviorApplicationInsightsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ApplicationInsightsTrackingInOfflineOperationShouldWork(Browser browser) => - ApplicationInsightsTestCases.ApplicationInsightsTrackingInOfflineOperationShouldWorkAsync(ExecuteTestAfterSetupAsync, browser); + [Fact] + public Task ApplicationInsightsTrackingInOfflineOperationShouldWork() => + ApplicationInsightsTestCases.ApplicationInsightsTrackingInOfflineOperationShouldWorkAsync(ExecuteTestAfterSetupAsync); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorAsyncEditorTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorAsyncEditorTests.cs index d9580498e..e7ab8032b 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorAsyncEditorTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorAsyncEditorTests.cs @@ -1,8 +1,6 @@ using Lombiq.ContentEditors.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; using Lombiq.Tests.UI.Helpers; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -16,24 +14,22 @@ public BehaviorAsyncEditorTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task DemoContentItemAsyncEditorShouldWork(Browser browser) => + [Fact] + public Task DemoContentItemAsyncEditorShouldWork() => ExecuteTestAfterSetupAsync( async context => { await context.SignInDirectlyAsync(); await context.TestDemoContentItemAsyncEditorAsync(); - }, - browser); + }); - [Theory, Chrome] - public Task DemoFrontEndAsyncEditorShouldWork(Browser browser) => + [Fact] + public Task DemoFrontEndAsyncEditorShouldWork() => ExecuteTestAfterSetupAsync( async context => { await context.SignInDirectlyAsync(); await context.TestDemoFrontEndAsyncEditorAsync(); }, - browser, ConfigurationHelper.DisableHtmlValidation); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorChartJsTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorChartJsTests.cs index ab59feec1..603127a75 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorChartJsTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorChartJsTests.cs @@ -1,6 +1,4 @@ using Lombiq.ChartJs.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorChartJsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task RecipeDataShouldBeDisplayedCorrectly(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestChartJsSampleBehaviorAsync(), - browser); + [Fact] + public Task RecipeDataShouldBeDisplayedCorrectly() => + ExecuteTestAfterSetupAsync(context => context.TestChartJsSampleBehaviorAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorDataTableTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorDataTableTests.cs index 42f4dfb95..4a77ae8b9 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorDataTableTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorDataTableTests.cs @@ -1,6 +1,4 @@ using Lombiq.DataTables.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,6 @@ public BehaviorDataTableTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task DataTableShouldWork(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestDataTableRecipeDataAsync(), - browser); + [Fact] + public Task DataTableShouldWork() => ExecuteTestAfterSetupAsync(context => context.TestDataTableRecipeDataAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs index 04bf3f3be..51353c09a 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs @@ -1,6 +1,4 @@ -using Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; +using Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.Extensions; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,18 +12,16 @@ public BehaviorEmailQuotaTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task EmailQuotaShouldBlockEmailsOverLimitAndWarn(Browser browser) => + [Fact] + public Task EmailQuotaShouldBlockEmailsOverLimitAndWarn() => ExecuteTestAfterSetupAsync( context => context.TestEmailQuotaManagementBehaviorAsync(10), - browser, configuration => configuration.SetEmailQuotaManagementOptionsForUITest(10)); - [Theory, Chrome] - public Task EmailQuotaShouldNotBlockEmailsWhenDifferentHostIsUsedThanOriginalFromConfig(Browser browser) => + [Fact] + public Task EmailQuotaShouldNotBlockEmailsWhenDifferentHostIsUsedThanOriginalFromConfig() => ExecuteTestAfterSetupAsync( context => context.TestEmailQuotaManagementBehaviorAsync(1, moduleShouldInterfere: false), - browser, // The default SMTP host is localhost during UI tests, we set it to 127.0.0.1 to be able to send emails, // but the Email Quota module shouldn't interfere. configuration => configuration.SetEmailQuotaManagementOptionsForUITest(1, "127.0.0.1")); diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEnvironmentRobotsTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEnvironmentRobotsTests.cs index 21f80ccea..7c55b7dd3 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEnvironmentRobotsTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorEnvironmentRobotsTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,23 +12,20 @@ public BehaviorEnvironmentRobotsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task RobotsMetaTagShouldBeMissing(Browser browser) => + [Fact] + public Task RobotsMetaTagShouldBeMissing() => ExecuteTestAfterSetupAsync( - async context => await context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: true), - browser, + context => context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: true), configuration => configuration.SetEnvironmentRobotsOptionsConfiguration(isProduction: true)); - [Theory, Chrome] - public Task RobotsMetaTagShouldBeMissingWithoutConfiguration(Browser browser) => + [Fact] + public Task RobotsMetaTagShouldBeMissingWithoutConfiguration() => ExecuteTestAfterSetupAsync( - async context => await context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: false), - browser); + context => context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: false)); - [Theory, Chrome] - public Task RobotsMetaTagShouldBePresent(Browser browser) => + [Fact] + public Task RobotsMetaTagShouldBePresent() => ExecuteTestAfterSetupAsync( - async context => await context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: false), - browser, + context => context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: false), configuration => configuration.SetEnvironmentRobotsOptionsConfiguration(isProduction: false)); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorFeaturesGuardTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorFeaturesGuardTests.cs index 06c512a92..1b93c7e93 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorFeaturesGuardTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorFeaturesGuardTests.cs @@ -1,7 +1,5 @@ using Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.Extensions; using Lombiq.OSOCE.NuGet.Tests.UI.Helpers; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -18,16 +16,18 @@ public BehaviorFeaturesGuardTests(ITestOutputHelper testOutputHelper) // HTML validation is disabled as OC's login and dashboard pages contain several errors. See: // https://github.com/OrchardCMS/OrchardCore/issues/12271 // https://github.com/OrchardCMS/OrchardCore/issues/12271 - [Theory, Chrome] - public Task ForbiddenFeaturesShouldNotBeActivatableOnTenants(Browser browser) => - ExecuteTestAfterSetupAsync(context => context.TestForbiddenFeaturesAsync(SetupHelpers.RecipeId), browser, configuration => - configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false); + [Fact] + public Task ForbiddenFeaturesShouldNotBeActivatableOnTenants() => + ExecuteTestAfterSetupAsync( + context => context.TestForbiddenFeaturesAsync(SetupHelpers.RecipeId), + configuration => configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false); // HTML validation is disabled as OC's login and dashboard pages contain several errors. See: // https://github.com/OrchardCMS/OrchardCore/issues/12271 // https://github.com/OrchardCMS/OrchardCore/issues/12271 - [Theory, Chrome] - public Task ConditionallyEnabledFeaturesShouldWorkCorrectlyOnTenants(Browser browser) => - ExecuteTestAfterSetupAsync(context => context.TestConditionallyEnabledFeaturesAsync(SetupHelpers.RecipeId), browser, configuration => - configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false); + [Fact] + public Task ConditionallyEnabledFeaturesShouldWorkCorrectlyOnTenants() => + ExecuteTestAfterSetupAsync( + context => context.TestConditionallyEnabledFeaturesAsync(SetupHelpers.RecipeId), + configuration => configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorHelpfulExtensionsTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorHelpfulExtensionsTests.cs index a610d0d44..7f00f7792 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorHelpfulExtensionsTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorHelpfulExtensionsTests.cs @@ -1,6 +1,4 @@ using Lombiq.HelpfulExtensions.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,21 +12,15 @@ public BehaviorHelpfulExtensionsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task FeatureFlow(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestFlowAdditionalStylingPartAsync(), - browser); + [Fact] + public Task FeatureFlow() => + ExecuteTestAfterSetupAsync(context => context.TestFlowAdditionalStylingPartAsync()); - [Theory, Chrome] - public Task FeatureWidgets(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestFeatureWidgetsAsync(), - browser); + [Fact] + public Task FeatureWidgets() => + ExecuteTestAfterSetupAsync(context => context.TestFeatureWidgetsAsync()); - [Theory, Chrome] - public Task FeatureCodeGeneration(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestFeatureCodeGenerationsAsync(), - browser); + [Fact] + public Task FeatureCodeGeneration() => + ExecuteTestAfterSetupAsync(context => context.TestFeatureCodeGenerationsAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs index 836f7e21c..25f56a13a 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs @@ -1,7 +1,5 @@ using Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -16,8 +14,8 @@ public IdleTenantTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ShuttingDownIdleTenantsShouldWork(Browser browser) => + [Fact] + public Task ShuttingDownIdleTenantsShouldWork() => ExecuteTestAfterSetupAsync( async context => { @@ -28,6 +26,5 @@ public Task ShuttingDownIdleTenantsShouldWork(Browser browser) => context.Configuration.AssertAppLogsAsync = webApplicationInstance => IdleTenantManagementExtensions.AssertAppLogsWithIdleCheckAsync(webApplicationInstance); }, - browser, configuration => configuration.SetMaxIdleMinutesAndLoggingForUITest()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorJsonEditorTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorJsonEditorTests.cs index d75fa29b7..2c601a453 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorJsonEditorTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorJsonEditorTests.cs @@ -1,6 +1,4 @@ using Lombiq.JsonEditor.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorJsonEditorTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task JsonEditorShouldWorkCorrectly(Browser browser) => - ExecuteTestAfterSetupAsync( - async context => await context.TestJsonEditorBehaviorAsync(), - browser); + [Fact] + public Task JsonEditorShouldWorkCorrectly() => + ExecuteTestAfterSetupAsync(context => context.TestJsonEditorBehaviorAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs index 7d90aa94e..b189f33bd 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Tenants.Maintenance.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,10 +12,9 @@ public BehaviorMaintenanceTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ChangeUserSensitiveContentMaintenanceTaskShouldBeExecutedSuccessfully(Browser browser) => + [Fact] + public Task ChangeUserSensitiveContentMaintenanceTaskShouldBeExecutedSuccessfully() => ExecuteTestAfterSetupAsync( - async context => await context.ChangeUserSensitiveContentMaintenanceExecutionAsync(), - browser, + context => context.ChangeUserSensitiveContentMaintenanceExecutionAsync(), configuration => configuration.ChangeUserSensitiveContentMaintenanceConfiguration()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs index 7dd6fde25..c26038438 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs @@ -1,7 +1,5 @@ using Lombiq.Privacy.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -15,39 +13,35 @@ public BehaviorPrivacyTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ConsentBannerShouldWorkAnonymous(Browser browser) => - ExecuteTestAfterSetupAsync(context => context.TestConsentBannerAsync(), browser); + [Fact] + public Task ConsentBannerShouldWorkAnonymous() => + ExecuteTestAfterSetupAsync(context => context.TestConsentBannerAsync()); - [Theory, Chrome] - public Task ConsentBannerShouldWorkAdmin(Browser browser) => + [Fact] + public Task ConsentBannerShouldWorkAdmin() => ExecuteTestAfterSetupAsync( async context => { await context.SignInDirectlyAsync(); await context.TestConsentBannerAsync(); - }, - browser); + }); // This test is for https://github.com/Lombiq/Orchard-Privacy/issues/15 - [Theory, Chrome] - public async Task ConsentBannerShouldWorkWithRazorAndLiquidBasedThemes(Browser browser) + [Fact] + public async Task ConsentBannerShouldWorkWithRazorAndLiquidBasedThemes() { - // First should work with liquid based theme - await ExecuteTestAfterSetupAsync( - context => context.TestConsentBannerWithThemeAsync("TheBlogTheme"), - browser); - // Then should work with razor based theme - await ExecuteTestAfterSetupAsync( - context => context.TestConsentBannerWithThemeAsync("TheTheme"), - browser); + // First should work with Liquid-based theme. + await ExecuteTestAfterSetupAsync(context => context.TestConsentBannerWithThemeAsync("TheBlogTheme")); + + // Then should work with Razor-based theme. + await ExecuteTestAfterSetupAsync(context => context.TestConsentBannerWithThemeAsync("TheTheme")); } - [Theory, Chrome] - public Task RegistrationConsentCheckboxShouldWork(Browser browser) => - ExecuteTestAfterSetupAsync(context => context.TestRegistrationConsentCheckboxAsync(), browser); + [Fact] + public Task RegistrationConsentCheckboxShouldWork() => + ExecuteTestAfterSetupAsync(context => context.TestRegistrationConsentCheckboxAsync()); - [Theory, Chrome] - public Task FormConsentCheckboxShouldWork(Browser browser) => - ExecuteTestAfterSetupAsync(context => context.TestPrivacySampleBehaviorAsync(), browser); + [Fact] + public Task FormConsentCheckboxShouldWork() => + ExecuteTestAfterSetupAsync(context => context.TestPrivacySampleBehaviorAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorTenantManagementTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorTenantManagementTests.cs index 88f71aba0..ea4ad3f0f 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorTenantManagementTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorTenantManagementTests.cs @@ -1,6 +1,4 @@ -using Lombiq.Hosting.Tenants.Management.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; +using Lombiq.Hosting.Tenants.Management.Tests.UI.Extensions; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorTenantManagementTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task TenantShellSettingsEditorShouldSaveSettings(Browser browser) => - ExecuteTestAfterSetupAsync( - async context => await context.TestShellSettingsEditorFeatureAsync(), - browser); + [Fact] + public Task TenantShellSettingsEditorShouldSaveSettings() => + ExecuteTestAfterSetupAsync(context => context.TestShellSettingsEditorFeatureAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorVueTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorVueTests.cs index 0cdf65c02..470789bca 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorVueTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorVueTests.cs @@ -1,6 +1,4 @@ -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using Lombiq.VueJs.Tests.UI.Extensions; using System.Threading.Tasks; using Xunit; @@ -15,13 +13,12 @@ public BehaviorVueTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task RecipeDataShouldBeDisplayedCorrectly(Browser browser) => + [Fact] + public Task RecipeDataShouldBeDisplayedCorrectly() => ExecuteTestAfterSetupAsync( async context => { await context.SignInDirectlyAsync(); await context.TestVueSampleBehaviorAsync(); - }, - browser); + }); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/RetrievalBuildVersionDisplayTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/RetrievalBuildVersionDisplayTests.cs index f02970679..5bb83b181 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/RetrievalBuildVersionDisplayTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/RetrievalBuildVersionDisplayTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.BuildVersionDisplay.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public RetrievalBuildVersionDisplayTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task BuildVersionShouldBeBeDisplayedCorrectly(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestBuildVersionDisplayAsync(), - browser); + [Fact] + public Task BuildVersionShouldBeBeDisplayedCorrectly() => + ExecuteTestAfterSetupAsync(context => context.TestBuildVersionDisplayAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ThemeTests/BehaviorMediaThemeTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ThemeTests/BehaviorMediaThemeTests.cs index 32b1b524e..a53f7d04f 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ThemeTests/BehaviorMediaThemeTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ThemeTests/BehaviorMediaThemeTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.MediaTheme.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorMediaThemeTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task MediaThemeShouldRenderTemplatesFromMediaLibrary(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestMediaThemeTemplateRenderingBehaviorAsync(), - browser); + [Fact] + public Task MediaThemeShouldRenderTemplatesFromMediaLibrary() => + ExecuteTestAfterSetupAsync(context => context.TestMediaThemeTemplateRenderingBehaviorAsync()); } diff --git a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ThemeTests/BehaviorThemeTests.cs b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ThemeTests/BehaviorThemeTests.cs index 9f8ca9c3d..1039e8577 100644 --- a/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ThemeTests/BehaviorThemeTests.cs +++ b/NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ThemeTests/BehaviorThemeTests.cs @@ -1,7 +1,5 @@ using Lombiq.BaseTheme.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -15,8 +13,8 @@ public BehaviorThemeTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task BaseThemeShouldWork(Browser browser) => + [Fact] + public Task BaseThemeShouldWork() => ExecuteTestAfterSetupAsync( async context => { @@ -25,6 +23,5 @@ public Task BaseThemeShouldWork(Browser browser) => await context.GoToHomePageAsync(onlyIfNotAlreadyThere: false); await context.TestBaseThemeFeaturesAsync(); - }, - browser); + }); } diff --git a/src/Libraries/Lombiq.HelpfulLibraries b/src/Libraries/Lombiq.HelpfulLibraries index ffd7762a1..56beebf74 160000 --- a/src/Libraries/Lombiq.HelpfulLibraries +++ b/src/Libraries/Lombiq.HelpfulLibraries @@ -1 +1 @@ -Subproject commit ffd7762a17ffdde07e3508654b362de7d099deaa +Subproject commit 56beebf7470e049b400aefb383a9f92debe43d1a diff --git a/src/Modules/Lombiq.Hosting.Azure.ApplicationInsights b/src/Modules/Lombiq.Hosting.Azure.ApplicationInsights index e1eba8e72..1c59275b7 160000 --- a/src/Modules/Lombiq.Hosting.Azure.ApplicationInsights +++ b/src/Modules/Lombiq.Hosting.Azure.ApplicationInsights @@ -1 +1 @@ -Subproject commit e1eba8e72e993da881f1e8c666a4d7f321286f73 +Subproject commit 1c59275b79a4864200f47dcbf98e3ccacc875ef1 diff --git a/src/Modules/Lombiq.Hosting.Tenants b/src/Modules/Lombiq.Hosting.Tenants index bce3d9928..adb4e3f8e 160000 --- a/src/Modules/Lombiq.Hosting.Tenants +++ b/src/Modules/Lombiq.Hosting.Tenants @@ -1 +1 @@ -Subproject commit bce3d99284e0b9193bd0a2ae7ba92a13932dff8a +Subproject commit adb4e3f8efb809d06d3d08946b1f188c9e62ffde diff --git a/src/Themes/Lombiq.Hosting.MediaTheme b/src/Themes/Lombiq.Hosting.MediaTheme index 51fecb153..8ab1ee746 160000 --- a/src/Themes/Lombiq.Hosting.MediaTheme +++ b/src/Themes/Lombiq.Hosting.MediaTheme @@ -1 +1 @@ -Subproject commit 51fecb153a7ca5c0cf08b45e9f2c5ebbd0bd0186 +Subproject commit 8ab1ee74648c8edfed9ffdfc14bfd35f87d94401 diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/LibraryTests/BehaviorOrchardCoreApiClientTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/LibraryTests/BehaviorOrchardCoreApiClientTests.cs index ad5daa748..5c33107a2 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/LibraryTests/BehaviorOrchardCoreApiClientTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/LibraryTests/BehaviorOrchardCoreApiClientTests.cs @@ -1,6 +1,4 @@ using Lombiq.OrchardCoreApiClient.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorOrchardCoreApiClientTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task OrchardCoreApiClientShouldWork(Browser browser) => - ExecuteTestAfterSetupAsync( - async context => await context.TestOrchardCoreApiClientBehaviorAsync(), - browser); + [Fact] + public Task OrchardCoreApiClientShouldWork() => + ExecuteTestAfterSetupAsync(context => context.TestOrchardCoreApiClientBehaviorAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorApplicationInsightsTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorApplicationInsightsTests.cs index 47491b375..83b33e80b 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorApplicationInsightsTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorApplicationInsightsTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI.TestCases; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,7 +12,7 @@ public BehaviorApplicationInsightsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ApplicationInsightsTrackingInOfflineOperationShouldWork(Browser browser) => - ApplicationInsightsTestCases.ApplicationInsightsTrackingInOfflineOperationShouldWorkAsync(ExecuteTestAfterSetupAsync, browser); + [Fact] + public Task ApplicationInsightsTrackingInOfflineOperationShouldWork() => + ApplicationInsightsTestCases.ApplicationInsightsTrackingInOfflineOperationShouldWorkAsync(ExecuteTestAfterSetupAsync); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorAsyncEditorTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorAsyncEditorTests.cs index 148ee4904..8562ee6da 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorAsyncEditorTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorAsyncEditorTests.cs @@ -1,8 +1,6 @@ using Lombiq.ContentEditors.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; using Lombiq.Tests.UI.Helpers; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -16,24 +14,22 @@ public BehaviorAsyncEditorTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task DemoContentItemAsyncEditorShouldWork(Browser browser) => + [Fact] + public Task DemoContentItemAsyncEditorShouldWork() => ExecuteTestAfterSetupAsync( async context => { await context.SignInDirectlyAsync(); await context.TestDemoContentItemAsyncEditorAsync(); - }, - browser); + }); - [Theory, Chrome] - public Task DemoFrontEndAsyncEditorShouldWork(Browser browser) => + [Fact] + public Task DemoFrontEndAsyncEditorShouldWork() => ExecuteTestAfterSetupAsync( async context => { await context.SignInDirectlyAsync(); await context.TestDemoFrontEndAsyncEditorAsync(); }, - browser, ConfigurationHelper.DisableHtmlValidation); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorChartJsTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorChartJsTests.cs index 921432cb1..f27d2a10a 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorChartJsTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorChartJsTests.cs @@ -1,6 +1,4 @@ using Lombiq.ChartJs.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorChartJsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task RecipeDataShouldBeDisplayedCorrectly(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestChartJsSampleBehaviorAsync(), - browser); + [Fact] + public Task RecipeDataShouldBeDisplayedCorrectly() => + ExecuteTestAfterSetupAsync(context => context.TestChartJsSampleBehaviorAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs index 22f4c8dfa..26fdc8def 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorEmailQuotaTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,18 +12,16 @@ public BehaviorEmailQuotaTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task EmailQuotaShouldBlockEmailsOverLimitAndWarn(Browser browser) => + [Fact] + public Task EmailQuotaShouldBlockEmailsOverLimitAndWarn() => ExecuteTestAfterSetupAsync( context => context.TestEmailQuotaManagementBehaviorAsync(10), - browser, configuration => configuration.SetEmailQuotaManagementOptionsForUITest(10)); - [Theory, Chrome] - public Task EmailQuotaShouldNotBlockEmailsWhenDifferentHostIsUsedThanOriginalFromConfig(Browser browser) => + [Fact] + public Task EmailQuotaShouldNotBlockEmailsWhenDifferentHostIsUsedThanOriginalFromConfig() => ExecuteTestAfterSetupAsync( context => context.TestEmailQuotaManagementBehaviorAsync(1, moduleShouldInterfere: false), - browser, // The default SMTP host is localhost during UI tests, we set it to 127.0.0.1 to be able to send emails, // but the Email Quota module shouldn't interfere. configuration => configuration.SetEmailQuotaManagementOptionsForUITest(1, "127.0.0.1")); diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorEnvironmentRobotsTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorEnvironmentRobotsTests.cs index 682520fbb..98e7cf628 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorEnvironmentRobotsTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorEnvironmentRobotsTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,23 +12,20 @@ public BehaviorEnvironmentRobotsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task RobotsMetaTagShouldBeMissing(Browser browser) => + [Fact] + public Task RobotsMetaTagShouldBeMissing() => ExecuteTestAfterSetupAsync( - async context => await context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: true), - browser, + context => context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: true), configuration => configuration.SetEnvironmentRobotsOptionsConfiguration(isProduction: true)); - [Theory, Chrome] - public Task RobotsMetaTagShouldBeMissingWithoutConfiguration(Browser browser) => + [Fact] + public Task RobotsMetaTagShouldBeMissingWithoutConfiguration() => ExecuteTestAfterSetupAsync( - async context => await context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: false), - browser); + context => context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: false)); - [Theory, Chrome] - public Task RobotsMetaTagShouldBePresent(Browser browser) => + [Fact] + public Task RobotsMetaTagShouldBePresent() => ExecuteTestAfterSetupAsync( - async context => await context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: false), - browser, + context => context.TestRobotMetaTagIsMissingAsync(shouldBeMissing: false), configuration => configuration.SetEnvironmentRobotsOptionsConfiguration(isProduction: false)); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorFeaturesGuardTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorFeaturesGuardTests.cs index 22a6076da..78337b7b7 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorFeaturesGuardTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorFeaturesGuardTests.cs @@ -1,8 +1,6 @@ using Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Helpers; using Lombiq.Tests.UI.Samples.Helpers; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -18,19 +16,17 @@ public BehaviorFeaturesGuardTests(ITestOutputHelper testOutputHelper) // HTML validation is disabled as OC's login and dashboard pages contain several errors. See: // https://github.com/OrchardCMS/OrchardCore/issues/12271 - [Theory, Chrome] - public Task ForbiddenFeaturesShouldNotBeActivatableOnTenants(Browser browser) => + [Fact] + public Task ForbiddenFeaturesShouldNotBeActivatableOnTenants() => ExecuteTestAfterSetupAsync( context => context.TestForbiddenFeaturesAsync(SetupHelpers.RecipeId), - browser, ConfigurationHelper.DisableHtmlValidation); // HTML validation is disabled as OC's login and dashboard pages contain several errors. See: // https://github.com/OrchardCMS/OrchardCore/issues/12271 - [Theory, Chrome] - public Task ConditionallyEnabledFeaturesShouldWorkCorrectlyOnTenants(Browser browser) => + [Fact] + public Task ConditionallyEnabledFeaturesShouldWorkCorrectlyOnTenants() => ExecuteTestAfterSetupAsync( context => context.TestConditionallyEnabledFeaturesAsync(SetupHelpers.RecipeId), - browser, ConfigurationHelper.DisableHtmlValidation); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorHelpfulExtensionsTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorHelpfulExtensionsTests.cs index e69c9c51e..b4532c0bc 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorHelpfulExtensionsTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorHelpfulExtensionsTests.cs @@ -1,6 +1,4 @@ using Lombiq.HelpfulExtensions.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,27 +12,15 @@ public BehaviorHelpfulExtensionsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task FeatureFlow(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestFlowAdditionalStylingPartAsync(), - browser); + [Fact] + public Task FeatureFlow() => ExecuteTestAfterSetupAsync(context => context.TestFlowAdditionalStylingPartAsync()); - [Theory, Chrome] - public Task FeatureWidgets(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestFeatureWidgetsAsync(), - browser); + [Fact] + public Task FeatureWidgets() => ExecuteTestAfterSetupAsync(context => context.TestFeatureWidgetsAsync()); - [Theory, Chrome] - public Task FeatureCodeGeneration(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestFeatureCodeGenerationsAsync(), - browser); + [Fact] + public Task FeatureCodeGeneration() => ExecuteTestAfterSetupAsync(context => context.TestFeatureCodeGenerationsAsync()); - [Theory, Chrome] - public Task FeatureContentSets(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestFeatureContentSetsAsync(), - browser); + [Fact] + public Task FeatureContentSets() => ExecuteTestAfterSetupAsync(context => context.TestFeatureContentSetsAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs index c0fa1db9b..fc4a5c4bf 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs @@ -1,7 +1,5 @@ using Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -15,8 +13,8 @@ public BehaviorIdleTenantsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ShuttingDownIdleTenantsShouldWork(Browser browser) => + [Fact] + public Task ShuttingDownIdleTenantsShouldWork() => ExecuteTestAfterSetupAsync( async context => { @@ -30,6 +28,5 @@ public Task ShuttingDownIdleTenantsShouldWork(Browser browser) => await IdleTenantManagementExtensions.AssertAppLogsWithIdleCheckAsync(webApplicationInstance); }; }, - browser, configuration => configuration.SetMaxIdleMinutesAndLoggingForUITest()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorJsonEditorTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorJsonEditorTests.cs index 7b5bb6e3d..a02cf91fc 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorJsonEditorTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorJsonEditorTests.cs @@ -1,6 +1,4 @@ using Lombiq.JsonEditor.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorJsonEditorTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task JsonEditorShouldWorkCorrectly(Browser browser) => - ExecuteTestAfterSetupAsync( - async context => await context.TestJsonEditorBehaviorAsync(), - browser); + [Fact] + public Task JsonEditorShouldWorkCorrectly() => + ExecuteTestAfterSetupAsync(context => context.TestJsonEditorBehaviorAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs index db4a5445c..57478bb3a 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Tenants.Maintenance.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,24 +12,21 @@ public BehaviorMaintenanceTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task MaintenanceTaskShouldBeExecutedSuccessfully(Browser browser) => + [Fact] + public Task MaintenanceTaskShouldBeExecutedSuccessfully() => ExecuteTestAfterSetupAsync( - async context => await context.TestSiteUrlMaintenanceExecutionAsync(), - browser, + context => context.TestSiteUrlMaintenanceExecutionAsync(), configuration => configuration.SetUpdateSiteUrlMaintenanceConfiguration()); - [Theory, Chrome] - public Task AddSiteOwnerPermissionToRoleMaintenanceTaskShouldBeExecutedSuccessfully(Browser browser) => + [Fact] + public Task AddSiteOwnerPermissionToRoleMaintenanceTaskShouldBeExecutedSuccessfully() => ExecuteTestAfterSetupAsync( - async context => await context.TestSiteOwnerPermissionToRoleMaintenanceExecutionAsync(), - browser, + context => context.TestSiteOwnerPermissionToRoleMaintenanceExecutionAsync(), configuration => configuration.SetAddSiteOwnerPermissionToRoleMaintenanceConfiguration()); - [Theory, Chrome] - public Task ChangeUserSensitiveContentMaintenanceTaskShouldBeExecutedSuccessfully(Browser browser) => + [Fact] + public Task ChangeUserSensitiveContentMaintenanceTaskShouldBeExecutedSuccessfully() => ExecuteTestAfterSetupAsync( - async context => await context.ChangeUserSensitiveContentMaintenanceExecutionAsync(), - browser, + context => context.ChangeUserSensitiveContentMaintenanceExecutionAsync(), configuration => configuration.ChangeUserSensitiveContentMaintenanceConfiguration()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMediaStorageManagementTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMediaStorageManagementTests.cs index 9edfe8b52..929ddbb84 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMediaStorageManagementTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMediaStorageManagementTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,11 +12,10 @@ public BehaviorMediaStorageManagementTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task MediaQuotaShouldWork(Browser browser) => + [Fact] + public Task MediaQuotaShouldWork() => ExecuteTestAfterSetupAsync( - async context => await context.TestMediaStorageManagementBehaviorAsync(), - browser, + context => context.TestMediaStorageManagementBehaviorAsync(), // Setting maximum storage quota for 50 000 bytes to see if it fails with the sample png file. configuration => configuration.SetMediaStorageManagementOptionsForUITest(50_000)); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs index c7fbb26ba..d01ed360f 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorPrivacyTests.cs @@ -1,7 +1,5 @@ using Lombiq.Privacy.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -15,39 +13,36 @@ public BehaviorPrivacyTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ConsentBannerShouldWorkAnonymous(Browser browser) => - ExecuteTestAfterSetupAsync(context => context.TestConsentBannerAsync(), browser); + [Fact] + public Task ConsentBannerShouldWorkAnonymous() => + ExecuteTestAfterSetupAsync(context => context.TestConsentBannerAsync()); - [Theory, Chrome] - public Task ConsentBannerShouldWorkAdmin(Browser browser) => + [Fact] + public Task ConsentBannerShouldWorkAdmin() => ExecuteTestAfterSetupAsync( async context => { await context.SignInDirectlyAsync(); await context.TestConsentBannerAsync(); - }, - browser); + }); // This test is for https://github.com/Lombiq/Orchard-Privacy/issues/15 - [Theory, Chrome] - public async Task ConsentBannerShouldWorkWithRazorAndLiquidBasedThemes(Browser browser) + [Fact] + public async Task ConsentBannerShouldWorkWithRazorAndLiquidBasedThemes() { // First should work with Liquid-based theme await ExecuteTestAfterSetupAsync( - context => context.TestConsentBannerWithThemeAsync("TheBlogTheme"), - browser); + context => context.TestConsentBannerWithThemeAsync("TheBlogTheme")); // Then should work with Razor-based theme await ExecuteTestAfterSetupAsync( - context => context.TestConsentBannerWithThemeAsync("TheTheme"), - browser); + context => context.TestConsentBannerWithThemeAsync("TheTheme")); } - [Theory, Chrome] - public Task RegistrationConsentCheckboxShouldWork(Browser browser) => - ExecuteTestAfterSetupAsync(context => context.TestRegistrationConsentCheckboxAsync(), browser); + [Fact] + public Task RegistrationConsentCheckboxShouldWork() => + ExecuteTestAfterSetupAsync(context => context.TestRegistrationConsentCheckboxAsync()); - [Theory, Chrome] - public Task FormConsentCheckboxShouldWork(Browser browser) => - ExecuteTestAfterSetupAsync(context => context.TestPrivacySampleBehaviorAsync(), browser); + [Fact] + public Task FormConsentCheckboxShouldWork() => + ExecuteTestAfterSetupAsync(context => context.TestPrivacySampleBehaviorAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorTenantManagementTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorTenantManagementTests.cs index 1bd36d7cd..2bf5540d2 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorTenantManagementTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorTenantManagementTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.Tenants.Management.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorTenantManagementTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task TenantShellSettingsEditorShouldSaveSettings(Browser browser) => - ExecuteTestAfterSetupAsync( - async context => await context.TestShellSettingsEditorFeatureAsync(), - browser); + [Fact] + public Task TenantShellSettingsEditorShouldSaveSettings() => + ExecuteTestAfterSetupAsync(context => context.TestShellSettingsEditorFeatureAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorUIKitShowcaseTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorUIKitShowcaseTests.cs index 10c8c8a26..844dc43d6 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorUIKitShowcaseTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorUIKitShowcaseTests.cs @@ -1,6 +1,4 @@ -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using Lombiq.UIKit.Tests.UI.Extensions; using Shouldly; using System; @@ -18,11 +16,10 @@ public BehaviorUIKitShowcaseTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task UIKitShowcasePageShouldBeCorrect(Browser browser) + [Fact] + public Task UIKitShowcasePageShouldBeCorrect() => ExecuteTestAfterSetupAsync( context => context.TestUIKitShowcaseBehaviorAsync(), - browser, configuration => configuration.HtmlValidationConfiguration.AssertHtmlValidationResultAsync = async validationResult => { diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorVueTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorVueTests.cs index 9ced7fb2e..3ef76468f 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorVueTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorVueTests.cs @@ -1,5 +1,4 @@ using Atata.HtmlValidation; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; using Lombiq.Tests.UI.Services; using Lombiq.VueJs.Samples.Controllers; @@ -20,32 +19,29 @@ public BehaviorVueTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task RecipeDataShouldBeDisplayedCorrectly(Browser browser) => + [Fact] + public Task RecipeDataShouldBeDisplayedCorrectly() => ExecuteTestAfterSetupAsync( async context => { await context.SignInDirectlyAsync(); await context.TestVueSampleBehaviorAsync(); - }, - browser); + }); - [Theory, Chrome] - public Task QrCardScanShouldWorkAsync(Browser browser) => + [Fact] + public Task QrCardScanShouldWorkAsync() => ExecuteTestAfterSetupAsync( context => context.TestQrCardFoundAsync(), - browser, configuration => { configuration.BrowserConfiguration.ConfigureFakeVideoSourceForPositiveTest(); configuration.HtmlValidationConfiguration.AssertHtmlValidationResultAsync = AssertHtmValidationResultAsync; }); - [Theory, Chrome] - public Task QrCardScanShouldReportNotFoundAsync(Browser browser) => + [Fact] + public Task QrCardScanShouldReportNotFoundAsync() => ExecuteTestAfterSetupAsync( context => context.TestQrCardNotFoundAsync(), - browser, configuration => { configuration.BrowserConfiguration.ConfigureFakeVideoSourceForNegativeTest(); diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/RetrievalBuildVersionDisplayTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/RetrievalBuildVersionDisplayTests.cs index 6b9ceac39..b94283da7 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/RetrievalBuildVersionDisplayTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/RetrievalBuildVersionDisplayTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.BuildVersionDisplay.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public RetrievalBuildVersionDisplayTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task BuildVersionShouldBeBeDisplayedCorrectly(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestBuildVersionDisplayAsync(), - browser); + [Fact] + public Task BuildVersionShouldBeBeDisplayedCorrectly() => + ExecuteTestAfterSetupAsync(context => context.TestBuildVersionDisplayAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/RetrievalDataTablesTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/RetrievalDataTablesTests.cs index 3b748ba8c..2c1fec783 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/RetrievalDataTablesTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/RetrievalDataTablesTests.cs @@ -1,6 +1,4 @@ using Lombiq.DataTables.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorDataTablesTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task RecipeDataShouldBeDisplayedCorrectly(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestDataTableRecipeDataAsync(), - browser); + [Fact] + public Task RecipeDataShouldBeDisplayedCorrectly() => + ExecuteTestAfterSetupAsync(context => context.TestDataTableRecipeDataAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BehaviorBaseThemeTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BehaviorBaseThemeTests.cs index 0dd26d2bd..a5afaaaea 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BehaviorBaseThemeTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BehaviorBaseThemeTests.cs @@ -1,7 +1,5 @@ -using Lombiq.BaseTheme.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; +using Lombiq.BaseTheme.Tests.UI.Extensions; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -15,8 +13,8 @@ public BehaviorBaseThemeTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ThemeFeaturesShouldWork(Browser browser) => + [Fact] + public Task ThemeFeaturesShouldWork() => ExecuteTestAfterSetupAsync( async context => { @@ -25,6 +23,5 @@ public Task ThemeFeaturesShouldWork(Browser browser) => await context.SignInDirectlyAsync(); await context.TestBaseThemeSiteSettingsAsync(); - }, - browser); + }); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BehaviorMediaThemeTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BehaviorMediaThemeTests.cs index 8ec7bd216..f1f42a0af 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BehaviorMediaThemeTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BehaviorMediaThemeTests.cs @@ -1,6 +1,4 @@ using Lombiq.Hosting.MediaTheme.Tests.UI.Extensions; -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -14,9 +12,7 @@ public BehaviorMediaThemeTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task MediaThemeShouldRenderTemplatesFromMediaLibrary(Browser browser) => - ExecuteTestAfterSetupAsync( - context => context.TestMediaThemeTemplateRenderingBehaviorAsync(), - browser); + [Fact] + public Task MediaThemeShouldRenderTemplatesFromMediaLibrary() => + ExecuteTestAfterSetupAsync(context => context.TestMediaThemeTemplateRenderingBehaviorAsync()); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BlogBaseThemeTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BlogBaseThemeTests.cs index 4cb4c0ecd..1d78f6651 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BlogBaseThemeTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/ThemeTests/BlogBaseThemeTests.cs @@ -1,6 +1,5 @@ -using Lombiq.BaseTheme.Tests.UI.Extensions; +using Lombiq.BaseTheme.Tests.UI.Extensions; using Lombiq.OSOCE.Tests.UI.Helpers; -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Extensions; using Lombiq.Tests.UI.Services; using OpenQA.Selenium; @@ -22,8 +21,8 @@ public BlogBehaviorBaseThemeTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task ThemeWithoutSetupShouldWork(Browser browser) => + [Fact] + public Task ThemeWithoutSetupShouldWork() => ExecuteTestAfterSetupAndThemeSwitchAsync( async context => { @@ -35,23 +34,20 @@ public Task ThemeWithoutSetupShouldWork(Browser browser) => await context.SignInDirectlyAndGoToHomepageAsync(); context.TestBlogRecipeMenuItemsAddedToMainMenu(); - }, - browser); + }); - [Theory, Chrome] - public Task ContentMenuItemShouldWorkCorrectly(Browser browser) => + [Fact] + public Task ContentMenuItemShouldWorkCorrectly() => ExecuteTestAfterSetupAndThemeSwitchAsync( async context => { await context.SignInDirectlyAsync(); await context.TestAddingMenuItemToBlogMainMenuAsync(); - }, - browser); + }); - private Task ExecuteTestAfterSetupAndThemeSwitchAsync(Func testAsync, Browser browser) => + private Task ExecuteTestAfterSetupAndThemeSwitchAsync(Func testAsync) => ExecuteTestAsync( testAsync, - browser, async context => { var homePageUri = await SetupHelpers.RunBlogSetupAsync(context); @@ -72,7 +68,5 @@ await context.ClickReliablyOnAsync(By.CssSelector( // Disable HTML validation, because we have no control over the HTML in the Blog and the content added // by the Blog recipe. configuration.HtmlValidationConfiguration.RunHtmlValidationAssertionOnAllPageChanges = false; - - return Task.CompletedTask; }); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/CustomAdminPrefixTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/CustomAdminPrefixTests.cs index a5e972ca4..3a7138f35 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/CustomAdminPrefixTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/CustomAdminPrefixTests.cs @@ -1,5 +1,3 @@ -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using Lombiq.Tests.UI.Tests.UI.TestCases; using System.Threading.Tasks; using Xunit; @@ -14,7 +12,7 @@ public CustomAdminPrefixTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task NavigationWithCustomAdminPrefixShouldWork(Browser browser) => - CustomAdminPrefixTestCases.NavigationWithCustomAdminPrefixShouldWorkAsync(ExecuteTestAfterSetupAsync, browser); + [Fact] + public Task NavigationWithCustomAdminPrefixShouldWork() => + CustomAdminPrefixTestCases.NavigationWithCustomAdminPrefixShouldWorkAsync(ExecuteTestAfterSetupAsync); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/SecurityShortcutsTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/SecurityShortcutsTests.cs index b834426c3..57c2eac35 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/SecurityShortcutsTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/SecurityShortcutsTests.cs @@ -1,5 +1,3 @@ -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using Lombiq.Tests.UI.Tests.UI.TestCases; using System.Threading.Tasks; using Xunit; @@ -14,15 +12,15 @@ public SecurityShortcutsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task AddUserToRoleShouldWork(Browser browser) => - SecurityShortcutsTestCases.AddUserToRoleShouldWorkAsync(ExecuteTestAfterSetupAsync, browser); + [Fact] + public Task AddUserToRoleShouldWork() => + SecurityShortcutsTestCases.AddUserToRoleShouldWorkAsync(ExecuteTestAfterSetupAsync); - [Theory, Chrome] - public Task AddUserToFakeRoleShouldThrow(Browser browser) => - SecurityShortcutsTestCases.AddUserToFakeRoleShouldThrowAsync(ExecuteTestAfterSetupAsync, browser); + [Fact] + public Task AddUserToFakeRoleShouldThrow() => + SecurityShortcutsTestCases.AddUserToFakeRoleShouldThrowAsync(ExecuteTestAfterSetupAsync); - [Theory, Chrome] - public Task AllowFakePermissionToRoleShouldThrow(Browser browser) => - SecurityShortcutsTestCases.AllowFakePermissionToRoleShouldThrowAsync(ExecuteTestAfterSetupAsync, browser); + [Fact] + public Task AllowFakePermissionToRoleShouldThrow() => + SecurityShortcutsTestCases.AllowFakePermissionToRoleShouldThrowAsync(ExecuteTestAfterSetupAsync); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/WorkflowShortcutsTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/WorkflowShortcutsTests.cs index 1ff29a321..4e4561311 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/WorkflowShortcutsTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/UITestingToolboxTests/WorkflowShortcutsTests.cs @@ -1,5 +1,3 @@ -using Lombiq.Tests.UI.Attributes; -using Lombiq.Tests.UI.Services; using Lombiq.Tests.UI.Tests.UI.TestCases; using System.Threading.Tasks; using Xunit; @@ -14,7 +12,7 @@ public WorkflowShortcutsTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task GenerateHttpEventUrlShouldWork(Browser browser) => - WorkflowShortcutsTestCases.GenerateHttpEventUrlShouldWorkAsync(ExecuteTestAfterSetupAsync, browser); + [Fact] + public Task GenerateHttpEventUrlShouldWork() => + WorkflowShortcutsTestCases.GenerateHttpEventUrlShouldWorkAsync(ExecuteTestAfterSetupAsync); } diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs index bb1a12c30..15858d96e 100644 --- a/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs +++ b/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs @@ -1,7 +1,5 @@ -using Lombiq.Tests.UI.Attributes; using Lombiq.Tests.UI.Constants; using Lombiq.Tests.UI.Extensions; -using Lombiq.Tests.UI.Services; using OpenQA.Selenium; using SixLabors.ImageSharp; using System.Runtime.InteropServices; @@ -23,14 +21,13 @@ public VisualVerificationTests(ITestOutputHelper testOutputHelper) { } - [Theory, Chrome] - public Task VerifyHomePageAndLayout(Browser browser) => + [Fact] + public Task VerifyHomePageAndLayout() => // Check the whole page so we can verify the margins and to see if header/footer is affected. ExecuteTestAfterSetupAsync( context => context.AssertVisualVerificationOnAllResolutions( _visualVerificationSizes, _ => By.TagName("body"), configurator: configuration => configuration.WithFileNameSuffix( - RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "Windows" : "Unix")), - browser); + RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "Windows" : "Unix"))); } diff --git a/test/Lombiq.UITestingToolbox b/test/Lombiq.UITestingToolbox index 4ddea2d8e..88ec8caf6 160000 --- a/test/Lombiq.UITestingToolbox +++ b/test/Lombiq.UITestingToolbox @@ -1 +1 @@ -Subproject commit 4ddea2d8e5f6fcbbf2957733d343daa8fd2bb83e +Subproject commit 88ec8caf6940e7f1445fe4993701fc0ce5ce5e48 diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions index 611fe7664..41c971c09 160000 --- a/tools/Lombiq.GitHub.Actions +++ b/tools/Lombiq.GitHub.Actions @@ -1 +1 @@ -Subproject commit 611fe7664236f89ec3a2836fe57444690d713089 +Subproject commit 41c971c0932fb6aaab61fd5525f0fc713af59cab