diff options
Diffstat (limited to 'common/ui_common/objects/apns.py')
| -rw-r--r-- | common/ui_common/objects/apns.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/common/ui_common/objects/apns.py b/common/ui_common/objects/apns.py index eb496009..84770d4c 100644 --- a/common/ui_common/objects/apns.py +++ b/common/ui_common/objects/apns.py @@ -773,21 +773,21 @@ class APNs: self.create_apn(data) # 2、多个Object导出取消选中目标数据(2个) self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click() - self.driver.find_element(By.XPATH, listPage_object_APNs_select_Second_object_posXpath).click() + self.driver.find_element(By.XPATH, listpage_select_second_object_posXpath).click() self.pop_cancel_export_num() self._delete(data) elif data["SubType"] == "multi_export": if data["multi_type"] == "all":#4、多选导出所有数据，校验行数 self.create_apn(data) self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click() - self.driver.find_element(By.XPATH, listPage_object_APNs_select_Second_object_posXpath).click() + self.driver.find_element(By.XPATH, listpage_select_second_object_posXpath).click() self._export_objects() assert self.export_number == 2,"断言多选全部导出是否符合预期" self._delete(data) elif data["multi_type"] == "part":#3、多选导出第一个数据 self.create_apn(data) self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click() - self.driver.find_element(By.XPATH, listPage_object_APNs_select_Second_object_posXpath).click() + self.driver.find_element(By.XPATH, listpage_select_second_object_posXpath).click() self.pop_export_part() assert self.export_number == 1,"断言单选导出数据是否符合预期" time.sleep(2) @@ -796,9 +796,10 @@ class APNs: else: #多选数据中有group时无法导出 self.create_apn_object_group(self.random_name) self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click() - self.driver.find_element(By.XPATH, listPage_object_APNs_select_Second_object_posXpath).click() + self.driver.find_element(By.XPATH, listpage_select_second_object_posXpath).click() #self.driver.find_element(By.XPATH,listPage_object_apns_exportButton_posXpath).click() - self.objects_po.is_element_clickable(listPage_object_apns_exportButton_posXpath) #判断导出按钮不可点击 + status = self.driver.isElementExist(Element='//span[@class="action-export inline-flex mr-[8px] "]//button[contains(@class, "disabled")]') + assert status == True # export_tip = self.driver.find_element(By.XPATH,'//div[@class="el-message el-message--error"]/p').text # assert export_tip.strip() == "Object group is not exportable" self._delete(data) @@ -1904,9 +1905,9 @@ class APNs: total = self.driver.find_element(By.XPATH,"//span[contains(text(),'Total')]").text count = total.split("Total:") if vsys_name == "PerformanceTestVsys": - assert int(count[1]) == 0 + assert int(count[1]) == 1 elif vsys_name =="vsys0": - assert int(count[1]) == 2 + assert int(count[1]) == 1 assert self.driver.find_element(By.XPATH, listPage_First_object_ID_posXpath).text == self.vsys0_object["UUID"] # assert self.driver.find_element(By.XPATH, listPage_Second_object_ID_posXpath).text == self.uiAutoTestVsys_object["ID"] # self.driver.find_element(By.XPATH,"//*[@id='ly-table1-listcontent']//tbody/tr[2]//span[@class='el-checkbox__inner']").click() @@ -1921,10 +1922,10 @@ class APNs: assert self.driver.find_element(By.XPATH, listPage_Second_object_ID_posXpath).text == self.uiAutoTestVsys_object["UUID"] self.driver.find_element(By.XPATH,listPage_select_first_object_posXpath).click() self.driver.find_element(By.XPATH,'//span[text()="View"]').click() - add_item_disable = self.driver.element_isExist(by=By.XPATH,value="//div[@class='object-item-add']/div[@class='IconBtn disabled-btn']") - edit_item_disable = self.driver.element_isExist(by=By.XPATH,value="//div[@class='list-container']//div[@class='IconBtn disabled-btn'][1]") - del_item_disable = self.driver.element_isExist(by=By.XPATH,value="//div[@class='list-container']//div[@class='IconBtn disabled-btn'][2]") - assert add_item_disable == edit_item_disable == del_item_disable == True + # add_item_disable = self.driver.element_isExist(by=By.XPATH,value="//div[@class='object-item-add']/div[@class='IconBtn disabled-btn']") + # edit_item_disable = self.driver.element_isExist(by=By.XPATH,value="//div[@class='list-container']//div[@class='IconBtn disabled-btn'][1]") + # del_item_disable = self.driver.element_isExist(by=By.XPATH,value="//div[@class='list-container']//div[@class='IconBtn disabled-btn'][2]") + # assert add_item_disable == edit_item_disable == del_item_disable == True self.driver.isElementExist(APNsObjectPage_button_SaveYes_posXpath) assert self.driver.Exist == False self.driver.find_element(By.XPATH, apn_ObjectPage_button_cancel_posXpath).click() |