Merge pull request #17 from NHSDigital/fix-failing-tests

Fix failing tests
NHSDigital · Aug 1, 2024 · 00c2eb8 · 00c2eb8
2 parents ad642ba + b20fb76
commit 00c2eb8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/tests_dev.yml b/.github/workflows/tests_dev.yml
@@ -157,4 +157,5 @@ jobs:
       - name: Notify Slack on success
         if: success()
         run: |
-          curl -X POST -H 'Content-type: application/json' --data '{"text":"Ravs tests finished running for the DEV environment ! Check the Allure report: https://nhsdigital.github.io/ravs-tests/#"}' ${{ secrets.SLACK_WEBHOOK_URL }}
+          BRANCH_NAME=$(echo $GITHUB_REF | sed 's|refs/heads/||')
+          curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"Ravs tests finished running for the DEV environment on branch $BRANCH_NAME! Check the Allure report: https://nhsdigital.github.io/ravs-tests/#\"}" ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/features/find_a_patient.feature b/features/find_a_patient.feature
@@ -26,18 +26,21 @@ Feature: Find a patient
       Then I should be directed to the patient's information page and show <name>, <nhsNumber>, <dateofbirth> and <address> details
 
       Examples:
-      | nhsNumber   | name                     | dateofbirth | address   |
-      | 9693632109  | Bill GARTON              | 23/6/1946   | 	1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW  |
-      | 9449304424  | COMFORT11 Jones          | 9/3/2018    | 	Ifyoucan113, GDA11 UCL6, KT17 1NA  |
-      | 9449305552  | Prasad Patel             | 14/2/2020   | 	Caretakers Flat, Line2121, Line323, HYDERABAD, Country, EN2 6SN   |
-      | 9449306621  | Not found                | 20110509    | KT21 1LJ  |
-      | 9449306613  | Briar Anderton           | 20/5/1990   | 123 Main Vyt, AB12 3CE  |
-      | 9449306605  | Srinivasarao Patel       | 03/03/2020  | 	4 Calicut Lane2, Line 2, Line 3, SLOUGH, Berkshire, KT21 1EJ  |
-      | 9449306494  | Reynolds Ryan            | 27/3/2001   | 	40 Queen Street London, EC4R 1DD  |
-      | 9469997956  | SOLOMON DAZLEY           | 20160130    | 	10 BROOK STREET, LANCASTER, LA1 1SL   |
-      | 9469998626  | JONNY CONOPO             | 20150305    | 	1 DAISY BANK, LANCASTER, LA1 3JW   |
-      | 9470004272  | JOJO LANE                | 20150706    | 	10 RAKESMOOR LANE, BARROW-IN-FURNESS, LA14 4LG  |
-      | 9470006143  | TABBY FERN               | 20150222    | 	CLEAR BECK HOUSE, TATHAM, LANCASTER, LA2 8PJ   |
-      | 9470006739  | JANNETTE ARD             | 20151209    | 	1 ST. MARTINS COURT, CONISTON, CUMBRIA, LA21 8HZ  |
-      | 9470011902  | KATEE TUZZIO             | 20150527    | 	BRIDGE END HOUSE, PARK ROAD, MILNTHORPE, CUMBRIA, LA7 7AN  |
-      | 9470032640  | SYBIL PELLING            | 20151217    | 	50 ST. GEORGES QUAY, LANCASTER, LA1 1SA   |
+      | nhsNumber   | name                 | dateofbirth | address   |
+      | 9693632109  | Bill GARTON          | 23/6/1946   | 	1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW  |
+      # | 9449304424  | COMFORT26th Jones | 9/3/2018    | 	Ifyoucan113, 26TH, KT17 1NA  |
+      | 9732743476  | Mike HEESOM         | 24/10/1992  | 	2 CHAPEL YARD, BRIGG, S HUMBERSIDE, DN20 8JY  |
+      | 9650594000  | Archie STRAIN       | 30/7/2014   | 	1 CONINGSBY DRIVE, GRIMSBY, S HUMBERSIDE, DN34 5HQ  |
+      | 9732596996  | Lisa WORTHY         | 30/6/2024   | 	10 NORTON PARK VIEW, SHEFFIELD, S8 8GS  |
+      # | 9449305552  | Milton Jacob        | 4/7/2024    | 	12, OATLANDS ROAD, EN3 5LJ   |
+      | 9449306621  | Not found           | 20110509    | KT21 1LJ  |
+      # | 9449306613  | Briar Anderton    | 20/5/1990   | 	27 Ryde Vale Road, LONDON, SW12 9JQ  |
+      | 9449306605  | Srinivasarao Patel  | 03/03/2020  | 	4 Calicut Lane2, Line 2, Line 3, SLOUGH, Berkshire, KT21 1EJ  |
+      | 9449306494  | Reynolds Ryan       | 27/3/2001   | 	40 Queen Street London, EC4R 1DD  |
+      | 9469997956  | SOLOMON DAZLEY      | 20160130    | 	10 BROOK STREET, LANCASTER, LA1 1SL   |
+      | 9469998626  | JONNY CONOPO        | 20150305    | 	1 DAISY BANK, LANCASTER, LA1 3JW   |
+      | 9470004272  | JOJO LANE           | 20150706    | 	10 RAKESMOOR LANE, BARROW-IN-FURNESS, LA14 4LG  |
+      | 9470006143  | TABBY FERN          | 20150222    | 	CLEAR BECK HOUSE, TATHAM, LANCASTER, LA2 8PJ   |
+      | 9470006739  | JANNETTE ARD        | 20151209    | 	1 ST. MARTINS COURT, CONISTON, CUMBRIA, LA21 8HZ  |
+      | 9470011902  | KATEE TUZZIO        | 20150527    | 	BRIDGE END HOUSE, PARK ROAD, MILNTHORPE, CUMBRIA, LA7 7AN  |
+      | 9470032640  | SYBIL PELLING        | 20151217    | 	50 ST. GEORGES QUAY, LANCASTER, LA1 1SA   |
diff --git a/tests/test_record_a_vaccine_for_patient_with_nhs_number_steps.py b/tests/test_record_a_vaccine_for_patient_with_nhs_number_steps.py
@@ -109,7 +109,6 @@ def step_enter_vaccination_details_and_continue_to_check_and_confirm_screen(shar
             chosen_vaccine = shared_data["chosen_vaccine"]
             shared_data["vaccination_site"] = get_vaccination_site(shared_data["index"])
             shared_data["dose_amount"] = str(get_vaccine_dose_amount(shared_data["vaccinated_type2"]))
-            shared_data["legal_mechanism"] = get_legal_mechanism(shared_data["index"])
             if shared_data['legal_mechanism'] == "Patient Group Directions (PGD)":
                 shared_data['vaccinator'] = shared_data['eligibility_assessing_clinician']
             else: