Updated login page function to be generaic user login, using user_tools

Removed dotenv from requirements
Updated existing tests to use new login function

Author: Andyg79

pages/login_page.py

@@ -13,29 +13,18 @@ def __init__(self, page: Page):
         self.username = page.get_by_role("textbox", name="Username")
         self.password = page.get_by_role("textbox", name="Password")
         self.submit_button = page.get_by_role("button", name="submit")
+        load_dotenv()  # Take environment variables from .env
 
-    def login_as_user_bcss401(self):
-        """Logs in to bcss as the test user 'BCSS401'"""
-        # Take environment variables from .env
-        load_dotenv()
+    def login_as_user(self, username: str) -> None:
+        """Logs in to bcss with specified user credentials
+        Args:
+            username (str) enter a username that exists in users.json
+        """
         # Retrieve and enter username from users.json
-        user_details = UserTools.retrieve_user("BCSS401")
+        user_details = UserTools.retrieve_user(username)
         self.username.fill(user_details["username"])
         # Retrieve and enter password from .env file
         password = os.getenv("BCSS_PASS")
         self.password.fill(password)
-        # Click submit button
-        self.submit_button.click()
-
-    def login_as_user_bcss118(self):
-        """Logs in to bcss as the test user 'BCSS118'"""
-        # Take environment variables from .env
-        load_dotenv()
-        # Retrieve and enter username from users.json
-        user_details = UserTools.retrieve_user("BCSS118")
-        self.username.fill(user_details["username"])
-        # Retrieve and enter password from .env file
-        password = os.getenv("BCSS_PASS")
-        self.password.fill(password)
-        # Click submit button
+        # Click Submit
         self.submit_button.click()

requirements.txt

@@ -3,7 +3,6 @@ pytest-html>=4.1.1
 pytest-json-report>=1.5.0
 
 playwright~=1.47.0
-dotenv~=0.9.9
 python-dotenv~=1.0.1
 pytest~=8.3.3
 Flask~=3.0.3

tests/test_bowel_scope_page.py

@@ -11,7 +11,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
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to bowel scope page
     MainMenu(page).go_to_bowel_scope_page()

tests/test_call_and_recall_page.py

@@ -11,7 +11,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
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to call and recall page
     MainMenu(page).go_to_call_and_recall_page()

tests/test_communications_production_page.py

@@ -11,7 +11,7 @@ def before_each(page: Page):
     production page
     """
     # Log in to BCSS
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to communications production page
     MainMenu(page).go_to_communications_production_page()

tests/test_contacts_list_page.py

@@ -11,7 +11,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
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to contacts list page
     MainMenu(page).go_to_contacts_list_page()

tests/test_download_page.py

@@ -11,7 +11,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
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to download page
     MainMenu(page).go_to_download_page()

tests/test_fit_test_kits_page.py

@@ -12,7 +12,7 @@ def before_each(page: Page):
     fit test kits page
     """
     # Log in to BCSS
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to fit test kits page
     MainMenu(page).go_to_fit_test_kits_page()

tests/test_gfobt_test_kits_page.py

@@ -12,7 +12,7 @@ def before_each(page: Page):
     gfob test kits page
     """
     # Log in to BCSS
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
     # Go to gFOBT test kits page
     MainMenu(page).go_to_gfob_test_kits_page()

tests/test_home_page_links.py

@@ -12,7 +12,7 @@ def before_each(page: Page):
     being displayed
     """
     # Log in to BCSS
-    BcssLoginPage(page).login_as_user_bcss401()
+    BcssLoginPage(page).login_as_user("BCSS401")
 
 
 @pytest.mark.smoke