QA-8162 resolved conflicts

Author: kbo001

testCases/test_02_admin.py

@@ -103,6 +103,7 @@ def test_case_02_verify_disease_and_drugs(self):
         p_regimen = PatientRegimenPage(self, 'patient_regimens')
         profile = UserProfilePage(self, "user")
 
+
         d = self.__class__.data
 
         if "banner" in self.settings["url"]:
@@ -205,6 +206,10 @@ def test_case_02_verify_disease_and_drugs(self):
         p_regimen.verify_patient_regimen_page()
         p_regimen.verify_drugs_present(drug_name, drug_switch_now)
 
+        home.click_admin_profile_button()
+        profile.logout_user()
+        login.after_logout()
+
     @pytest.mark.smoketest
     @pytest.mark.dependency(name="tc_admin_3", scope="class")
     def test_case_03_admin_announcement(self):
@@ -226,13 +231,8 @@ def test_case_03_admin_announcement(self):
         else:
             default_client = UserData.client[2]
 
-        try:
-            login.launch_browser(self.settings["url"])
-            login.login(self.settings["login_username"], self.settings["login_password"])
-        except Exception:
-            print("Login Page is not present")
+        login.login(self.settings["login_username"], self.settings["login_password"])
 
-        home.open_dashboard_page()
         home.validate_dashboard_page()
         home.open_admin_page()
         admin.open_announcement()

user_inputs/user_data.py

@@ -11,7 +11,7 @@ class UserData:
     dose_per_pill = 2
     admin_disease = ["Depression", "Hepatitis C", "Ebola"]
     admin_drug = ["Levofloxacin", "Rifapentine", "Truvada", "Stribild"]
-    default_staff_email = ["automation.user@email.com", "automation.user_rogers@email.com", "automation.user_secure@email.com", "automation.user_eu@email.com"]
+    default_staff_email = ["automation.user.banner@gmail.com", "automation.user.rogers@gmail.com", "automation.user.secure@gmail.com", "automation.user.eu@gmail.com"]
     default_staff_name = "Automation Testuser"
     med_status = "Taken"
     provider_observation = "Patient"