Updated the test and user.json-bcss 19933

mepr1 · mepr1 · commit 8d562fef0027 · 2025-04-08T14:49:36.000+01:00
diff --git a/tests/smokescreen/test_compartment_1.py b/tests/smokescreen/test_compartment_1.py
@@ -43,7 +43,7 @@ def test_create_invitations_plan(page: Page, smokescreen_properties: dict) -> No
     This is used to create the invitations plan. As it is not always needed it is separate to the main Compartment 1 function
     """
     logging.info("Compartment 1 - Create Invitations Plan")
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     # Create plan - England
     BasePage(page).go_to_call_and_recall_page()
     CallAndRecall(page).go_to_planning_and_monitoring_page()
@@ -77,7 +77,7 @@ def test_compartment_1(page: Page) -> None:
     - Processes S10 (FIT) batches
     """
     logging.info("Compartment 1 - Generate Invitations")
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Generate Invitations
     BasePage(page).click_main_menu_link()
diff --git a/tests/smokescreen/test_compartment_2.py b/tests/smokescreen/test_compartment_2.py
@@ -47,7 +47,7 @@ def test_compartment_2(page: Page, smokescreen_properties: dict) -> None:
     - Logging FIT Devices as Spoilt
     - Processing the generated S3 batch
     """
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     BasePage(page).go_to_fit_test_kits_page()
     FITTestKits(page).go_to_log_devices_page()
@@ -60,7 +60,6 @@ def test_compartment_2(page: Page, smokescreen_properties: dict) -> None:
         sample_date = datetime.now().strftime("%#d %b %Y")
         logging.info("Setting sample date to today's date")
         LogDevices(page).fill_sample_date_field(sample_date)
-        LogDevices(page).log_devices_title.get_by_text("Scan Device").wait_for()
         try:
             LogDevices(page).verify_successfully_logged_device_text()
             logging.info(f"{fit_device_id} Successfully logged")
diff --git a/tests/smokescreen/test_compartment_3.py b/tests/smokescreen/test_compartment_3.py
@@ -46,7 +46,7 @@ def test_compartment_3(page: Page, smokescreen_properties: dict) -> None:
     It then checks that the status of the subject is as expected using the subject screening summary page
     Then it process two batches performing checks on the subjects to ensure they always have the correct event status
     """
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Find data , separate it into normal and abnormal, Add results to the test records in the KIT_QUEUE table (i.e. mimic receiving results from the middleware)
     # and get device IDs and their flags
