Changed all integration test categories to separate Website tests fro…

…m API tests
jezzsantos · Apr 18, 2024 · fa704f7 · fa704f7
1 parent f7d2dc5
commit fa704f7
Show file tree

Hide file tree

Showing 38 changed files with 47 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
         run: >
           dotnet test --no-build --verbosity normal
           --configuration ${{env.TESTINGONLY_BUILD_CONFIGURATION}}
-          --filter:"Category=Integration.Web" --collect:"XPlat Code Coverage" --results-directory:"src/TestResults/csharp"
+          --filter:"Category=Integration.API|Category=Integration.Website" --collect:"XPlat Code Coverage" --results-directory:"src/TestResults/csharp"
           --logger:"trx"
           --logger:"junit;LogFileName={assembly}.junit.xml;MethodFormat=Class;FailureBodyFormat=Verbose"
           --test-adapter-path:. "${{env.SOLUTION_PATH}}"

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -141,7 +141,8 @@ There are 3 flavors of build configuration: `Debug`, `Release` and `ReleaseForDe
 
 * Run all the **unit** tests (`Category=Unit`)
 * Run all the **architecture** tests (`Category=Unit.Architecture`)
-* Run all the **integration** tests (`Category=Integration.Web`)
+* Run all the **integration** tests (`Category=Integration.API`)
+* Run all the **integration** tests (`Category=Integration.Website`)
 
 > All automated tests must pass in GitHub Actions to submit changes to the codebase
 

diff --git a/README_DERIVATIVE.md b/README_DERIVATIVE.md
@@ -130,15 +130,15 @@ When pushed, all branches will be built and tested with GitHub actions
 
 2. Run these tests:
 
-   In Rider, run all C# tests with Category= `Unit`, `Unit.Architecture` and `Integration.Web`
+   In Rider, run all C# tests with Category= `Unit`, `Unit.Architecture`, `Integration.API` and`Integration.Website`
 
    > Note: Use `Group By > Category` in Rider's unit test explorer to view these three categories easily.
 
    OR, in a terminal:
 
    - `dotnet test --filter:"Category=Unit|Category=Unit.Architecture" src\SaaStack.sln`
 
-   - `dotnet test --filter:"Category=Integration.Web" src\SaaStack.sln`
+   - `dotnet test --filter:"Category=Integration.API|Category=Integration.Website" src\SaaStack.sln`
 
 3. Configure your "Commit " window to select the "Cleanup with 'Full Cleanup' profile".
 
@@ -268,13 +268,13 @@ To kill these processes:
 
 ### Everyday tests
 
-Run all C# tests with Category= `Unit`, `Unit.Architecture` and `Integration.Web`
+Run all C# tests with Category= `Unit`, `Unit.Architecture`, `Integration.API` and `Integration.Website`
 
 OR, in a terminal:
 
 - `dotnet test --filter:"Category=Unit|Category=Unit.Architecture" src\SaaStack.sln`
 
-- `dotnet test --filter:"Category=Integration.Web" src\SaaStack.sln`
+- `dotnet test --filter:"Category=Integration.API|Category=Integration.Website" src\SaaStack.sln`
 
 > Note: All tests will be run in parallel in `Rider` or in `dotnet test`.
 

diff --git a/docs/design-principles/0020-api-framework.md b/docs/design-principles/0020-api-framework.md
@@ -316,12 +316,12 @@ Then we use Roslyn analyzers (and other tooling) to guide the author in creating
 
 6. You would then add a validation class to validate the inbound request (see next section)
 
-7. Lastly, you would write an integration test to test that your API works in the test category: `Integration.Web`.
+7. Lastly, you would write an integration test to test that your API works in the test category: `Integration.API`.
 
    - For example, in the project and folder: `CarsApi.IntegrationTests/CarsApiSpec.cs`
 
    ```c#
