From cbd86e8532384250480078e4d34f1886e4801850 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期四, 13 七月 2023 14:47:38 +0800
Subject: [PATCH] 测评系统自动测试

---
 elements/answer_elements.py |    3 +++
 testcase/test_smoking.py    |    5 ++++-
 po/answer_page.py           |   11 +++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/elements/answer_elements.py b/elements/answer_elements.py
index b25cee8..c14ba4f 100644
--- a/elements/answer_elements.py
+++ b/elements/answer_elements.py
@@ -16,3 +16,6 @@
     # 鍔犺浇妗嗘枃瀛�
     loading_text = (By.XPATH, "//div[@class='el-loading-spinner']/p")
 
+    # 鏍囬鏂囧瓧
+    title = (By.XPATH, "//div[@class='align-center']/span[2]")
+
diff --git a/po/answer_page.py b/po/answer_page.py
index 43e8297..682523e 100644
--- a/po/answer_page.py
+++ b/po/answer_page.py
@@ -12,9 +12,15 @@
     loading_count = 0
 
     def answer_MAQ(self):
-        # 鑾峰彇鍒版墍鏈夐�夐」
+        # 鏆傚仠3绉�
         time.sleep(3)
 
+        try:
+            # 鑾峰彇鏍囬
+            self.get_element_wait(Answer.title)
+        except:
+            # 鏍囬涓嶅瓨鍦ㄧ洿鎺ュけ璐�
+            return False
         while True:
 
             # 鍒ゆ柇鏄惁涓�鐩村瓨鍦ㄥ姞杞芥
@@ -28,6 +34,7 @@
                 pass
 
             try:
+                # 鑾峰彇鍒版墍鏈夐�夐」
                 options = self.get_elements(Answer.options)
                 if len(options) < 6:
                     continue
@@ -45,7 +52,7 @@
             try:
                 # 鏁版嵁涓婁紶瀹屾垚
                 self.get_element(Answer.upload_success_title)
-                return
+                return True
             except:
                 pass
 
diff --git a/testcase/test_smoking.py b/testcase/test_smoking.py
index 64b4f68..cfb667f 100644
--- a/testcase/test_smoking.py
+++ b/testcase/test_smoking.py
@@ -165,7 +165,10 @@
         # 鍒涘缓answer瀵硅薄
         answer_page = AnswerPage(driver)
         # 寮�濮嬬瓟棰�
-        answer_page.answer_MAQ()
+        flag = answer_page.answer_MAQ()
+        if not flag:
+            assert flag
+            return
         # 绛斿畬棰樺叧闂綋鍓嶆爣绛鹃〉
         driver.close()
         # 鍒囨崲鍒扮涓�涓爣绛鹃〉

--
Gitblit v1.9.1