diff --git a/tests/test_bcss_19181_users_permit_list.py b/tests/test_bcss_19181_users_permit_list.py
@@ -13,7 +13,7 @@ def before_test(page: Page):
     This fixture confirms that users can log in successfully in to BCSS whilst the approved users list is empty
     """
     # Log in to BCSS as bcss401 user, then log out
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     bcss_home.BasePage(page).bowel_cancer_screening_system_header_is_displayed()
     bcss_home.BasePage(page).click_log_out_link()
     logout.Logout(page).verify_log_out_page()
@@ -32,7 +32,7 @@ def test_only_users_on_approved_can_login_to_bcss(page: Page) -> None:
     # Add bcss401 user to approved users list table
     OracleDB().populate_ui_approved_users_table("BCSS401")
     # BCSS401 user successfully logs in to BCSS whilst on the approved list
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     bcss_home.BasePage(page).bowel_cancer_screening_system_header_is_displayed()
     # BCSS401 user logs out
     bcss_home.BasePage(page).click_log_out_link()
diff --git a/tests/test_bowel_scope_page.py b/tests/test_bowel_scope_page.py
@@ -12,7 +12,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the bowel scope page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to bowel scope page
     BasePage(page).go_to_bowel_scope_page()
diff --git a/tests/test_call_and_recall_page.py b/tests/test_call_and_recall_page.py
@@ -38,7 +38,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the call and recall page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to call and recall page
     BasePage(page).go_to_call_and_recall_page()
diff --git a/tests/test_communications_production_page.py b/tests/test_communications_production_page.py
@@ -16,7 +16,7 @@ def before_each(page: Page):
     production page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to communications production page
     BasePage(page).go_to_communications_production_page()
diff --git a/tests/test_contacts_list_page.py b/tests/test_contacts_list_page.py
@@ -15,7 +15,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the contacts list page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to contacts list page
     BasePage(page).go_to_contacts_list_page()
diff --git a/tests/test_download_page.py b/tests/test_download_page.py
@@ -18,7 +18,7 @@ def before_each(page: Page):
     Before every test is executed, this fixture logs in to BCSS as a test user and navigates to the download page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to download page
     BasePage(page).go_to_download_page()
diff --git a/tests/test_fit_test_kits_page.py b/tests/test_fit_test_kits_page.py
@@ -24,7 +24,7 @@ def before_each(page: Page):
     fit test kits page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to fit test kits page
     BasePage(page).go_to_fit_test_kits_page()
diff --git a/tests/test_gfobt_test_kits_page.py b/tests/test_gfobt_test_kits_page.py
@@ -22,7 +22,7 @@ def before_each(page: Page):
     gfobt test kits page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to gFOBT test kits page
     BasePage(page).go_to_gfobt_test_kits_page()
diff --git a/tests/test_home_page_links.py b/tests/test_home_page_links.py
@@ -12,7 +12,7 @@ def before_each(page: Page):
     being displayed
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
 
 @pytest.mark.smoke
diff --git a/tests/test_login_to_bcss.py b/tests/test_login_to_bcss.py
@@ -9,7 +9,7 @@ def test_successful_login_to_bcss(page: Page) -> None:
     Confirms that a user with valid credentials can log in to bcss
     """
     # Enter a valid username and password and click 'sign in' button
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
     # Confirm user has successfully signed in and is viewing the bcss homepage
     expect(page.locator("#ntshAppTitle")).to_contain_text(
         "Bowel Cancer Screening System"
diff --git a/tests/test_lynch_surveillance_page.py b/tests/test_lynch_surveillance_page.py
@@ -13,7 +13,7 @@ def before_each(page: Page):
     lynch surveillance page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to Lynch Surveillance page
     BasePage(page).go_to_lynch_surveillance_page()
diff --git a/tests/test_organisations_page.py b/tests/test_organisations_page.py
@@ -33,7 +33,7 @@ def before_each(page: Page):
     organisations page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to organisations page
     BasePage(page).go_to_organisations_page()
diff --git a/tests/test_reports_page.py b/tests/test_reports_page.py
@@ -34,7 +34,7 @@ def before_each(page: Page):
     reports page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Open reports page
     BasePage(page).go_to_reports_page()
diff --git a/tests/test_screening_practitioner_appointments_page.py b/tests/test_screening_practitioner_appointments_page.py
@@ -18,7 +18,7 @@ def before_each(page: Page):
     screening_practitioner_appointments page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to screening practitioner appointments page
     BasePage(page).go_to_screening_practitioner_appointments_page()
diff --git a/tests/test_screening_subject_search_page.py b/tests/test_screening_subject_search_page.py
@@ -50,7 +50,7 @@ def before_each(page: Page):
     screening_subject_search page
     """
     # Log in to BCSS
-    UserTools.user_login(page, "Hub Manager State Registered")
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
 
     # Go to screening subject search page
     BasePage(page).go_to_screening_subject_search_page()
diff --git a/users.json b/users.json
@@ -1,7 +1,7 @@
 {
   "_comment": "This file can be used to store data on users for your application, and then pulled through using the utils.user_tools UserTools utility. The documentation for this utility explains how this file is read.",
 
-  "Hub Manager State Registered": {
+  "Hub Manager State Registered at BCS01": {
     "username": "BCSS401",
     "roles": [
       "Hub Manager State Registered, Midlands and North West"
