Merge pull request #347 from nhs-digital-gp-it-futures/feature/13000-…

…integration-tests Fix integration tests
nhs-digital-gp-it-futures · Mar 17, 2021 · 62b8d16 · 62b8d16
2 parents fb85610 + bdf6183
commit 62b8d16
Show file tree

Hide file tree

Showing 122 changed files with 3,582 additions and 5,094 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -97,28 +97,27 @@ jobs:
       command: test
       projects: '**/*UnitTests.csproj'
       arguments: '-v n --no-build --collect "Code coverage"'
-
-  # To be reinstated
-  # - task: DockerInstaller@0
-  #   inputs:
-  #     dockerVersion: $(dockerVersion)
-
-  # - script: docker-compose up --build -d
-  #   displayName: 'Docker up'
-
-  # - task: DotNetCoreCLI@2
-  #   displayName: 'Run Integration tests'
-  #   inputs:
-  #     command: test
-  #     projects: '**/*IntegrationTests.csproj'
-  #     arguments: '-v n --no-build'
-
-  # - script: docker-compose logs
-  #   displayName: 'Docker Logs'
-  #   condition: failed()
-
-  # - script: docker-compose down -v
-  #   displayName: 'Docker down'
+
+  - task: DockerInstaller@0
+    inputs:
+      dockerVersion: $(dockerVersion)
+
+  - script: docker-compose up --build -d
+    displayName: 'Docker up'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'Run Integration tests'
+    inputs:
+      command: test
+      projects: '**/*IntegrationTests.csproj'
+      arguments: '-v n --no-build'
+
+  - script: docker-compose logs
+    displayName: 'Docker Logs'
+    condition: failed()
+
+  - script: docker-compose down -v
+    displayName: 'Docker down'
 
   - task: DockerCompose@0
     displayName: 'Build: Dev'

diff --git a/...gCatalogue.Ordering.Api.IntegrationTests/Builders/CreateOrderItemRequestPayloadBuilder.cs b/...gCatalogue.Ordering.Api.IntegrationTests/Builders/CreateOrderItemRequestPayloadBuilder.cs
diff --git a/tests/NHSD.BuyingCatalogue.Ordering.Api.IntegrationTests/Builders/OrderSummaryData.cs b/tests/NHSD.BuyingCatalogue.Ordering.Api.IntegrationTests/Builders/OrderSummaryData.cs