login optimization

Author: chinmaymudholkar1

pages/pg_login.py

@@ -28,31 +28,34 @@ def enter_password(self, password: str):
     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_NURSE)
+    def verify_login(self, successful_login: bool = True, verify_text: str = ""):
+        if successful_login:
+            self.po.verify(locator=self.LBL_BANNER, property=object_properties.TEXT, value=verify_text)
+        else:
+            self.po.verify(locator=self.LBL_PARAGRAPH, property=object_properties.TEXT, value=verify_text)
 
-    def login_as_nurse(self):
+    def __login_actions(self, username: str, password: str) -> None:
         self.click_start()
-        self.enter_username(username=self.ce.nurse_username)
-        self.enter_password(password=self.ce.nurse_password)
+        self.enter_username(username=username)
+        self.enter_password(password=password)
         self.click_login()
-        self.verify_login_successful()
+
+    def login_as_nurse(self):
+
+        self.verify_login(successful_login=True, verify_text=self.LBL_NURSE)
 
     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()
+        self.__login_actions(username=self.ce.superuser_username, password=self.ce.superuser_password)
+        self.verify_login(successful_login=True, verify_text=self.LBL_SUPERUSER)
 
     def try_invalid_login(self, user: str, pwd: str, expected_message: str) -> str:
         self.click_start()
         self.enter_username(username=user)
         self.enter_password(password=pwd)
         self.click_login()
-        self.po.verify(locator=self.LBL_PARAGRAPH, property=object_properties.TEXT, value=expected_message, exact=True)
+        self.verify_login(successful_login=False, verify_text=expected_message)
 
-    def logout_from_the_service(self):
+    def logout_of_mavis(self):
         self.po.perform_action(locator=self.BTN_LOGOUT, action=actions.CLICK_BUTTON)
 
     def go_to_url(self, url: str) -> None:

tests/test_01_login.py

@@ -32,7 +32,7 @@ def test_home_page_links_for_nurse(self):
         self.login_page.go_to_login_page()
         self.login_page.login_as_nurse()
         self.dashboard_page.verify_all_expected_links_for_nurse()
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.login
     @pytest.mark.mobile
@@ -41,4 +41,4 @@ def test_home_page_links_for_superuser(self):
         self.login_page.go_to_login_page()
         self.login_page.login_as_superuser()
         self.dashboard_page.verify_all_expected_links_for_superuser()
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()

tests/test_02_sessions.py

@@ -14,7 +14,7 @@ def setup_tests(self, start_mavis: None):
         self.dashboard_page.go_to_dashboard()
         self.dashboard_page.click_sessions()
         yield
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.sessions
     @pytest.mark.order(201)

tests/test_03_class_list_upload.py

@@ -20,7 +20,7 @@ def setup_tests(self, start_mavis: None):
         self.dashboard_page.go_to_dashboard()
         self.dashboard_page.click_sessions()
         self.sessions_page.delete_all_sessions()
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.classlist
     @pytest.mark.order(301)

tests/test_04_cohorts.py

@@ -14,7 +14,7 @@ def setup_tests(self, start_mavis: None):
         self.login_page.login_as_nurse()
         self.dashboard_page.click_programmes()
         yield
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.cohorts
     @pytest.mark.order(401)

tests/test_05_child_list_upload.py

@@ -14,7 +14,7 @@ def setup_tests(self, start_mavis: None):
         self.login_page.login_as_nurse()
         self.dashboard_page.click_programmes()
         yield
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.childlist
     @pytest.mark.order(501)

tests/test_06_vaccs_batch.py

@@ -13,7 +13,7 @@ def setup_tests(self, start_mavis: None):
         self.login_page.login_as_nurse()
         self.dashboard_page.click_vaccines()
         yield
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.vaccsbatch
     @pytest.mark.mobile

tests/test_07_record_a_vaccine_using_ui.py

@@ -20,7 +20,7 @@ def setup_tests(self, start_mavis: None):
         self.dashboard_page.go_to_dashboard()
         self.dashboard_page.click_sessions()
         self.sessions_page.delete_all_sessions()
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.rav
     @pytest.mark.order(701)

tests/test_08_vaccs_upload.py

@@ -21,7 +21,7 @@ def setup_tests(self, start_mavis: None):
         self.dashboard_page.go_to_dashboard()
         self.dashboard_page.click_sessions()
         self.sessions_page.delete_all_sessions()
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.vaccinations
     @pytest.mark.order(801)

tests/test_09_consent.py

@@ -29,21 +29,21 @@ def setup_tests(self, start_mavis: None):
         self.dashboard_page.go_to_dashboard()
         self.dashboard_page.click_sessions()
         self.sessions_page.delete_all_sessions()
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.fixture
     def get_session_link(self, start_mavis: None):
         self.login_page.login_as_nurse()
         self.dashboard_page.click_sessions()
         self.sessions_page.schedule_a_valid_session()
         link = self.sessions_page.get_consent_url()
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
         yield link
         self.login_page.go_to_login_page()
         self.login_page.login_as_nurse()
         self.dashboard_page.click_sessions()
         self.sessions_page.delete_all_sessions()
-        self.login_page.logout_from_the_service()
+        self.login_page.logout_of_mavis()
 
     @pytest.mark.consent
     @pytest.mark.mobile