review

src/pageobject/basepage.py

@@ -196,6 +196,8 @@ class Page(object):
         password_input = (By.ID, "xmpwd")
         password_input = (By.ID, "xmpwd")
         # 登录按钮
         # 登录按钮
         login_button = (By.CLASS_NAME, "submit")
         login_button = (By.CLASS_NAME, "submit")
+        # 取消按钮
+        cancel_btn = (By.XPATH, """//span[text()="{}"]""".format("取 消"))
         # env = readConfig.get_env()
         # env = readConfig.get_env()
         # login_page.get_env_window()
         # login_page.get_env_window()
         # login_page.click_what('span', 'text()', self.env)
         # login_page.click_what('span', 'text()', self.env)
@@ -222,7 +224,7 @@ class Page(object):
         # login_page.input_text(password_input, readConfig.test_header(user)['password'])
         # login_page.input_text(password_input, readConfig.test_header(user)['password'])
         # login_page.click(login_button)
         # login_page.click(login_button)
         # login_page.sleep(2)
         # login_page.sleep(2)
-        if login_page.ifElementExist(login_page.click_text("取 消")):
+        if login_page.ifElementExist(cancel_btn):
             login_page.click_text("取 消")
             login_page.click_text("取 消")
             login_page.sleep(3)
             login_page.sleep(3)
 
 

src/pageobject/loginpage.py

@@ -17,6 +17,8 @@ class LoginPage(Page):
     # 选择环境窗口的关闭按钮
     # 选择环境窗口的关闭按钮
     close_env_window_btn = (By.XPATH, "//span[@class='anticon anticon-close ant-modal-close-icon']")
     close_env_window_btn = (By.XPATH, "//span[@class='anticon anticon-close ant-modal-close-icon']")
 
 
+    # 取消按钮
+    cancel_btn = (By.XPATH, """//span[text()="{}"]""".format("取 消"))
     # 验证元素
     # 验证元素
     # 店铺名称
     # 店铺名称
     store_name = (By.XPATH, """//div[@class="inst"]""")
     store_name = (By.XPATH, """//div[@class="inst"]""")

src/testcase/test_LoginPage.py

@@ -37,6 +37,9 @@ class TestLoginPage(object):
         login_page.excute_script_set_url()
         login_page.excute_script_set_url()
         login_page.sleep(1)
         login_page.sleep(1)
 
 
+        if login_page.ifElementExist(login_page.cancel_btn):
+            login_page.click_text("取 消")
+            login_page.sleep(3)
         # login_page.refresh()
         # login_page.refresh()
         # login_page.click_phone_login()
         # login_page.click_phone_login()
         # login_page.input_account(account=self.account)
         # login_page.input_account(account=self.account)