Adding a few comments and edditing env variable passwrod to BCSS_PASS

Signed-off-by: Adriano Aru <[email protected]>

Author: adrianoaru-nhs

pages/login_page.py

@@ -32,7 +32,7 @@ def login_as_user_bcss401(self):
         user_details = UserTools.retrieve_user("BCSS401")
         self.username.fill(user_details["username"])
         # Retrieve and enter password from .env file
-        password = os.getenv("BCSS401_PASS")
+        password = os.getenv("BCSS_PASS")
         self.password.fill(password)
         # Click submit button
         self.submit_button.click()
@@ -45,7 +45,7 @@ def login_as_user_bcss118(self):
         user_details = UserTools.retrieve_user("BCSS118")
         self.username.fill(user_details["username"])
         # Retrieve and enter password from .env file
-        password = os.getenv("BCSS118_PASS")
+        password = os.getenv("BCSS_PASS")
         self.password.fill(password)
         # Click submit button
         self.submit_button.click()

pages/navigation_bar_links.py

@@ -10,7 +10,7 @@ def __init__(self, page: Page):
         self.help_link = self.page.get_by_role("link", name="Help")
         self.log_out_link = self.page.get_by_role("link", name="Log-out")
 
-    def click_main_menu_link(self):
+    def click_main_menu_link(self): # change to check if URL is correct
         for _ in range(3):  # Try up to 3 times
             self.page.wait_for_timeout(2000) # Wait for 2 seconds before trying (as sometimes this button is clicked as a redirect happens)
             if self.main_menu_link.is_visible():

tests/Smokescreen/my_pages.py

@@ -0,0 +1,13 @@
+from pages.bcss_home_page import *
+from pages.login_page import *
+from pages.communications_production_page import *
+from pages.call_and_recall_page import *
+from pages.active_batch_list_page import *
+from pages.archived_batch_list_page import *
+from pages.navigation_bar_links import *
+from pages.subject_screening_page import *
+from pages.manage_active_batch_page import *
+from pages.invitations_monitoring_page import *
+from pages.create_a_plan_page import *
+from pages.invitations_plans_page import *
+from utils.oracle import *

tests/Smokescreen/test_compartment_1.py

@@ -3,21 +3,7 @@
 from playwright.sync_api import Page, expect
 import pandas as pd
 import os
-import sys
-sys.path.append("../")
-from utils.oracle import *
-from pages.bcss_home_page import *
-from pages.login_page import *
-from pages.communications_production_page import *
-from pages.call_and_recall_page import *
-from pages.active_batch_list_page import *
-from pages.archived_batch_list_page import *
-from pages.navigation_bar_links import *
-from pages.subject_screening_page import *
-from pages.manage_active_batch_page import *
-from pages.invitations_monitoring_page import *
-from pages.create_a_plan_page import *
-from pages.invitations_plans_page import *
+from my_pages import *
 
 # To Do:
 # Create more POMs

tests/test_login_to_bcss.py

@@ -1,10 +1,9 @@
 import os
-
+import pytest
 from dotenv import load_dotenv
 from playwright.sync_api import Page, expect
 from pages.login_page import BcssLoginPage
 
-
 def test_successful_login_to_bcss(page: Page) -> None:
     """
     Confirms that a user with valid credentials can log in to bcss

utils/oracle.py

@@ -2,6 +2,8 @@
 import os
 from dotenv import load_dotenv
 
+# Edit to "try:"
+
 def database_connection_exec(procedure: str): # To use when "exec xxxx" (stored procedures)
     load_dotenv()
     un = os.getenv("un")
@@ -12,6 +14,7 @@ def database_connection_exec(procedure: str): # To use when "exec xxxx" (stored
         with connection.cursor() as cursor:
             for r in cursor.callproc(procedure):
                 print(r)
+            connection.close()
 
 def database_connection_query(sql: str): # To use when "select a from b"
     load_dotenv()
@@ -23,4 +26,5 @@ def database_connection_query(sql: str): # To use when "select a from b"
         with connection.cursor() as cursor:
             for r in cursor.execute(sql):
                 print(r)
+            connection.close()
             return r