From 84d824ab75d547484a11633c23d217f0deba4e92 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期一, 17 七月 2023 16:24:03 +0800
Subject: [PATCH] 测评系统自动测试

---
 po/test_package_list_page.py |   67 ++++++++++++++++-----------------
 1 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/po/test_package_list_page.py b/po/test_package_list_page.py
index 35d1e8e..d64c593 100644
--- a/po/test_package_list_page.py
+++ b/po/test_package_list_page.py
@@ -23,7 +23,7 @@
         鐐瑰嚮鍒涘缓鎸夐挳
         :return:
         """
-        self.click(PackageList.create_btn)
+        self.click_wait(PackageList.create_btn)
         # 鍒囨崲鍒癮dd绐楀彛鐨刬frame
         self.switch_iframe(PackageList.add_iframe)
 
@@ -33,7 +33,7 @@
         :return:
         """
         # 鐐瑰嚮鍒犻櫎鎸夐挳
-        self.click(PackageList.delete_btn)
+        self.click_wait(PackageList.delete_btn)
         # 鐐瑰嚮纭鎸夐挳
         self.click_wait(PackageList.delete_confirm_btn)
 
@@ -43,7 +43,7 @@
         :param testPackageName: 娴嬭瘯鍖呭悕绉�
         :return:
         """
-        self.send_text(testPackageName, PackageList.add_testPackageName_input)
+        self.send_text_wait(testPackageName, PackageList.add_testPackageName_input)
 
     def reportCompanyName_input(self, reportCompanyName):
         """
@@ -51,7 +51,7 @@
         :param reportCompanyName: 鎶ュ憡浼佷笟鍚嶇О
         :return:
         """
-        self.send_text(reportCompanyName, PackageList.add_reportCompanyName_input)
+        self.send_text_wait(reportCompanyName, PackageList.add_reportCompanyName_input)
 
     def testPackageType_select(self, testPackageType):
         """
@@ -60,9 +60,9 @@
         :return:
         """
         # 鐐瑰嚮涓嬫媺妗�
-        self.click(PackageList.add_testPackageType_select)
+        self.click_wait(PackageList.add_testPackageType_select)
         # 鑾峰彇鎵�鏈夐�夐」
-        options = self.get_elements(PackageList.add_testPackageType_option)
+        options = self.get_elements_wait(PackageList.add_testPackageType_option)
         # 鍒ゆ柇閫夐」鏄惁涓庝紶鍏ョ殑閫夐」鐩哥瓑
         for opt in options:
             if opt.text == testPackageType:
@@ -77,12 +77,12 @@
         :return:
         """
         # 鐐瑰嚮鏌ヨ鎸夐挳
-        self.click(PackageList.add_prodTree_btn)
+        self.click_wait(PackageList.add_prodTree_btn)
         # 鍒囨崲鍒皃rodTree鐨刬frame
         self.switch_iframe_wait(PackageList.prodTree_iframe)
         time.sleep(2)
         # 鑾峰彇鎵�鏈夐�夐」
-        options = self.get_elements(PackageList.prodTree_option)
+        options = self.get_elements_wait(PackageList.prodTree_option)
         # 鍒ゆ柇閫夐」鏄惁涓庝紶鍏ラ�夐」鐩哥瓑
         for opt in options:
             if opt.text == prodName:
@@ -91,7 +91,7 @@
         # 鍒囨崲鍒颁笂涓�灞傜殑iframe
         self.switch_parent_iframe()
         # 鐐瑰嚮纭鎸夐挳
-        self.click(PackageList.prodTree_confirm_btn)
+        self.click_wait(PackageList.prodTree_confirm_btn)
 
     def hrReportEmail_input(self, hr_email):
         """
@@ -99,7 +99,7 @@
         :param hr_email:
         :return:
         """
-        self.send_text(hr_email, PackageList.add_hrEmail_input)
+        self.send_text_wait(hr_email, PackageList.add_hrEmail_input)
 
     def invalidTime_input(self, invalid_time):
         """
@@ -107,8 +107,8 @@
         :param invalid_time:
         :return:
         """
-        self.send_text(invalid_time, PackageList.add_invalidTime)
-        self.click(PackageList.add_invalidTime)
+        self.send_text_wait(invalid_time, PackageList.add_invalidTime)
+        self.click_wait(PackageList.add_invalidTime)
 
     def testTemplateLangType_select(self, text):
         """
@@ -119,9 +119,9 @@
         # 鍒嗗壊text
         lang_types = text.split(",")
         # 鐐瑰嚮涓嬫媺妗�
-        self.click(PackageList.add_templateLangType_select)
+        self.click_wait(PackageList.add_templateLangType_select)
         # 鑾峰彇鎵�鏈夐�夐」
-        options = self.get_elements(PackageList.add_templateLangType_option)
+        options = self.get_elements_wait(PackageList.add_templateLangType_option)
         # 鍒ゆ柇閫夐」鏄惁涓庝紶鍏ョ殑閫夐」鐩哥瓑
         for opt in options:
             for lang_type in lang_types:
@@ -139,9 +139,9 @@
         # 鍒嗗壊text
         lang_types = text.split(",")
         # 鐐瑰嚮涓嬫媺妗�
-        self.click(PackageList.add_hrTemplateLangType_select)
+        self.click_wait(PackageList.add_hrTemplateLangType_select)
         # 鑾峰彇鎵�鏈夐�夐」
-        options = self.get_elements(PackageList.add_hrTemplateLangType_option)
+        options = self.get_elements_wait(PackageList.add_hrTemplateLangType_option)
         # 鍒ゆ柇閫夐」鏄惁涓庝紶鍏ョ殑閫夐」鐩哥瓑
         for opt in options:
             for lang_type in lang_types:
@@ -159,9 +159,9 @@
         # 鍒嗗壊text
         templates = text.split(",")
         # 鐐瑰嚮涓嬫媺妗�
-        self.click(PackageList.add_reportTemplateId_select)
+        self.click_wait(PackageList.add_reportTemplateId_select)
         # 鑾峰彇鎵�鏈夐�夐」
-        options = self.get_elements(PackageList.add_reportTemplateId_option)
+        options = self.get_elements_wait(PackageList.add_reportTemplateId_option)
         # 鍒ゆ柇閫夐」鏄惁涓庝紶鍏ョ殑閫夐」鐩哥瓑
         for opt in options:
             for template in templates:
@@ -170,7 +170,7 @@
                     opt.click()
                     break
         # 鍐嶆鐐瑰嚮涓嬫媺妗�
-        self.click(PackageList.add_reportTemplateId_select)
+        self.click_wait(PackageList.add_reportTemplateId_select)
 
     def position_input(self, text):
         """
