Merge pull request #54 from NHSDigital/screening-appointment-playright

Add a system test covering the happy path for the "record a mammogram" journey

Author: MatMoore

.github/workflows/cicd-1-pull-request.yaml

@@ -72,16 +72,3 @@ jobs:
       terraform_version: "${{ needs.metadata.outputs.terraform_version }}"
       version: "${{ needs.metadata.outputs.version }}"
     secrets: inherit
-  acceptance-stage:
-    name: "Acceptance stage"
-    needs: [metadata, build-stage]
-    uses: ./.github/workflows/stage-4-acceptance.yaml
-    with:
-      build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
-      build_timestamp: "${{ needs.metadata.outputs.build_timestamp }}"
-      build_epoch: "${{ needs.metadata.outputs.build_epoch }}"
-      nodejs_version: "${{ needs.metadata.outputs.nodejs_version }}"
-      python_version: "${{ needs.metadata.outputs.python_version }}"
-      terraform_version: "${{ needs.metadata.outputs.terraform_version }}"
-      version: "${{ needs.metadata.outputs.version }}"
-    secrets: inherit

.github/workflows/cicd-2-main-branch.yaml

@@ -77,19 +77,3 @@ jobs:
       terraform_version: "${{ needs.metadata.outputs.terraform_version }}"
       version: "${{ needs.metadata.outputs.version }}"
     secrets: inherit
-
-  acceptance-stage:
-    name: "Acceptance stage"
-    needs: [metadata, build-stage]
-    uses: ./.github/workflows/stage-4-acceptance.yaml
-    with:
-      build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
-      build_timestamp: "${{ needs.metadata.outputs.build_timestamp }}"
-      build_epoch: "${{ needs.metadata.outputs.build_epoch }}"
-      nodejs_version: "${{ needs.metadata.outputs.nodejs_version }}"
-      python_version: "${{ needs.metadata.outputs.python_version }}"
-      terraform_version: "${{ needs.metadata.outputs.terraform_version }}"
-      version: "${{ needs.metadata.outputs.version }}"
-    secrets: inherit
-
-  # TODO: deploy the thing. This most likely will be done using Azure pipelines.

.github/workflows/stage-2-test.yaml

@@ -33,8 +33,8 @@ on:
         type: string
 
 jobs:
-  test-unit:
-    name: "Unit tests"
+  test:
+    name: "Tests"
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
@@ -79,6 +79,14 @@ jobs:
           DATABASE_USER: postgres
           DATABASE_HOST: localhost
 
+      - name: "Run system test suite"
+        run: make test-ui
+        env:
+          DATABASE_NAME: postgres
+          DATABASE_PASSWORD: postgres
+          DATABASE_USER: postgres
+          DATABASE_HOST: localhost
+
   test-lint:
     name: "Linting"
     runs-on: ubuntu-latest
@@ -92,23 +100,9 @@ jobs:
       - name: "Save the linting result"
         run: |
           echo "Nothing to save"
-  test-coverage:
-    name: "Test coverage"
-    needs: [test-unit]
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
-      - name: "Run test coverage check"
-        run: |
-          echo "Not implemented yet"
-      - name: "Save the coverage check result"
-        run: |
-          echo "Nothing to save"
   perform-static-analysis:
     name: "Perform static analysis"
-    needs: [test-unit]
+    needs: [test]
     runs-on: ubuntu-latest
     permissions:
       id-token: write

.github/workflows/stage-4-acceptance.yaml

@@ -40,16 +40,16 @@ help: # Print help @Others
 	printf "\nUsage: \033[3m\033[93m[arg1=val1] [arg2=val2] \033[0m\033[0m\033[32mmake\033[0m\033[34m <command>\033[0m\n\n"
 	perl -e '$(HELP_SCRIPT)' $(MAKEFILE_LIST)
 
-test: test-unit test-lint # Run all tests @Testing
+test: test-unit test-ui test-lint # Run all tests @Testing
 
 test-unit: # Run unit tests @Testing
-	poetry run pytest
+	poetry run pytest -m 'not system'
 
 test-lint: # Lint files @Testing
 	# TODO
 
 test-ui: # Run UI tests @Testing
-	# TODO
+	poetry run pytest -m system
 
 run: manage_breast_screening/config/.env # Start the development server @Development
 	poetry run ./manage.py runserver

.github/workflows/stage-5-deploy.yaml

@@ -1,7 +1,11 @@
-from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 import os
+
+import pytest
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 from playwright.sync_api import sync_playwright
 
+
+@pytest.mark.system
 class SystemTestCase(StaticLiveServerTestCase):
     @classmethod
     def setUpClass(cls):
@@ -21,4 +25,4 @@ def setUp(self):
         self.page.set_default_timeout(5000)
 
     def tearDown(self):
-        self.page.close()
+        self.page.close()