Superuser

Author: chinmaymudholkar1

.github/workflows/MAVIS_TEST.yml

@@ -92,7 +92,7 @@ jobs:
         echo "::group::Firefox"
         pytest --browser_or_device firefox
         echo "::endgroup::"
-    - name: Test on iPhone 12
+    - name: Test on iPhone 14
       env:
         HEADLESS: ${{ vars.HEADLESS }}
         CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
@@ -105,10 +105,10 @@ jobs:
         TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
         API_TOKEN: ${{ secrets.API_TOKEN }}
       run: |
-        echo "::group::iPhone 12"
-        pytest -m mobile --browser_or_device iphone_12
+        echo "::group::iPhone 14"
+        pytest -m mobile --browser_or_device iphone_14
         echo "::endgroup::"
-    - name: Test on iPhone 11
+    - name: Test on iPhone 15
       env:
         HEADLESS: ${{ vars.HEADLESS }}
         CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
@@ -121,8 +121,24 @@ jobs:
         TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
         API_TOKEN: ${{ secrets.API_TOKEN }}
       run: |
-        echo "::group::iPhone 11"
-        pytest -m mobile --browser_or_device iphone_11
+        echo "::group::iPhone 15"
+        pytest -m mobile --browser_or_device iphone_15
+        echo "::endgroup::"
+    - name: Test on iPad Gen 7
+      env:
+        HEADLESS: ${{ vars.HEADLESS }}
+        CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
+        TEST_URL: ${{ vars.TEST_URL }}
+        PARENTAL_CONSENT_URL: ${{ vars.PARENTAL_CONSENT_URL }}
+        RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
+        LOGIN_PASSWORD: ${{ secrets.LOGIN_PASSWORD }}
+        LOGIN_USERNAME: ${{ secrets.LOGIN_USERNAME }}
+        TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
+        TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
+        API_TOKEN: ${{ secrets.API_TOKEN }}
+      run: |
+        echo "::group::iPad Gen 7"
+        pytest -m mobile --browser_or_device ipad_7
         echo "::endgroup::"
     - name: Test on Google Pixel 5
       env:

conftest.py

@@ -49,12 +49,17 @@ def start_browser(pw, browser_or_device: str):
     }
     try:
         match browser_or_device.lower():
-            case "iphone_12":
+            case "iphone_14":
                 _browser = pw.webkit.launch(headless=ce.headless_mode)
-                _context = _browser.new_context(**pw.devices["iPhone 12"], http_credentials=_http_credentials)
-            case "iphone_11":
+                _context = _browser.new_context(**pw.devices["iPhone 14"], http_credentials=_http_credentials)
+            case "iphone_15":
                 _browser = pw.chromium.launch(channel="chrome", headless=ce.headless_mode)
-                _context = _browser.new_context(**pw.devices["iPhone 11"], http_credentials=_http_credentials)
+                _context = _browser.new_context(**pw.devices["iPhone 15"], http_credentials=_http_credentials)
+            case "ipad_7":
+                _browser = pw.chromium.launch(headless=ce.headless_mode)
+                _context = _browser.new_context(
+                    **pw.devices["iPad (gen 7) landscape"], http_credentials=_http_credentials
+                )
             case "pixel_5":
                 _browser = pw.webkit.launch(headless=ce.headless_mode)
                 _context = _browser.new_context(**pw.devices["Pixel 5"], http_credentials=_http_credentials)

libs/__init__.py

@@ -18,6 +18,8 @@ class CurrentExecution:
     capture_screenshot_flag: bool = False
     login_username: str = ""
     login_password: str = ""
+    superuser_username: str = ""
+    superuser_password: str = ""
     parental_consent_url: str = ""
     reset_endpoint: str = ""
     api_token: str = ""

pages/pg_login.py

@@ -12,7 +12,8 @@ class pg_login:
     BTN_LOGIN = "Log in"
     BTN_LOGOUT = "Log out"
     LBL_BANNER = "banner"
-    LBL_USER = "Nurse Joy"
+    LBL_NURSE = "Nurse Joy"
+    LBL_SUPERUSER = "Superuser Superuser"
     LBL_PARAGRAPH = "paragraph"
 
     def click_start(self):
@@ -28,15 +29,22 @@ def click_login(self):
         self.po.perform_action(locator=self.BTN_LOGIN, action=actions.CLICK_BUTTON)
 
     def verify_login_successful(self):
-        self.po.verify(locator=self.LBL_BANNER, property=object_properties.TEXT, value=self.LBL_USER)
+        self.po.verify(locator=self.LBL_BANNER, property=object_properties.TEXT, value=self.LBL_NURSE)
 
-    def perform_valid_login(self):
+    def login_as_nurse(self):
         self.click_start()
         self.enter_username(username=self.ce.login_username)
         self.enter_password(password=self.ce.login_password)
         self.click_login()
         self.verify_login_successful()
 
+    def login_as_superuser(self):
+        self.click_start()
+        self.enter_username(username=self.ce.superuser_username)
+        self.enter_password(password=self.ce.superuser_password)
+        self.click_login()
+        self.verify_login_successful()
+
     def perform_invalid_login(self, user: str, pwd: str, expected_message: str) -> str:
         self.click_start()
         self.enter_username(username=user)

tests/test_01_login.py

@@ -29,6 +29,6 @@ def test_invalid_login(self, user, pwd, expected_message):
     @pytest.mark.order(102)
     def test_home_page_links(self):
         self.login_page.go_to_login_page()
-        self.login_page.perform_valid_login()
+        self.login_page.login_as_nurse()
         self.dashboard_page.verify_all_expected_links()
         self.login_page.perform_logout()

tests/test_02_sessions.py

@@ -10,7 +10,7 @@ class Test_Sessions:
 
     @pytest.fixture(scope="function", autouse=True)
     def setup_tests(self, start_mavis: None):
-        self.login_page.perform_valid_login()
+        self.login_page.login_as_nurse()
         self.dashboard_page.go_to_dashboard()
         self.dashboard_page.click_sessions()
         yield

tests/test_03_class_list_upload.py

@@ -11,7 +11,7 @@ class Test_Class_List_Upload:
 
     @pytest.fixture(scope="function", autouse=True)
     def setup_tests(self, start_mavis: None):
-        self.login_page.perform_valid_login()
+        self.login_page.login_as_nurse()
         self.dashboard_page.click_sessions()
         self.sessions_page.schedule_a_valid_session()
         self.dashboard_page.go_to_dashboard()

tests/test_04_cohorts.py

@@ -11,7 +11,7 @@ class Test_Cohorts:
 
     @pytest.fixture(scope="function", autouse=True)
     def setup_tests(self, start_mavis: None):
-        self.login_page.perform_valid_login()
+        self.login_page.login_as_nurse()
         self.dashboard_page.click_programmes()
         yield
         self.login_page.perform_logout()

tests/test_05_child_list_upload.py

@@ -11,7 +11,7 @@ class Test_Child_List_Upload:
 
     @pytest.fixture(scope="function", autouse=True)
     def setup_tests(self, start_mavis: None):
-        self.login_page.perform_valid_login()
+        self.login_page.login_as_nurse()
         self.dashboard_page.click_programmes()
         yield
         self.login_page.perform_logout()

tests/test_06_vaccs_batch.py

@@ -10,7 +10,7 @@ class Test_Regression_Vaccines:
 
     @pytest.fixture(scope="function", autouse=True)
     def setup_tests(self, start_mavis: None):
-        self.login_page.perform_valid_login()
+        self.login_page.login_as_nurse()
         self.dashboard_page.click_vaccines()
         yield
         self.login_page.perform_logout()