@@ -178,7 +178,7 @@
         :param text:
         :return:
         """
-        self.send_text(text, PackageList.add_position_input)
+        self.send_text_wait(text, PackageList.add_position_input)
 
     def professionalCategory_input(self, text):
         """
@@ -186,7 +186,7 @@
         :param text:
         :return:
         """
-        self.send_text(text, PackageList.add_professionalCategory_input)
+        self.send_text_wait(text, PackageList.add_professionalCategory_input)
 
     def superiorPosition_input(self, text):
         """
@@ -194,14 +194,14 @@
         :param text:
         :return:
         """
-        self.send_text(text, PackageList.add_superiorPosition_input)
+        self.send_text_wait(text, PackageList.add_superiorPosition_input)
 
     def autoSendReport_checkbox(self):
         """
         鐐瑰嚮娴嬭瘯鑰呮帴鏀舵姤鍛�
         :return:
         """
-        self.click(PackageList.add_autoSendReport_checkbox)
+        self.click_wait(PackageList.add_autoSendReport_checkbox)
 
     def memberReportLangType_select(self, text):
         """
@@ -212,9 +212,9 @@
         # 鍒嗗壊text
         lang_types = text.split(",")
         # 鐐瑰嚮涓嬫媺妗�
-        self.click(PackageList.add_memberTemplateLangType_select)
+        self.click_wait(PackageList.add_memberTemplateLangType_select)
         # 鑾峰彇鎵�鏈夐�夐」
-        options = self.get_elements(PackageList.add_memberTemplateLangType_option)
+        options = self.get_elements_wait(PackageList.add_memberTemplateLangType_option)
         # 鍒ゆ柇閫夐」鏄惁涓庝紶鍏ョ殑閫夐」鐩哥瓑
         for opt in options:
             for lang_type in lang_types:
@@ -230,7 +230,7 @@
         """
         # 鍥炲埌涓婁竴灞俰frame
         self.switch_parent_iframe()
-        self.click(PackageList.add_confirm_btn)
+        self.click_wait(PackageList.add_confirm_btn)
 
     def is_create_success(self, packageName):
         """
@@ -238,7 +238,7 @@
         :param packageName: 娴嬭瘯鍖呭悕绉�
         :return: bool
         """
-        names = self.get_elements(PackageList.table_packageName_a)
+        names = self.get_elements_wait(PackageList.table_packageName_a)
         for name in names:
             if name.text == packageName:
                 return True
@@ -251,7 +251,7 @@
         :return:
         """
         # 鑾峰彇鍒皌able鐨勬墍鏈塼r
-        table_trs = self.get_elements(PackageList.table_package_tr)
+        table_trs = self.get_elements_wait(PackageList.table_package_tr)
         for tr in table_trs:
             # 娴嬭瘯鍖呭悕绉板湪tr涓殑瀹氫綅
             package_name_loc = (By.XPATH, "td[2]/a")
@@ -271,7 +271,7 @@
         鐐瑰嚮鐢熸垚鍒嗕韩閾炬帴鎸夐挳
         :return:
         """
-        self.click(PackageList.share_1_btn)
+        self.click_wait(PackageList.share_1_btn)
 
     def get_share_url(self):
         """
@@ -284,11 +284,10 @@
         url = self.get_input_value_js(PackageList.share_url_input)
         # 閫�鍥炰笂涓�灞俰frame
         self.switch_parent_iframe()
-        time.sleep(1)
         # 鐐瑰嚮鍏抽棴鎸夐挳
-        self.click(PackageList.share_cancel_btn)
+        self.click_wait(PackageList.share_cancel_btn)
+        time.sleep(1)
         return url
-
 
     def selector(self, click_loc, options_loc, text):
         """
@@ -299,9 +298,9 @@
         :return:
         """
         # 鐐瑰嚮涓嬫媺妗�
-        self.click(click_loc)
+        self.click_wait(click_loc)
         # 鑾峰彇鎵�鏈夐�夐」
-        options = self.get_elements(options_loc)
+        options = self.get_elements_wait(options_loc)
         # 鍒ゆ柇閫夐」鏄惁涓庝紶鍏ョ殑閫夐」鐩哥瓑
         for opt in options:
             if opt.text == text:

--
Gitblit v1.9.1