From 10a3b81fae9c58e7e142d70359d366ca295aaea2 Mon Sep 17 00:00:00 2001 From: byb11 Date: Fri, 5 Mar 2021 10:29:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Admin=E5=92=8CSettings?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=EF=BC=8C=E4=BF=AE=E6=94=B9CachedInt?= =?UTF-8?q?ermediateCertificates=E3=80=81Roles=E3=80=81Users=E7=94=A8?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 01-TestCase/tsg_ui/ui_administration/RolesCase.robot | 12 ++++++------ 01-TestCase/tsg_ui/ui_administration/UsersCase.robot | 1 + .../CachedIntermediateCertificatesCase.robot | 2 +- .../tsg_ui/administration/Administration.robot | 4 ++-- 02-Keyword/tsg_ui/setting/Settings.robot | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/01-TestCase/tsg_ui/ui_administration/RolesCase.robot b/01-TestCase/tsg_ui/ui_administration/RolesCase.robot index 15955da..a0c7d14 100644 --- a/01-TestCase/tsg_ui/ui_administration/RolesCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/RolesCase.robot @@ -261,10 +261,10 @@ RolesCreateNameMinSize [Tags] Boundary UI Administration Roles ${list} Create list //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[1]/div/i ... //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[2]/div/i - CreateRoles 8 自动化测试 ${list} + CreateRoles @ 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch 8 - Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span 8 + RoleSearch @ + Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span @ RolesDelete RolesCreateNameMaxSize @@ -282,10 +282,10 @@ RolesCreateNameSpecialChar [Tags] Boundary UI Administration Roles ${list} Create list //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[1]/div/i ... //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[2]/div/i - CreateRoles 中文+absc+моряков+@#￥%……&* 自动化测试 ${list} + CreateRoles 中文+absc+моряков+#￥%……&* 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch 中文+absc+моряков+@#￥%……&* - Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span 中文+absc+моряков+@#￥%……&* + RoleSearch 中文+absc+моряков+#￥%……&* + Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span 中文+absc+моряков+#￥%……&* RolesDelete RolesCreateNameDuplicate diff --git a/01-TestCase/tsg_ui/ui_administration/UsersCase.robot b/01-TestCase/tsg_ui/ui_administration/UsersCase.robot index dd9a8ae..d47b98a 100644 --- a/01-TestCase/tsg_ui/ui_administration/UsersCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/UsersCase.robot @@ -61,6 +61,7 @@ UsersEdit UserCreatePage UsersEdit ${a} 111111 log 30 log superuser UserSearchName UsersEdit Name UserEdit 1111 close + Wait Until Element Is Enabled id=userEdit 20 UserSearchName ${a} UserName ${text} Get Element Attribute xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/span/div class Should Be Equal As Strings ${text} el-switch diff --git a/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot b/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot index 051b552..5e578f8 100644 --- a/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot @@ -47,7 +47,7 @@ CachedIntermediateCertificatesDownLoad Settings-Search 421 id sleep 1 click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[8]/div/div/div/p/i - sleep 1 + sleep ${sleep} should exist ${DownLoadPath}78005c5a-33b9-43b1-80ad-0a542c62b9da.pem Remove File ${DownLoadPath}78005c5a-33b9-43b1-80ad-0a542c62b9da.pem diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot index 2d0e094..fff99a0 100644 --- a/02-Keyword/tsg_ui/administration/Administration.robot +++ b/02-Keyword/tsg_ui/administration/Administration.robot @@ -591,7 +591,7 @@ AdministrationPagingDisplay ... ${Number}: 设置页面显示数据条数 （20、5、30、50、100） ... ${last} 次关键字 当最后一页定位和其他页面不同时，传入非null的值 ... ${lastxpath} 当最后一页定位和其他页面不同时，传入最后一页的xpath 定位 - Mouse Over xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[4]/span/div/i + Mouse Over xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div/span/span/div/i sleep 1 run keyword if "${Number}"=="30" run keywords sleep 1 ... AND Click element xpath=//*[@id="page-size"]/div/label[2] @@ -622,7 +622,7 @@ AuditLogs-PagingDisplay [Arguments] ${Number} [Documentation] ... ${Number}: 设置页面显示数据条数 （20、5、30、50、100） - Mouse Over xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/span/div/i + Mouse Over xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div/span/span/div/i sleep 1 run keyword if "${Number}"=="30" run keywords sleep 1 ... AND Click element xpath=//*[@id="page-size"]/div/label[2] diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index 8102cc4..8969821 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -325,7 +325,7 @@ CreateHijackFiles run keyword if "${dow_name}"=="close" and "${input}"=="shuru" run keywords sleep 1 ... AND input id=hijack_contentName ${name} ... ELSE IF "${dow_name}"=="open" click xpath=//*[@id="contentNameChoose"]/div[1]/span[2] - sleep 1 + sleep 2 click id=hijackAddContentType #点击+ 打开侧滑窗口 Sleep 1 click ${type} #选择文件类型 @@ -560,7 +560,7 @@ EditHijackFiles run keyword if "${dow_name}"=="close" and "${input}"=="shuru" run keywords sleep 1 ... AND input id=hijack_contentName ${name} ... ELSE IF "${dow_name}"=="open" click xpath=//*[@id="contentNameChoose"]/div[1]/span[2] - sleep 1 + sleep 2 click id=hijackAddContentType #点击+号打开侧滑框 sleep 3 click ${type} #选择类型 @@ -568,7 +568,7 @@ EditHijackFiles click id=rigth-menu-button-close #关闭侧滑框 sleep 1 click id=hijackAddOk1 #点击ok提交 - sleep 1 + Wait Until Element Is Enabled id=hijackAdd 20 run keyword if "${search}"=="id" run keywords sleep 1 ... AND Settings-Search ${id-name} ${search} #搜索框的关键字 ... ELSE IF "${search}"=="name" run keywords sleep 1 @@ -2534,7 +2534,7 @@ DownLoadFile ... ${DownloadFilePath}:文件下载路径 sleep 3 ${a} get_md5_01 ${UploadFilePath} - sleep 1 + sleep ${sleep} ${b} get_md5_01 ${DownloadFilePath} sleep 1 Should Be Equal As Strings ${a} ${b}