-   [Trait("Category", "Integration.Web")] [Collection("API")]
+   [Trait("Category", "Integration.API")] [Collection("API")]
    public class CarsApiSpec : WebApiSpecSetup<Program>
    {
        public CarsApiSpec(WebApplicationFactory<Program> factory) : base(factory)

diff --git a/src/AncillaryInfrastructure.IntegrationTests/AuditsApiSpec.cs b/src/AncillaryInfrastructure.IntegrationTests/AuditsApiSpec.cs
@@ -13,7 +13,7 @@
 
 namespace AncillaryInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class AuditsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/AncillaryInfrastructure.IntegrationTests/EmailsApiSpec.cs b/src/AncillaryInfrastructure.IntegrationTests/EmailsApiSpec.cs
@@ -17,7 +17,7 @@
 
 namespace AncillaryInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class EmailsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/AncillaryInfrastructure.IntegrationTests/FeatureFlagsApiSpec.cs b/src/AncillaryInfrastructure.IntegrationTests/FeatureFlagsApiSpec.cs
@@ -12,7 +12,7 @@
 
 namespace AncillaryInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class FeatureFlagsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/AncillaryInfrastructure.IntegrationTests/ProvisioningsApiSpec.cs b/src/AncillaryInfrastructure.IntegrationTests/ProvisioningsApiSpec.cs
@@ -15,7 +15,7 @@
 
 namespace AncillaryInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class ProvisioningsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/AncillaryInfrastructure.IntegrationTests/RecordingApiSpec.cs b/src/AncillaryInfrastructure.IntegrationTests/RecordingApiSpec.cs
@@ -12,7 +12,7 @@
 
 namespace AncillaryInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class RecordingApiSpec : WebApiSpec<Program>
 {

diff --git a/src/AncillaryInfrastructure.IntegrationTests/UsagesApiSpec.cs b/src/AncillaryInfrastructure.IntegrationTests/UsagesApiSpec.cs
@@ -15,7 +15,7 @@
 
 namespace AncillaryInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class UsagesApiSpec : WebApiSpec<Program>
 {

diff --git a/src/BookingsInfrastructure.IntegrationTests/BookingsApiSpec.cs b/src/BookingsInfrastructure.IntegrationTests/BookingsApiSpec.cs
@@ -12,7 +12,7 @@
 
 namespace BookingsInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class BookingsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/CarsInfrastructure.IntegrationTests/CarsApiSpec.cs b/src/CarsInfrastructure.IntegrationTests/CarsApiSpec.cs
@@ -11,7 +11,7 @@
 
 namespace CarsInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class CarsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/EndUsersInfrastructure.IntegrationTests/EndUsersApiSpec.cs b/src/EndUsersInfrastructure.IntegrationTests/EndUsersApiSpec.cs
@@ -11,7 +11,7 @@
 
 namespace EndUsersInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class EndUsersApiSpec : WebApiSpec<Program>
 {

diff --git a/src/EndUsersInfrastructure.IntegrationTests/InvitationsApiSpec.cs b/src/EndUsersInfrastructure.IntegrationTests/InvitationsApiSpec.cs
@@ -16,7 +16,7 @@
 
 namespace EndUsersInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class InvitationsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/IdentityInfrastructure.IntegrationTests/AuthTokensApiSpec.cs b/src/IdentityInfrastructure.IntegrationTests/AuthTokensApiSpec.cs
@@ -10,7 +10,7 @@
 
 namespace IdentityInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class AuthTokensApiSpec : WebApiSpec<Program>
 {

diff --git a/src/IdentityInfrastructure.IntegrationTests/MachineCredentialsApiSpec.cs b/src/IdentityInfrastructure.IntegrationTests/MachineCredentialsApiSpec.cs
@@ -14,7 +14,7 @@
 
 namespace IdentityInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class MachineCredentialsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/IdentityInfrastructure.IntegrationTests/PasswordCredentialsApiSpec.cs b/src/IdentityInfrastructure.IntegrationTests/PasswordCredentialsApiSpec.cs
@@ -17,7 +17,7 @@
 
 namespace IdentityInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class PasswordCredentialsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/IdentityInfrastructure.IntegrationTests/SingleSignOnApiSpec.cs b/src/IdentityInfrastructure.IntegrationTests/SingleSignOnApiSpec.cs
@@ -13,7 +13,7 @@
 
 namespace IdentityInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class SingleSignOnApiSpec : WebApiSpec<Program>
 {

diff --git a/src/ImagesInfrastructure.IntegrationTests/ImagesApiSpec.cs b/src/ImagesInfrastructure.IntegrationTests/ImagesApiSpec.cs
@@ -13,7 +13,7 @@
 
 namespace ImagesInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class ImagesApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/AuthNApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/AuthNApiSpec.cs
@@ -16,7 +16,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class AuthNApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/AuthZApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/AuthZApiSpec.cs
@@ -15,7 +15,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class AuthZApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/ContentNegotiationApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/ContentNegotiationApiSpec.cs
@@ -9,7 +9,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class ContentNegotiationApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/DataFormatsApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/DataFormatsApiSpec.cs
@@ -11,7 +11,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class DataFormatsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/DefaultStatusCodeApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/DefaultStatusCodeApiSpec.cs
@@ -8,7 +8,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class DefaultStatusCodeApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/ErrorApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/ErrorApiSpec.cs
@@ -8,7 +8,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class ErrorApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/HealthCheckApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/HealthCheckApiSpec.cs
@@ -6,7 +6,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class HealthCheckApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/MultiTenancySpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/MultiTenancySpec.cs
@@ -25,7 +25,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class MultiTenancySpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/RequestCorrelationApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/RequestCorrelationApiSpec.cs
@@ -13,7 +13,7 @@ namespace Infrastructure.Web.Api.IntegrationTests;
 [UsedImplicitly]
 public class RequestCorrelationApiSpec
 {
-    [Trait("Category", "Integration.Web")]
+    [Trait("Category", "Integration.API")]
     [Collection("API")]
     public class GivenAnHttpClient : WebApiSpec<Program>
     {
@@ -65,7 +65,7 @@ public async Task WhenGetWithXCorrelationId_ThenReturnsSameResponseHeader()
         }
     }
 
-    [Trait("Category", "Integration.Web")]
+    [Trait("Category", "Integration.API")]
     [Collection("API")]
     public class GivenAJsonClient : WebApiSpec<Program>
     {

diff --git a/src/Infrastructure.Web.Api.IntegrationTests/ValidationApiSpec.cs b/src/Infrastructure.Web.Api.IntegrationTests/ValidationApiSpec.cs
@@ -9,7 +9,7 @@
 
 namespace Infrastructure.Web.Api.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class ValidationApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Website.IntegrationTests/AuthNApiSpec.cs b/src/Infrastructure.Web.Website.IntegrationTests/AuthNApiSpec.cs
@@ -13,7 +13,7 @@
 
 namespace Infrastructure.Web.Website.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.Website")]
 [Collection("API")]
 public class AuthNApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Website.IntegrationTests/CSRFApiSpec.cs b/src/Infrastructure.Web.Website.IntegrationTests/CSRFApiSpec.cs
@@ -17,7 +17,7 @@ namespace Infrastructure.Web.Website.IntegrationTests;
 [UsedImplicitly]
 public class CSRFApiSpec
 {
-    [Trait("Category", "Integration.Web")]
+    [Trait("Category", "Integration.Website")]
     [Collection("API")]
     public class GivenNoContext : WebApiSpec<Program>
     {
@@ -61,7 +61,7 @@ public async Task WhenRequestWebRoot_ThenReturnsIndexHtml()
         }
     }
 
-    [Trait("Category", "Integration.Web")]
+    [Trait("Category", "Integration.Website")]
     [Collection("API")]
     public class GivenAnInsecureGetRequest : WebApiSpec<Program>
     {
@@ -115,7 +115,7 @@ public async Task WhenRequestedForUserWithCSRFToken_ThenSucceeds()
         }
     }
 
-    [Trait("Category", "Integration.Web")]
+    [Trait("Category", "Integration.Website")]
     [Collection("API")]
     public class GivenAnInsecurePostRequestByAnonymousUser : WebApiSpec<Program>
     {
@@ -226,7 +226,7 @@ public async Task WhenRequestedWithUserCSRFToken_ThenForbidden()
         }
     }
 
-    [Trait("Category", "Integration.Web")]
+    [Trait("Category", "Integration.Website")]
     [Collection("API")]
     public class GivenAnInsecurePostRequestByAuthenticatedUser : WebApiSpec<Program>
     {

diff --git a/src/Infrastructure.Web.Website.IntegrationTests/FeatureFlagsApiSpec.cs b/src/Infrastructure.Web.Website.IntegrationTests/FeatureFlagsApiSpec.cs
@@ -15,7 +15,7 @@
 
 namespace Infrastructure.Web.Website.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.Website")]
 [Collection("API")]
 public class FeatureFlagsApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Website.IntegrationTests/HealthCheckApiSpec.cs b/src/Infrastructure.Web.Website.IntegrationTests/HealthCheckApiSpec.cs
@@ -6,7 +6,7 @@
 
 namespace Infrastructure.Web.Website.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.Website")]
 [Collection("API")]
 public class HealthCheckApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Website.IntegrationTests/RecordingApiSpec.cs b/src/Infrastructure.Web.Website.IntegrationTests/RecordingApiSpec.cs
@@ -17,7 +17,7 @@
 
 namespace Infrastructure.Web.Website.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.Website")]
 [Collection("API")]
 public class RecordingApiSpec : WebApiSpec<Program>
 {

diff --git a/src/Infrastructure.Web.Website.IntegrationTests/ReverseProxyApiSpec.cs b/src/Infrastructure.Web.Website.IntegrationTests/ReverseProxyApiSpec.cs
@@ -13,7 +13,7 @@
 
 namespace Infrastructure.Web.Website.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.Website")]
 [Collection("API")]
 public class ReverseProxyApiSpec : WebApiSpec<Program>
 {

diff --git a/src/OrganizationsInfrastructure.IntegrationTests/OrganizationsApiSpec.cs b/src/OrganizationsInfrastructure.IntegrationTests/OrganizationsApiSpec.cs
@@ -13,7 +13,7 @@
 
 namespace OrganizationsInfrastructure.IntegrationTests;
 
-[Trait("Category", "Integration.Web")]
+[Trait("Category", "Integration.API")]
 [Collection("API")]
 public class OrganizationsApiSpec : WebApiSpec<Program>
 {