增加了调试中的切换环境方法

main.py

@@ -5,7 +5,7 @@ from src.framework import common
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     htmlPath = "./report/AI-XM_Report{}.html".format(common.year_to_minute())
     htmlPath = "./report/AI-XM_Report{}.html".format(common.year_to_minute())
-    pytest.main(["-v", '--alluredir={}'.format(htmlPath), './src/testcase/test_MainPage.py', "--durations=0"])
+    pytest.main(["-v", '--alluredir={}'.format(htmlPath), './src/testcase/test_WhiteBoardPage.py', "--durations=0"])
     os.system('allure generate {} -o ./report/output --clean'.format(htmlPath))
     os.system('allure generate {} -o ./report/output --clean'.format(htmlPath))
 
 
     # # 定义报告输出路径
     # # 定义报告输出路径

src/pageobject/basepage.py

@@ -74,8 +74,12 @@ class Page(object):
         return sleep(seconds)
         return sleep(seconds)
 
 
     # 查找文本，点击该文本元素
     # 查找文本，点击该文本元素
-    def click_text(self, text):
-        self.click((By.XPATH, """//span[text()="{}"]""".format(text)))
+    def click_text(self, ele):
+        self.click((By.XPATH, """//span[text()="{}"]""".format(ele)))
+
+
+    def click_what(self, ele_type, what, ele):
+        self.click((By.XPATH, """//{}[{}="{}"]""".format(ele_type, what, ele)))
 
 
     # 键盘down
     # 键盘down
     def keys_down(self):
     def keys_down(self):
@@ -84,11 +88,12 @@ class Page(object):
     # 键盘ctrl+M,command+m
     # 键盘ctrl+M,command+m
     def get_env_window(self):
     def get_env_window(self):
         if platform.system().lower() == "windows":
         if platform.system().lower() == "windows":
-            ActionChains(self.driver).send_keys(Keys.CONTROL, "m").perform()
+            # ActionChains(self.driver).send_keys(Keys.CONTROL, 'm').perform()
+            # ActionChains(self.driver).key_down(Keys.CONTROL).send_keys('m').key_up(Keys.CONTROL).perform()
+            self.find_element((By.XPATH, "//div[@id='root']")).send_keys(Keys.CONTROL, 'm')
+
         elif platform.system().lower() == "darwin":
         elif platform.system().lower() == "darwin":
             ActionChains(self.driver).send_keys(Keys.COMMAND, "m").perform()
             ActionChains(self.driver).send_keys(Keys.COMMAND, "m").perform()
-            # self.driver.find_element(By.XPATH, "//div[@class='title']").send_keys(Keys.COMMAND, "m")
-            # ActionChains(self.driver).key_down(Keys.COMMAND).send_keys("M").key_up(Keys.COMMAND).perform()
 
 
     # 屏幕最大化
     # 屏幕最大化
     def max(self, *loc):
     def max(self, *loc):

src/pageobject/loginpage.py

@@ -14,6 +14,8 @@ class LoginPage(Page):
     password_input = (By.ID, "xmpwd")
     password_input = (By.ID, "xmpwd")
     # 登录按钮
     # 登录按钮
     login_button = (By.CLASS_NAME, "submit")
     login_button = (By.CLASS_NAME, "submit")
+    # 选择环境窗口的关闭按钮
+    close_env_window_btn = (By.XPATH, "//span[@class='anticon anticon-close ant-modal-close-icon']")
 
 
     # 验证元素
     # 验证元素
     # 店铺名称
     # 店铺名称
@@ -42,3 +44,7 @@ class LoginPage(Page):
 
 
     def phone_input_execute_script(self):
     def phone_input_execute_script(self):
         self.excute_script("form xm_phone_login")
         self.excute_script("form xm_phone_login")
+
+    # 关闭环境选择窗口
+    def click_close_env_window(self):
+        self.click(self.close_env_window_btn)

src/testcase/test_LoginPage.py

@@ -24,16 +24,19 @@ class TestLoginPage(object):
     @pytest.mark.usefixtures("before_test_case")
     @pytest.mark.usefixtures("before_test_case")
     def testLogin(self):
     def testLogin(self):
         login_page = LoginPage(driver=self.driver)
         login_page = LoginPage(driver=self.driver)
-        login_page.get_env_window()
-        login_page.sleep(2)
-        login_page.click_text(self.env)
-        login_page.phone_input_execute_script()
-        login_page.sleep(2)
-        # login_page.click_phone_login()
+        login_page.sleep(1)
+        # 执行脚本，隐藏的手机号码输入框弹出
+        # login_page.phone_input_execute_script()
+        login_page.click_phone_login()
         login_page.input_account(account=self.account)
         login_page.input_account(account=self.account)
         login_page.input_password(password=self.password)
         login_page.input_password(password=self.password)
+        # login_page.get_env_window()
+        # login_page.click_what('span', 'text()', self.env)
+        # login_page.click_close_env_window()
         login_page.click_login()
         login_page.click_login()
-        login_page.sleep(5)
+        login_page.sleep(2)
+        login_page.click_text("取 消")
+        login_page.sleep(3)
         # 校验是否存在店铺名称的元素
         # 校验是否存在店铺名称的元素
         assert login_page.ifElementExist(login_page.store_name)
         assert login_page.ifElementExist(login_page.store_name)