From c994b38ba2c08aaebc831e4c8855d806e8353827 Mon Sep 17 00:00:00 2001 From: neelimaguntupalli1-nhs Date: Wed, 6 Nov 2024 17:54:08 +0000 Subject: [PATCH] Ravs 961 update record a vaccine tests (#32) * Fixed failing add existing batch test * Fixed fa * Fixed assessment page fields * Fixed consent page fields and site vaccine, batch fields * Fixed vaccinated page field, giving a first stan now to see if all tests pass * Fixed failing age based warning tests * Sorted record a vaccine tests hopefully * Sorted record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Changed browser to be edge * Updated scan secrets yml * Updated scan secrets yml and removed timeout as it is not needed * Added logging for shared_data when recording a vaccine * Added logging for shared_data when recording a vaccine * Fixed feature file --------- Co-authored-by: root --- .github/workflows/tests_dev.yml | 2 +- .github/workflows/tests_qa.yml | 2 +- conftest.py | 7 +++ ...accine_for_patient_with_nhs_number.feature | 50 +++++++++---------- pages/find_a_patient_page.py | 2 + test_data/models/rsv_vaccine_types.py | 2 +- ...ccine_for_patient_with_nhs_number_steps.py | 9 +++- 7 files changed, 45 insertions(+), 29 deletions(-) diff --git a/.github/workflows/tests_dev.yml b/.github/workflows/tests_dev.yml index 178fe6352..cc3dd3b9b 100644 --- a/.github/workflows/tests_dev.yml +++ b/.github/workflows/tests_dev.yml @@ -38,7 +38,7 @@ jobs: -e RAVS_PASSWORD="${{ secrets.RAVS_PASSWORD }}" \ -e HEADLESS_MODE="true" \ -e TEST_ENVIRONMENT="dev" \ - -e BROWSER="chrome" \ + -e BROWSER="edge" \ -e MARKER="" \ -e AGENTS=3 \ -p 5050:5050 \ diff --git a/.github/workflows/tests_qa.yml b/.github/workflows/tests_qa.yml index 7fc94eb4f..a1c4fb465 100644 --- a/.github/workflows/tests_qa.yml +++ b/.github/workflows/tests_qa.yml @@ -39,7 +39,7 @@ jobs: -e RAVS_PASSWORD="${{ secrets.RAVS_PASSWORD }}" \ -e HEADLESS_MODE="true" \ -e TEST_ENVIRONMENT="qa" \ - -e BROWSER="chrome" \ + -e BROWSER="edge" \ -e MARKER="" \ -e AGENTS=3 \ -p 5050:5050 \ diff --git a/conftest.py b/conftest.py index 80f323040..8f5dd9835 100644 --- a/conftest.py +++ b/conftest.py @@ -147,20 +147,26 @@ def click_find_a_patient_and_search_with_nhs_number(nhs_number): def click_on_patient_name(name): click_on_patient_name_search_result(name) + wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) def click_find_a_patient_top_nav_bar(): click_find_a_patient_nav_link() + wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) def click_manage_users_top_nav_bar(): click_manage_users_nav_link() + wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) def click_on_patient_search_result_and_click_choose_vaccine(name, vaccine): + wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) immunisation_history_records = get_count_of_immunisation_history_records(vaccine) click_choose_vaccine_button() + wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) attach_screenshot("clicked_on_patient_" + name + "_and_clicked_choose_vaccine_button") return immunisation_history_records def choose_vaccine_and_vaccine_type_for_patient(site, vaccine, vaccine_type): + wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) click_delivery_team_radiobutton(site) click_vaccine_radiobutton(vaccine) click_vaccine_type_radiobutton(vaccine_type) @@ -168,6 +174,7 @@ def choose_vaccine_and_vaccine_type_for_patient(site, vaccine, vaccine_type): attach_screenshot("selected_vaccine_" + vaccine + "_and_" + vaccine_type + "_and_clicked_continue_button") def choose_vaccine_and_vaccine_type_only(site, vaccine, vaccine_type): + wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) click_delivery_team_radiobutton(site) click_vaccine_radiobutton(vaccine) click_vaccine_type_radiobutton(vaccine_type) diff --git a/features/record_a_vaccine_for_patient_with_nhs_number.feature b/features/record_a_vaccine_for_patient_with_nhs_number.feature index 9ae17afc1..98ac3112a 100644 --- a/features/record_a_vaccine_for_patient_with_nhs_number.feature +++ b/features/record_a_vaccine_for_patient_with_nhs_number.feature @@ -17,35 +17,35 @@ Feature: Record vaccine Examples: | index | nhs_number | site | care_model | eligibility | assess_date | consent | vaccination | vaccination_date | name | dob | address | chosen_vaccine | batch_number | batch_expiry_date | - | 0 | 9693632109 | ALBERT HOUSE | Vaccination Centre | yes | today | yes | yes | today | Bill GARTON | 23/6/1946 | 1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW | COVID-19 | SDYY2-01 | 19/10/2025 | - | 1 | 9693632109 | BECCLES HOUSE | Vaccination Centre | yes | today-1 | yes | yes | today-1 | Bill GARTON | 23/6/1946 | 1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW | COVID-19 | SDYY2-12B | 19/10/2025 | - | 2 | 9470040228 | BIRCH HOUSE | Hospital Hub | yes | today-1 | yes | yes | today | HERBERT HAAG | 14/12/1922 | 10 COASTAL ROAD, HEST BANK, LANCASTER, LA2 6HN | COVID-19 | SB12345-12A | 19/2/2026 | - | 3 | 9470057589 | ALBERT HOUSE | Care Home | yes | today-2 | yes | yes | today-1 | ROGER SEABORNE | 13/12/1922 | 10 ANN STREET, DALTON-IN-FURNESS, CUMBRIA, LA15 8BG | COVID-19 | SDYY2-13A | 19/10/2026 | - | 4 | 9472710255 | BECCLES HOUSE | Home Of Housebound Patient | yes | today-3 | yes | yes | today-2 | DELICE PINKER | 10/11/1926 | HARDCRAGG HOUSE, HARDCRAGG WAY, GRANGE-OVER-SANDS, CUMBRIA, LA11 6BH | COVID-19 | SDYY2-14A | 19/10/2026 | - | 5 | 9473629885 | BIRCH HOUSE | Off-site Outreach Event | yes | today-4 | yes | yes | today-3 | MARGIE PUCKEY | 27/5/1924 | MANSART COURT, 10 OLIVE SHAPLEY AVENUE, MANCHESTER, M20 6QB | COVID-19 | SDYY2-15A | 19/10/2026 | + | 0 | 9693632109 | ALBERT HOUSE | Vaccination Centre open to the public | yes | today | yes | yes | today | Bill GARTON | 23/6/1946 | 1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW | COVID-19 | SDYY2-01 | 19/10/2025 | + | 1 | 9693632109 | BECCLES HOUSE | Vaccination centre open to the public | yes | today-1 | yes | yes | today-1 | Bill GARTON | 23/6/1946 | 1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW | COVID-19 | SDYY2-12B | 19/10/2025 | + | 2 | 9470040228 | BIRCH HOUSE | Hospital hub for staff and patients | yes | today-1 | yes | yes | today | HERBERT HAAG | 14/12/1922 | 10 COASTAL ROAD, HEST BANK, LANCASTER, LA2 6HN | COVID-19 | SB12345-12A | 19/2/2026 | + | 3 | 9470057589 | ALBERT HOUSE | Care home | yes | today-2 | yes | yes | today-1 | ROGER SEABORNE | 13/12/1922 | 10 ANN STREET, DALTON-IN-FURNESS, CUMBRIA, LA15 8BG | COVID-19 | SDYY2-13A | 19/10/2026 | + | 4 | 9472710255 | BECCLES HOUSE | Housebound patient's home | yes | today-3 | yes | yes | today-2 | DELICE PINKER | 10/11/1926 | HARDCRAGG HOUSE, HARDCRAGG WAY, GRANGE-OVER-SANDS, CUMBRIA, LA11 6BH | COVID-19 | SDYY2-14A | 19/10/2026 | + | 5 | 9473629885 | BIRCH HOUSE | Outreach event | yes | today-4 | yes | yes | today-3 | MARGIE PUCKEY | 27/5/1924 | MANSART COURT, 10 OLIVE SHAPLEY AVENUE, MANCHESTER, M20 6QB | COVID-19 | SDYY2-15A | 19/10/2026 | | 6 | 9437540233 | ALBERT HOUSE | Vaccination Centre | yes | today-5 | yes | yes | today-2 | RANDY FOGDEN | 8/6/1961 | 10 ASHVILLE TERRACE, MANCHESTER, M40 9WG | COVID-19 | SDYY2-16A | 19/10/2026 | - | 7 | 9474374228 | BECCLES HOUSE | Hospital Hub | yes | today-6 | yes | yes | today-3 | ORINDA JUDD | 20/7/1963 | 2 RECTORY PADDOCK, HALTON, LANCASTER, LA2 6LL | COVID-19 | SDYY2-17A | 19/10/2026 | - | 8 | 9437580812 | BIRCH HOUSE | Care Home | yes | today-7 | yes | yes | today-7 | INDIGO CATCHESIDE | 1/3/1959 | 12 CANBERRA STREET, MANCHESTER, M11 4WL | COVID-19 | SDYY2-18A | 19/10/2026 | - | 9 | 9437599165 | ALBERT HOUSE | Home Of Housebound Patient | yes | today-30 | yes | yes | today-30 | CAWRDAV BOBBETT | 21/7/1959 | 127 ALINORA CRESCENT, GORING-BY-SEA, WORTHING, W SUSSEX, BN12 4HN | COVID-19 | SDYY2-18B | 19/10/2026 | - | 10 | 9474335052 | BECCLES HOUSE | Off-site Outreach Event | yes | today-2 | yes | yes | today-2 | AMERY PIGGOTT | 20/4/1968 | 10 CONNAUGHT ROAD, LANCASTER, LA1 4BQ | COVID-19 | SDYY2-18C | 19/10/2026 | + | 7 | 9474374228 | BECCLES HOUSE | Hospital hub for staff and patients | yes | today-6 | yes | yes | today-3 | ORINDA JUDD | 20/7/1963 | 2 RECTORY PADDOCK, HALTON, LANCASTER, LA2 6LL | COVID-19 | SDYY2-17A | 19/10/2026 | + | 8 | 9437580812 | BIRCH HOUSE | Care home | yes | today-7 | yes | yes | today-7 | INDIGO CATCHESIDE | 1/3/1959 | 12 CANBERRA STREET, MANCHESTER, M11 4WL | COVID-19 | SDYY2-18A | 19/10/2026 | + | 9 | 9437599165 | ALBERT HOUSE | Housebound patient's home | yes | today-30 | yes | yes | today-30 | CAWRDAV BOBBETT | 21/7/1959 | 127 ALINORA CRESCENT, GORING-BY-SEA, WORTHING, W SUSSEX, BN12 4HN | COVID-19 | SDYY2-18B | 19/10/2026 | + | 10 | 9474335052 | BECCLES HOUSE | Outreach event | yes | today-2 | yes | yes | today-2 | AMERY PIGGOTT | 20/4/1968 | 10 CONNAUGHT ROAD, LANCASTER, LA1 4BQ | COVID-19 | SDYY2-18C | 19/10/2026 | | 11 | 9437541817 | BIRCH HOUSE | Vaccination Centre | yes | today-3 | yes | yes | today-1 | FLORINDA DUNNER | 27/3/1957 | 32 HOLLAND ROAD, MANCHESTER, M8 4NP | COVID-19 | SDYY2-18D | 19/10/2026 | - | 12 | 9437540233 | ALBERT HOUSE | Hospital Hub | yes | today-15 | yes | yes | today-7 | RANDY FOGDEN | 8/6/1961 | 10 ASHVILLE TERRACE, MANCHESTER, M40 9WG | COVID-19 | SDYY2-18E | 19/10/2026 | - | 8 | 9474376638 | BECCLES HOUSE | Care Home | yes | today-32 | yes | yes | today-30 | PHYLLIDA ZYLKO | 6/2/1968 | BELL FARM BUNGALOW, CATON GREEN, BROOKHOUSE, LANCASTER, LA2 9JG | Flu | SDYY2-18F | 19/10/2026 | - | 9 | 9474405174 | BIRCH HOUSE | Home Of Housebound Patient | yes | today | yes | yes | today | PHINEAS FAYLE | 4/9/1965 | 2 DIXON TERRACE, NETHER KELLET, CARNFORTH, LANCS, LA6 1EX | Flu | SDYY2-19A | 19/10/2026 | - | 10 | 9474405174 | ALBERT HOUSE | Off-site Outreach Event | yes | today-2 | yes | yes | today | PHINEAS FAYLE | 4/9/1965 | 2 DIXON TERRACE, NETHER KELLET, CARNFORTH, LANCS, LA6 1EX | Flu | SDYY2-14B | 5/5/2025 | + | 12 | 9437540233 | ALBERT HOUSE | Hospital hub for staff and patients | yes | today-15 | yes | yes | today-7 | RANDY FOGDEN | 8/6/1961 | 10 ASHVILLE TERRACE, MANCHESTER, M40 9WG | COVID-19 | SDYY2-18E | 19/10/2026 | + | 8 | 9474376638 | BECCLES HOUSE | Care home | yes | today-32 | yes | yes | today-30 | PHYLLIDA ZYLKO | 6/2/1968 | BELL FARM BUNGALOW, CATON GREEN, BROOKHOUSE, LANCASTER, LA2 9JG | Flu | SDYY2-18F | 19/10/2026 | + | 9 | 9474405174 | BIRCH HOUSE | Housebound patient's home | yes | today | yes | yes | today | PHINEAS FAYLE | 4/9/1965 | 2 DIXON TERRACE, NETHER KELLET, CARNFORTH, LANCS, LA6 1EX | Flu | SDYY2-19A | 19/10/2026 | + | 10 | 9474405174 | ALBERT HOUSE | Outreach event | yes | today-2 | yes | yes | today | PHINEAS FAYLE | 4/9/1965 | 2 DIXON TERRACE, NETHER KELLET, CARNFORTH, LANCS, LA6 1EX | Flu | SDYY2-14B | 5/5/2025 | | 11 | 9450134391 | BECCLES HOUSE | Vaccination Centre | yes | today-3 | yes | yes | today | MARIAN PIESSE | 17/7/1994 | 2 BIRCH STREET, LYTHAM ST. ANNES, LANCS, FY8 5DT | Flu | SDYY2-14C | 19/10/2026 | - | 12 | 9450140960 | BIRCH HOUSE | Hospital Hub | yes | today-1 | yes | yes| today | DEANA GAMBLES | 5/9/1993 | 10 GRASMERE ROAD, LYTHAM ST. ANNES, LANCS, FY8 2HZ | Flu | SDYY2-20A | 19/10/2026 | - | 1 | 9450141444 | ALBERT HOUSE | Care Home | yes | today-4 | yes | yes | today-2 | BRANDIE DYBLE | 25/8/1992 | 49 BLACKPOOL ROAD NORTH, LYTHAM ST. ANNES, LANCS, FY8 3DF | Flu | SDYY2-21A | 5/5/2025 | - | 2 | 9450141711 | BECCLES HOUSE | Home Of Housebound Patient | yes | today-2| yes | yes | today-1 | KRISTIA SIDAWAY | 24/6/1992 | 41 BALTIMORE ROAD, LYTHAM ST. ANNES, LANCS, FY8 3NY | Flu | SDYY2-22A | 5/5/2025 | - | 3 | 9450144699 | BIRCH HOUSE | Off-site Outreach Event | yes | today-1 | yes | yes | today-1 | HOPE TULLY | 10/1/1993 | 2 CHAPEL CLOSE, WESHAM, PRESTON, PR4 3HB | Flu | SDYY2-23A | 19/10/2026 | - | 4 | 9437541817 | ALBERT HOUSE | Off-site Outreach Event | yes | today | yes | yes | today | FLORINDA DUNNER | 27/3/1957 | 32 HOLLAND ROAD, MANCHESTER, M8 4NP | Flu | SDYY2-24A | 5/5/2025 | + | 12 | 9450140960 | BIRCH HOUSE | Hospital hub for staff and patients | yes | today-1 | yes | yes| today | DEANA GAMBLES | 5/9/1993 | 10 GRASMERE ROAD, LYTHAM ST. ANNES, LANCS, FY8 2HZ | Flu | SDYY2-20A | 19/10/2026 | + | 1 | 9450141444 | ALBERT HOUSE | Care home | yes | today-4 | yes | yes | today-2 | BRANDIE DYBLE | 25/8/1992 | 49 BLACKPOOL ROAD NORTH, LYTHAM ST. ANNES, LANCS, FY8 3DF | Flu | SDYY2-21A | 5/5/2025 | + | 2 | 9450141711 | BECCLES HOUSE | Housebound patient's home | yes | today-2| yes | yes | today-1 | KRISTIA SIDAWAY | 24/6/1992 | 41 BALTIMORE ROAD, LYTHAM ST. ANNES, LANCS, FY8 3NY | Flu | SDYY2-22A | 5/5/2025 | + | 3 | 9450144699 | BIRCH HOUSE | Outreach event | yes | today-1 | yes | yes | today-1 | HOPE TULLY | 10/1/1993 | 2 CHAPEL CLOSE, WESHAM, PRESTON, PR4 3HB | Flu | SDYY2-23A | 19/10/2026 | + | 4 | 9437541817 | ALBERT HOUSE | Outreach event | yes | today | yes | yes | today | FLORINDA DUNNER | 27/3/1957 | 32 HOLLAND ROAD, MANCHESTER, M8 4NP | Flu | SDYY2-24A | 5/5/2025 | @recordvaccine Scenario Outline: Record a maternity vaccine with nhs number Given I login to RAVS and set vaccinator details with and and get patient details for with option and choose to vaccinate with vaccine details as , , with And I search for a patient with the NHS number in the find a patient screen And I open the patient record by clicking on patient - When I click choose vaccine button and choose the , , with and click continue + When I click choose vaccine button and choose the , with and click continue And I assess the pregnant patient's with the details of due date as and assessment date as and click continue to record consent screen button And I record with the details and click continue to vaccinate button And I record details and date as and click Continue to Check and confirm screen @@ -56,10 +56,10 @@ Feature: Record vaccine And the immunisation history of the patient should be updated in the patient details page Examples: - | index | nhs_number | site | care_model | eligibility | due_date | assess_date | consent | vaccination | vaccination_date | name | dob | address | chosen_vaccine | vaccine_type | batch_number | batch_expiry_date | - | 4 | 9473629885 | KINGSTON HOUSE | Off-site Outreach Event | yes | today+50 | today-4 | yes | yes | today-3 | MARGIE PUCKEY | 27/5/1924 | MANSART COURT, 10 OLIVE SHAPLEY AVENUE, MANCHESTER, M20 6QB | Respiratory syncytial virus (RSV) | Arexvy | RSVTEST2 | 31/12/2025 | + | index | nhs_number | site | care_model | eligibility | due_date | assess_date | consent | vaccination | vaccination_date | name | dob | address | chosen_vaccine | batch_number | batch_expiry_date | + | 4 | 9473629885 | KINGSTON HOUSE | Outreach event | yes | today+50 | today-4 | yes | yes | today-3 | MARGIE PUCKEY | 27/5/1924 | MANSART COURT, 10 OLIVE SHAPLEY AVENUE, MANCHESTER, M20 6QB | Respiratory syncytial virus (RSV) | RSVTEST2 | 31/12/2025 | # | 0 | 9693632109 | ALBERT HOUSE | Vaccination Centre | yes | today | today | yes | yes | today | Bill GARTON | 23/6/1946 | 1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW | Pertussis | Adacel vaccine suspension | ADAC1-27 | 19/10/2027 | # | 1 | 9693632109 | BECCLES HOUSE | Vaccination Centre | yes | today+100 | today-1 | yes | yes | today-1 | Bill GARTON | 23/6/1946 | 1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW | Pertussis | Boostrix-IPV suspension | BST01-28B | 19/10/2028 | - # | 2 | 9470040228 | BIRCH HOUSE | Hospital Hub | yes | today+290 | today-1 | yes | yes | today | HERBERT HAAG | 14/12/1922 | 10 COASTAL ROAD, HEST BANK, LANCASTER, LA2 6HN | Pertussis | Repevax vaccine suspension | REPE11-29A | 19/2/2029 | - # | 3 | 9472710255 | ALBERT HOUSE | Home Of Housebound Patient | yes | today+5 | today-3 | yes | yes | today-2 | DELICE PINKER | 10/11/1926 | HARDCRAGG HOUSE, HARDCRAGG WAY, GRANGE-OVER-SANDS, CUMBRIA, LA11 6BH | Respiratory syncytial virus (RSV) | Abrysvo | ABRY2-14A | 19/10/2026 | - # | 4 | 9473629885 | BECCLES HOUSE | Off-site Outreach Event | yes | today+50 | today-4 | yes | yes | today-3 | MARGIE PUCKEY | 27/5/1924 | MANSART COURT, 10 OLIVE SHAPLEY AVENUE, MANCHESTER, M20 6QB | Respiratory syncytial virus (RSV) | Arexvy | AREX2-15A | 19/10/2026 | + # | 2 | 9470040228 | BIRCH HOUSE | Hospital hub for staff and patients | yes | today+290 | today-1 | yes | yes | today | HERBERT HAAG | 14/12/1922 | 10 COASTAL ROAD, HEST BANK, LANCASTER, LA2 6HN | Pertussis | Repevax vaccine suspension | REPE11-29A | 19/2/2029 | + # | 3 | 9472710255 | ALBERT HOUSE | Housebound patient's home | yes | today+5 | today-3 | yes | yes | today-2 | DELICE PINKER | 10/11/1926 | HARDCRAGG HOUSE, HARDCRAGG WAY, GRANGE-OVER-SANDS, CUMBRIA, LA11 6BH | Respiratory syncytial virus (RSV) | Abrysvo | ABRY2-14A | 19/10/2026 | + # | 4 | 9473629885 | BECCLES HOUSE | Outreach event | yes | today+50 | today-4 | yes | yes | today-3 | MARGIE PUCKEY | 27/5/1924 | MANSART COURT, 10 OLIVE SHAPLEY AVENUE, MANCHESTER, M20 6QB | Respiratory syncytial virus (RSV) | Arexvy | AREX2-15A | 19/10/2026 | diff --git a/pages/find_a_patient_page.py b/pages/find_a_patient_page.py index 2947e1de0..59d74b3df 100644 --- a/pages/find_a_patient_page.py +++ b/pages/find_a_patient_page.py @@ -166,12 +166,14 @@ def check_patient_postcode_search_result_exists(postcode, wait): def check_patient_nhs_number_search_result_exists(nhsNumber, wait): element = ("role", "cell", nhsNumber) + time.sleep(2) wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) wait_for_element_to_appear(element) return check_element_exists(element, wait) def check_patient_not_found_for_nhs_number_message_exists(nhsNumber, wait): element = ("role", "heading", f"No result found for {nhsNumber}") + time.sleep(2) wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) wait_for_element_to_appear(element) return check_element_exists(element, wait) diff --git a/test_data/models/rsv_vaccine_types.py b/test_data/models/rsv_vaccine_types.py index 488ebcdf6..1d5611d04 100644 --- a/test_data/models/rsv_vaccine_types.py +++ b/test_data/models/rsv_vaccine_types.py @@ -1,4 +1,4 @@ rsv_vaccine_types = [ "Abrysvo", - "Arexvy ", + "Arexvy", ] 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 index 26b594ed3..359820d8a 100644 --- 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 @@ -66,11 +66,12 @@ def step_search_for_patient(shared_data): def step_search_for_patient(shared_data, name): attach_screenshot("before_clicking_patient_name") click_on_patient_name(name) + attach_screenshot("before_clicking_patient_name") shared_data["patient_name"] = name @when(parse("I click choose vaccine button and choose the {chosen_vaccine}, {batch_number} with {batch_expiry_date} and click continue")) def step_choose_vaccine_and_vaccine_type(shared_data, chosen_vaccine, batch_number, batch_expiry_date): - # time.sleep(3) + time.sleep(3) immunisation_history_records_count_before_vaccination = click_on_patient_search_result_and_click_choose_vaccine(shared_data['patient_name'], chosen_vaccine) shared_data["immunisation_history_records_count_before_vaccination"] = immunisation_history_records_count_before_vaccination choose_vaccine_and_vaccine_type_for_patient(shared_data['site'], chosen_vaccine, shared_data['chosen_vaccine_type']) @@ -136,6 +137,7 @@ def step_enter_vaccination_details_and_continue_to_check_and_confirm_screen(shar shared_data["no_vaccination_reason"] = get_vaccination_not_given_reason(shared_data["index"]) enter_vaccine_details_and_click_continue_to_check_and_confirm(shared_data["vaccinated_decision"], shared_data["care_model"], shared_data["vaccination_date"], chosen_vaccine, shared_data["chosen_vaccine_type"], shared_data["vaccination_site"], shared_data["batch_number"], shared_data["batch_expiry_date"], shared_data["dose_amount"], shared_data["vaccinator"], shared_data["vaccination_comments"], shared_data["legal_mechanism"], shared_data["no_vaccination_reason"]) attach_screenshot("entered_vaccination_details") + logging.info(shared_data) @then(parse("I need to be able to see the patient {name}, {dob}, {address} and vaccination details on the check and confirm screen")) def step_see_patient_details_on_check_and_confirm_screen(shared_data, name, dob, address): @@ -164,10 +166,13 @@ def click_confirm_and_save_button_record_saved(shared_data): @then("the immunisation history of the patient should be updated in the patient details page") def immunisation_history_should_be_updated(shared_data): + attach_screenshot("immunisation_history_records_count_after_vaccination") immunisation_history_records_count_after_vaccination = get_count_of_immunisation_history_records(shared_data["chosen_vaccine"]) assert int(immunisation_history_records_count_after_vaccination) >= int(shared_data["immunisation_history_records_count_before_vaccination"]) + 1 click_delete_history_link(shared_data["chosen_vaccine"]) + attach_screenshot("click_delete_history_link") click_delete_vaccination_button() + attach_screenshot("click_delete_vaccination_button") shared_data.clear() @then("when I click confirm and save button, the immunisation history of the patient should be updated in the patient details page") @@ -188,3 +193,5 @@ def click_confirm_and_save_button_immunisation_history_should_be_updated(shared_ immunisation_history_records_count_after_vaccination = get_count_of_immunisation_history_records(shared_data["chosen_vaccine"]) assert int(immunisation_history_records_count_after_vaccination) == int(shared_data["immunisation_history_records_count_before_vaccination"]) shared_data.clear() + attach_screenshot("patient_details_screen_with_immunisation_history") +