summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryouzhijiang <[email protected]>2024-10-29 15:01:11 +0800
committeryouzhijiang <[email protected]>2024-10-29 15:01:11 +0800
commit30919cad57eec7f0897275efbc18316eaa624ec0 (patch)
tree19658c0d26114de317a8642e9bb701f00fb7d5da
parented6b0d532476e0e1c3ae8e69a19f8d4d52e8a3e9 (diff)
修改item添加逻辑
-rw-r--r--cases/conftest.py2
-rw-r--r--common/ui_common/objects/accounts.py9
-rw-r--r--common/ui_common/objects/fqdns.py31
-rw-r--r--common/ui_common/objects/ip_address.py34
-rw-r--r--common/ui_common/objects/keywords.py12
-rw-r--r--common/ui_common/objects/moible_identities.py33
-rw-r--r--common/ui_common/objects/objects_public_operations.py13
-rw-r--r--common/ui_common/objects/urls.py12
-rw-r--r--page_element/objects_element_position.py2
-rw-r--r--testdata/ui_data/objects_data/ip_address.json2
10 files changed, 88 insertions, 62 deletions
diff --git a/cases/conftest.py b/cases/conftest.py
index 89413e04..f2e90b14 100644
--- a/cases/conftest.py
+++ b/cases/conftest.py
@@ -54,7 +54,7 @@ def my_driver(request):
# save_path = os.path.join(save_path, module_name)
# chrome_option.add_argument("--incognito") # 添加启用无痕模式的选项
chrome_option.add_argument("--window-size=1920,1080") # 启动时默认大小窗口
- # chrome_option.add_argument('--headless') # 启用Headless模式
+ chrome_option.add_argument('--headless') # 启用Headless模式
chrome_option.add_argument('--disable-gpu') # 禁用 GPU 硬件加速
driver = MyWebDriver(
command_executor=remote_url,
diff --git a/common/ui_common/objects/accounts.py b/common/ui_common/objects/accounts.py
index 5bedf4fb..58b68c9b 100644
--- a/common/ui_common/objects/accounts.py
+++ b/common/ui_common/objects/accounts.py
@@ -466,13 +466,12 @@ class Accounts:
self.driver.find_element(By.XPATH, acc_ObjectDetailPage_item_addButton_poXpath).click() # 点击“+”按钮
if single_or_multi == 1: # 一个Item一条数据
# 在空内容的输入框中,输入新增的数据
- self.driver.find_element(By.XPATH, acc_ObjectDetailPage_itemValueInput_poXpath).send_keys(
- item_value) # 于Item value输入框键入上述item_value
+ for item in item_value:
+ self.driver.find_element(By.XPATH, acc_ObjectDetailPage_itemValueInput_poXpath).send_keys(item) # 于Item value输入框键入上述item_value
else: # 一个Item多条数据
for single_item_value in item_value:
- self.driver.find_element(By.XPATH,
- "({})[last()]".format(acc_ObjectDetailPage_itemValueInput_poXpath)).send_keys(
- single_item_value) # 于Item value输入框键入上述item_value
+ for item in item_value:
+ self.driver.find_element(By.XPATH,"({})[last()]".format(acc_ObjectDetailPage_itemValueInput_poXpath)).send_keys(item) # 于Item value输入框键入上述item_value
if single_item_value == item_value[-1]:
break
else:
diff --git a/common/ui_common/objects/fqdns.py b/common/ui_common/objects/fqdns.py
index afdac2f0..e3ca7dee 100644
--- a/common/ui_common/objects/fqdns.py
+++ b/common/ui_common/objects/fqdns.py
@@ -260,7 +260,8 @@ class FQDNs:
for item in data['Create']['item_modify']['add_data']:
# 新建item
self.driver.find_element(By.XPATH, FQDNsObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, FQDNsObjectPage_button_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH, FQDNsObjectPage_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH, FQDNsObjectPage_button_Save_Item_posXpath).click()
# 暂时只支持add_data个数为1
assert str(int(self.total_count) + 1) == self.driver.find_element(By.XPATH,main_first_Item_count_posXpath).text,"断言输入后Total+1"
@@ -273,7 +274,8 @@ class FQDNs:
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_editItem_posXpath).click()
description_elem = self.driver.find_element(By.XPATH, FQDNsObjectPage_button_inputItem_posXpath)
description_elem.clear()
- description_elem.send_keys(data['Create']['item_modify']['modify_data'])
+ for i in data['Create']['item_modify']['modify_data']:
+ description_elem.send_keys(i)
self.driver.find_element(By.XPATH, FQDNsObjectPage_button_Save_Item_posXpath).click()
elif data['Create']['item'] =="null":
data["Create"]["model"] = "2"
@@ -281,7 +283,8 @@ class FQDNs:
for item in data['Create']['item']:
# 新建item
self.driver.find_element(By.XPATH, FQDNsObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, FQDNsObjectPage_button_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH, FQDNsObjectPage_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH, FQDNsObjectPage_button_Save_Item_posXpath).click()
self.item_content = item
elif data["Create"]["model"] == "1":
@@ -290,20 +293,23 @@ class FQDNs:
for item in data['Create']['item_modify']['add_data']:
# 新建item
self.driver.find_element(By.XPATH,FQDNs_Group_sub_Object_add_new_add_item_Button_posXpath).click() # new添加itemButton
- self.driver.find_element(By.XPATH,FQDNs_Group_sub_Object_add_new_addIP_item_inputName_posXpath).send_keys(item) # 输入item
+ for i in item:
+ self.driver.find_element(By.XPATH, FQDNsObjectPage_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH,FQDNs_Group_sub_Object_add_new_add_itemIP_Save_Button_posXpath).click() # 添加item保存
elif self.modify_status == "1" and data['Create']['item_modify']['type'] == "modify":
self.driver.find_element(By.XPATH, main_sub_Object_edit_sub_object_Button_posXpath).click()
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_editItem_posXpath).click()
description_elem = self.driver.find_element(By.XPATH, FQDNsObjectPage_button_inputItem_posXpath)
description_elem.clear()
- description_elem.send_keys(data['Create']['item_modify']['modify_data'])
+ for i in data['Create']['item_modify']['modify_data']:
+ description_elem.send_keys(i)
self.driver.find_element(By.XPATH, FQDNsObjectPage_button_Save_Item_posXpath).click()
else:
for item in data["Create"]["item"]:
# 创建sub_new_fqdns
self.driver.find_element(By.XPATH,FQDNs_Group_sub_Object_add_new_add_item_Button_posXpath).click() # new添加itemButton
- self.driver.find_element(By.XPATH,FQDNs_Group_sub_Object_add_new_addIP_item_inputName_posXpath).send_keys(item) # 输入item
+ for i in item:
+ self.driver.find_element(By.XPATH, FQDNsObjectPage_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH,FQDNs_Group_sub_Object_add_new_add_itemIP_Save_Button_posXpath).click() # 添加item保存
def Confirm_creation(self,data:{}):
if data["Create"]["model"] == "0" :
@@ -1607,10 +1613,10 @@ if __name__ == '__main__':
command_executor="http://192.168.39.77:4444",
options=chrome_option
)
- a.get("http://192.168.45.158/")
+ a.get("http://192.168.44.72")
a.maximize_window()
- a.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[1]/input').send_keys("admin")
- a.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[2]/input').send_keys("admin")
+ a.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[1]/input').send_keys("yzj")
+ a.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[2]/input').send_keys("yzj123456")
a.find_element(By.XPATH, '//*[@id=":r0:"]').click()
time.sleep(2)
r = FQDNs(a)
@@ -1619,13 +1625,12 @@ if __name__ == '__main__':
# model=0/1 ====0:单个 1group
# type =IMSI/Phone_Number/IMEI
data= {
- "ids": "用例12-2:FQDNs中导入文件",
+ "ids": "用例1:FQDNs的增删改查",
"Name": "test-1",
"Create": {
"model": "0",
- "type": "import_files",
- "files_type": "error_item",
- "files_name": "FQDNs_error_item.txt"
+ "type": "new_object",
+ "item": ["^example.com", "^www.example.com$", "example", "www.example$"]
},
"Createtype": "FQDN",
"Subtype": "",
diff --git a/common/ui_common/objects/ip_address.py b/common/ui_common/objects/ip_address.py
index 4c5ad3a9..c8747695 100644
--- a/common/ui_common/objects/ip_address.py
+++ b/common/ui_common/objects/ip_address.py
@@ -308,6 +308,10 @@ class IPAddress:
# 确认创建sub object
self.driver.find_element(By.XPATH,ip_address_Group_sub_Object_add_new_one_OK1_Button_posXpath).click() # 保存new_Object
# self.driver.find_element(By.XPATH,ip_address_Group_sub_Object_add_new_one_OK1_Warning_Yes_Button_posXpath).click() # 确认新建保存按钮
+ self.driver.find_element(By.XPATH, acc_ObjectDetailPage_cancel_posXpath).click()
+ self.driver.find_element(By.XPATH, ip_address_Group_sub_Object_addButton_posXpath).click() # 添加sub_Object
+ self.driver.find_element(By.XPATH, main_Group_sub_Object_input_frame_select_one_posXpath).click()
+ self.driver.find_element(By.XPATH, acc_ObjectDetailPage_cancel_posXpath).click()
# 确认创建
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_OK_posXpath).click()
# try:
@@ -395,7 +399,8 @@ class IPAddress:
# 新建IP_Learing_item
for item in data['Create']['item']:
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, ip_addressObjectPage_IP_learning_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH, ip_addressObjectPage_IP_learning_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_Save_Item_posXpath).click()
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_IP_learn_from_protocols_posXpath).click()
# for learn_from_protocols in data['Create']['Learn From Protocols']:
@@ -434,12 +439,14 @@ class IPAddress:
# 新加IP_Learing_item
for item in data['Create']['item_modify']['add_data']:
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, ip_addressObjectPage_IP_learning_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH, ip_addressObjectPage_IP_learning_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_Save_Item_posXpath).click()
elif type(data['Create']['item_modify']['add_data']) == str:
# 新加IP_Learing_item
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, ip_addressObjectPage_IP_learning_inputItem_posXpath).send_keys(data['Create']['item_modify']['add_data'])
+ for i in data['Create']['item_modify']['add_data']:
+ self.driver.find_element(By.XPATH, ip_addressObjectPage_IP_learning_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH, ip_addressObjectPage_button_Save_Item_posXpath).click()
# 暂时只支持add_data个数为1
# assert self.objects_po._split_assert(assert_content=self.total_count) == self.driver.find_element(By.XPATH, main_first_Item_count_posXpath).text, "断言输入后Total+1"
@@ -513,7 +520,7 @@ class IPAddress:
self.loading_parameter(data)
# 创建mobile_identities
# 点击create
- time.sleep(3)
+ time.sleep(5)
self.driver.find_element(By.XPATH, listPage_object_ip_address_createButton_posXpath).click()
if data["Create"]["model"] == "0":
# 输入ip_address,input_name
@@ -1800,26 +1807,27 @@ if __name__ == '__main__':
command_executor="http://192.168.39.77:4444",
options=chrome_option
)
- a.get("http://192.168.45.158")
+ a.get("http://192.168.44.72")
a.maximize_window()
- a.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[1]/input').send_keys("admin")
- a.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[2]/input').send_keys("admin")
+ a.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[1]/input').send_keys("youzhijiang")
+ a.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[2]/input').send_keys("youzhijiang1")
a.find_element(By.XPATH, '//*[@id=":r0:"]').click()
r = IPAddress(a)
# model=0/1 ====0:单个 1group
# type =IMSI/Phone_Number/IMEI
data={
- "ids": "用例22-3、IP的增量导入",
- "Name": "test-1",
+ "ids": "用例19、128字符输入框校验",
+ "Name": "testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttest",
"Create": {
"model": "0",
- "type": "import_files",
- "files_type": "error_type",
- "files_name": "FQDNs_error_type.png"
+ "type": "new_object",
+ "item": [
+ "1.1.1.1"
+ ]
},
"Createtype": "IP",
"Subtype": "",
- "Search_type": "Name"
+ "Search_type": "Details"
}
# r._clear_counter(data)
r.ip_address_case(data)
diff --git a/common/ui_common/objects/keywords.py b/common/ui_common/objects/keywords.py
index ab9a9610..304686ab 100644
--- a/common/ui_common/objects/keywords.py
+++ b/common/ui_common/objects/keywords.py
@@ -654,7 +654,8 @@ class Keywords:
if "HEX:" in item:
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_addItem_posXpath).click()
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_item_select_HEX_posXpath).click()
- self.driver.find_element(By.XPATH, KeywordsObjectPage_button_inputItem_posXpath).send_keys(item.split("HEX:"))
+ for i in item.split("HEX:"):
+ self.driver.find_element(By.XPATH, KeywordsObjectPage_button_inputItem_posXpath).send_keys(i)
if data["range"] != "":
self.add_item_range(data,item)
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_Save_Item_posXpath).click()
@@ -663,11 +664,13 @@ class Keywords:
if "REGEX:" in item:
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_addItem_posXpath).click()
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_item_select_REGEX_posXpath).click()
- self.driver.find_element(By.XPATH, KeywordsObjectPage_button_inputItem_posXpath).send_keys(item.split("REGEX:"))
+ for i in item.split("REGEX:"):
+ self.driver.find_element(By.XPATH, KeywordsObjectPage_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_Save_Item_posXpath).click()
if len(item.split("&")) == 1 and "HEX:" not in item and "REGEX:" not in item:
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, KeywordsObjectPage_button_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH, KeywordsObjectPage_button_inputItem_posXpath).send_keys(i)
if data["range"] != "":
self.add_item_range(data,item)
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_Save_Item_posXpath).click()
@@ -676,7 +679,8 @@ class Keywords:
self.driver.find_element(By.XPATH, KeywordsObjectPage_button_addItem_posXpath).click()
for keywords in range(1, len(self.keywords_list) + 1):
new_ele = KeywordsObjectPage_Keywords_button_input_more_Item_posXpath.replace("['replace']","[{}]".format(keywords))
- self.driver.find_element(By.XPATH, new_ele).send_keys(self.keywords_list[keywords - 1])
+ for i in self.keywords_list[keywords - 1]:
+ self.driver.find_element(By.XPATH, new_ele).send_keys(i)
if keywords <= len(self.keywords_list) - 1:
self.driver.find_element(By.XPATH,KeywordsObjectPage_button_add_Item_input_posXpath).click()
else:
diff --git a/common/ui_common/objects/moible_identities.py b/common/ui_common/objects/moible_identities.py
index 92e57707..962a9607 100644
--- a/common/ui_common/objects/moible_identities.py
+++ b/common/ui_common/objects/moible_identities.py
@@ -265,12 +265,14 @@ class mobile_identiities:
if "item_modify" in data.keys() and data['item_modify']['type'] == "add":
for item in data['item_modify']['add_data']:
self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_IMSI_button_Save_Item_posXpath).click()
else:
for item in data['Create']['item']:
self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_IMSI_button_Save_Item_posXpath).click()
elif data['Createtype'] == 'Phone_Number':
if "item_modify" in data.keys() and data['item_modify']['type'] == "add":
@@ -297,31 +299,36 @@ class mobile_identiities:
for item in data['Create']['item']:
if len(item.split("&")) == 1: # 判断添加item是否单一,是否需要&类型
self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_Phone_Number_button_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_Phone_Number_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_Phone_Number_button_Save_phone_number_Item_posXpath).click()
else:
self.phone_number_list = item.split("&")
self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_addItem_posXpath).click()
for phone_number in range(1, len(self.phone_number_list) + 1):
new_ele = mobileIdentitiesObjectPage_Phone_Number_button_input_more_Item_posXpath.replace("['replace']", "[{}]".format(phone_number))
- self.driver.find_element(By.XPATH, new_ele).send_keys(self.phone_number_list[phone_number - 1])
+ for i in self.phone_number_list[phone_number - 1]:
+ self.driver.find_element(By.XPATH, new_ele).send_keys(i)
if phone_number <= len(self.phone_number_list) - 1:
self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_Phone_Number_button_add_Item_input_posXpath).click()
else:
- self.driver.find_element(By.XPATH, new_ele).send_keys(self.phone_number_list[phone_number - 1])
+ for i in self.phone_number_list[phone_number - 1]:
+ self.driver.find_element(By.XPATH, new_ele).send_keys(i)
self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_Phone_Number_button_Save_phone_number_Item_posXpath).click()
elif data['Createtype'] == 'IMEI':
if "item_modify" in data.keys() and data['item_modify']['type'] == "add":
# 新建item
for item in data['item_modify']['add_data']:
self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_IMEI_button_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_IMEI_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH,mobileIdentitiesObjectPage_IMEI_button_Save_Item_posXpath).click()
else:
# 新建item
for item in data['Create']['item']:
self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_button_addItem_posXpath).click()
- self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_IMEI_button_inputItem_posXpath).send_keys(item)
+ for i in item:
+ self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_IMEI_button_inputItem_posXpath).send_keys(i)
self.driver.find_element(By.XPATH, mobileIdentitiesObjectPage_IMEI_button_Save_Item_posXpath).click()
elif data['Create']['model'] == "1":
if data['Createtype'] == "IMSI":
@@ -329,13 +336,15 @@ class mobile_identiities:
# 新建item
for item in data['item_modify']['add_data']:
self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_add_item_Button_posXpath).click() # new添加itemButton
- self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_addIMSI_item_inputName_posXpath).send_keys(item) # 输入item
+ for i in item:
+ self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_addIMSI_item_inputName_posXpath).send_keys(i) # 输入item
self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_add_itemIMSI_Save_Button_posXpath).click() # 添加item保存
else:
# 添加item
for item in data['Create']['item']:
self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_add_item_Button_posXpath).click() # new添加itemButton
- self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_addIMSI_item_inputName_posXpath).send_keys(item) # 输入item
+ for i in item:
+ self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_addIMSI_item_inputName_posXpath).send_keys(i) # 输入item
self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_add_itemIMSI_Save_Button_posXpath).click() # 添加item保存
elif data['Createtype'] == "Phone_Number":
if "item_modify" in data.keys() and data['item_modify']['type'] == "add":
@@ -354,12 +363,14 @@ class mobile_identiities:
# 新建item
for item in data['item_modify']['add_data']:
self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_add_item_Button_posXpath).click() # new添加itemButton
- self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_addIMEI_item_inputName_posXpath).send_keys(item) # 输入item
+ for i in item:
+ self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_addIMEI_item_inputName_posXpath).send_keys(i) # 输入item
self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_add_item_IMEI_Save_Button_posXpath).click() # 添加item保存
else:
for item in data['Create']['item']:
self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_add_item_Button_posXpath).click() # new添加itemButton
- self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_addIMEI_item_inputName_posXpath).send_keys(item) # 输入item
+ for i in item:
+ self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_addIMEI_item_inputName_posXpath).send_keys(i) # 输入item
self.driver.find_element(By.XPATH,mobile_Identities_Group_sub_Object_add_new_add_item_IMEI_Save_Button_posXpath).click() # 添加item保存
def _object_create(self,data:{}):
if data['Createtype'] == "IMSI":
diff --git a/common/ui_common/objects/objects_public_operations.py b/common/ui_common/objects/objects_public_operations.py
index 3900f5f2..1a61b853 100644
--- a/common/ui_common/objects/objects_public_operations.py
+++ b/common/ui_common/objects/objects_public_operations.py
@@ -69,8 +69,8 @@ def download_files():
driver.find_element(By.XPATH, "//*[@id='details-button']").click()
driver.find_element(By.XPATH, "//*[@id='proceed-link']").click()
# 输入账户和密码
- driver.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[1]/input').send_keys("admin")
- driver.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[2]/input').send_keys("admin")
+ driver.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[1]/input').send_keys(loginout_parse.get("ui_account_1", "username"))
+ driver.find_element(By.XPATH, '//*[@id="root"]/div/div[2]/div/div[2]/input').send_keys(loginout_parse.get("ui_account_1", "passwd"))
driver.find_element(By.XPATH, '//*[@id=":r0:"]').click()
myloginout = LogInOut
# 消除右上角弹框
@@ -248,10 +248,11 @@ class ObjectsPublicOperations:
mainPage_ObjectSearch_Column_settings_posXpath) # 列设置按钮
self.driver.execute_script("arguments[0].scrollIntoView();", column_setting_btn)
column_setting_btn.click() # 点击列设置
- # self.driver.find_element(By.XPATH, '//span[text()="Vsys ID"]').click()
- # self.driver.find_element(By.XPATH, '//span[text()="UUID"]').click()
- self.driver.find_element(By.XPATH, "//input[@name='Show/Hide All']").click()
- self.driver.find_element(By.XPATH, "//input[@name='Show/Hide All']").click()
+ if need_exclude == 1:
+ self.driver.find_element(By.XPATH, '//span[text()="Vsys ID"]').click()
+ self.driver.find_element(By.XPATH, '//span[text()="UUID"]').click()
+ # self.driver.find_element(By.XPATH, "//input[@name='Show/Hide All']").click()
+ # self.driver.find_element(By.XPATH, "//input[@name='Show/Hide All']").click()
self.driver.find_element(By.XPATH, '//div[text()="Name"]').click()
# all_checked_xpath = '//*[@class="all-btn"]//*[@class="el-checkbox__input is-checked"]'
# if self.driver.element_isExist(By.XPATH, all_checked_xpath): # 如果全选被选中
diff --git a/common/ui_common/objects/urls.py b/common/ui_common/objects/urls.py
index 5d179591..c486c3e0 100644
--- a/common/ui_common/objects/urls.py
+++ b/common/ui_common/objects/urls.py
@@ -791,18 +791,16 @@ class URLs:
self.driver.find_element(By.XPATH, url_ObjectDetailPage_addButton_posXpath).click() # 点击“+”按钮
if single_or_multi == 1: # 一个Item一条数据
# 在空内容的输入框中,输入新增的数据
- self.driver.find_element(By.XPATH, url_ObjectDetailPage_itemValue_posXpath).send_keys(
- item_value) # 于Item value输入框键入上述item_value
+ for item in item_value:
+ self.driver.find_element(By.XPATH, url_ObjectDetailPage_itemValue_posXpath).send_keys(item) # 于Item value输入框键入上述item_value
else: # 一个Item多条数据
for single_item_value in item_value:
- self.driver.find_element(By.XPATH,
- "({})[last()]".format(url_ObjectDetailPage_itemValue_posXpath)).send_keys(
- single_item_value) # 于Item value输入框键入上述item_value
+ for item in single_item_value:
+ self.driver.find_element(By.XPATH,"({})[last()]".format(url_ObjectDetailPage_itemValue_posXpath)).send_keys(item) # 于Item value输入框键入上述item_value
if single_item_value == item_value[-1]:
break
else:
- self.driver.find_element(By.XPATH,
- url_ObjectDetailPage_item_subAddButton_poXpath).click() # 点击单个Item中新增多条数据的"+"按钮
+ self.driver.find_element(By.XPATH,url_ObjectDetailPage_item_subAddButton_poXpath).click() # 点击单个Item中新增多条数据的"+"按钮
# 点击新增数据的确定按钮
self.driver.find_element(By.XPATH, url_ObjectDetailPage_itemSaveButton_posXpath).click() # 点击保存按钮
diff --git a/page_element/objects_element_position.py b/page_element/objects_element_position.py
index 46981cd3..b5cfa604 100644
--- a/page_element/objects_element_position.py
+++ b/page_element/objects_element_position.py
@@ -762,7 +762,7 @@ FQDNsObjectPage_input_Name_posXpath = "//div[@class='fqdn-object-name']//input"
FQDNsObjectPage_input_searchFor_posId = mainPage_ObjectSearch_buttonSearch_Item_posId # search for item搜索输入框id
FQDNsObjectPage_button_addItem_posXpath = mainPage_ObjectSearch_buttonAddItem_posXpath # 添加item按钮id
-FQDNsObjectPage_button_inputItem_posXpath = "//div[@class='MuiInput-root MuiInput-variantOutlined MuiInput-colorNeutral MuiInput-sizeMd MuiInput-formControl css-grqzrl']/input" # 输入item内容
+FQDNsObjectPage_button_inputItem_posXpath = "//div[@class='fqdn-object-expression']//input" # 输入item内容
FQDNsObjectPage_button_Save_Item_posXpath = "//i[@class='operate-icon iconfont icon-save']" # 保存item按钮
FQDNsObjectPage_textArea_Description_posXpath = "//div[@class='fqdn-object-description']//textarea[1]" # description文本输入区Xpath
diff --git a/testdata/ui_data/objects_data/ip_address.json b/testdata/ui_data/objects_data/ip_address.json
index 2af06d7d..d0d01061 100644
--- a/testdata/ui_data/objects_data/ip_address.json
+++ b/testdata/ui_data/objects_data/ip_address.json
@@ -154,7 +154,7 @@
},
"Createtype": "IP",
"Subtype": "",
- "Search_type": "Details"
+ "Search_type": "Name"
},{
"ids": "用例20、特殊字符输入框校验",
"Name": "1!@#$%^&*():\"{}|?><,./中文русскийEnglish",