From 4b631f55f2df71b0e7f0daf115fb07382cf1f5a2 Mon Sep 17 00:00:00 2001 From: LG_lai Date: Fri, 23 Aug 2024 17:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=97=A8=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0-Login/LoginResource.robot | 15 +- 0-Login/phone-test.txt | 2 +- 3-Operation/Applet/Home/Operation.robot | 8 + .../Applet/Home/OperationResources.robot | 65 +- Phone.txt | 1 + output/log.html | 10 +- output/output.xml | 1389 ++++++++++++++--- output/report.html | 10 +- 8 files changed, 1299 insertions(+), 201 deletions(-) diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot index 8b921b8..cdd3936 100644 --- a/0-Login/LoginResource.robot +++ b/0-Login/LoginResource.robot @@ -134,6 +134,7 @@ Library ImageHorizonLibrary Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful ... ELSE Should Be Equal As Strings ${message} 验证码错误或无效验证码，请重试！ END + Set Global Variable ${token} Set Global Variable ${phoneList} Set Global Variable ${userid_list} Set Global Variable ${Aheader_list} @@ -202,14 +203,20 @@ Library ImageHorizonLibrary 遍历用户组织信息 #遍历用户组织信息 + ${Cheader_list} Create List FOR ${orgdata} IN @{data} - ${orgdata} Evaluate random.choice(${data}) random #随机获取用户组织信息 + #${orgdata} Evaluate random.choice(${data}) random #随机获取用户组织信息 ${orgId} Get From Dictionary ${orgdata} orgId #组织id - ${fullName} Get From Dictionary ${orgdata} fullName #组织name - #${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'} #趣招亲小程序 - ${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795883','Authorization':'${token}','X-ORGANIZATION-ID':'${orgId}'} #招亲宝小程序 + ${orgName} Get From Dictionary ${orgdata} fullName #组织name + Exit For Loop If ${orgId}==1023568243073355776 END + #${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'} #趣招亲小程序 + ${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795883','Authorization':'${token}','X-ORGANIZATION-ID':'${orgId}'} #招亲宝小程序 + Append To List ${Cheader_list} ${client_header} + Set Global Variable ${orgId} + Set Global Variable ${orgName} Set Global Variable ${client_header} + Set Global Variable ${Cheader_list} 获取${dating}平台用户baseinfo #获取baseinfo diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 443de94..c15d500 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -19128859944 \ No newline at end of file +18814092560 \ No newline at end of file diff --git a/3-Operation/Applet/Home/Operation.robot b/3-Operation/Applet/Home/Operation.robot index db94eb2..5925c52 100644 --- a/3-Operation/Applet/Home/Operation.robot +++ b/3-Operation/Applet/Home/Operation.robot @@ -1,8 +1,16 @@ *** Settings *** Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml +Test Teardown Run Keyword If Test Failed Fatal Error Resource OperationResources.robot *** Test Cases *** 邀请绑定代理人 Given 扫描婚介邀请绑定代理人二维码 Then 用户绑定婚介运营中心 + +用户填写门店申请信息 + Given 填写婚介店铺申请信息 + Then 查询婚介门店管理审核列表 + +代理商审核门店申请 + Given diff --git a/3-Operation/Applet/Home/OperationResources.robot b/3-Operation/Applet/Home/OperationResources.robot index b9f0894..56b5517 100644 --- a/3-Operation/Applet/Home/OperationResources.robot +++ b/3-Operation/Applet/Home/OperationResources.robot @@ -27,10 +27,62 @@ Library DatabaseLibrary Should Be Equal As Strings ${message} successful END -邀请${dating}用户开店 - #代理商邀请用户开店 +查询${dating}用户组织信息 + #查询用户组织信息 FOR ${client_header} IN @{Cheader_list} - Create Session dating ${${dating}.dating域名} ${client_header} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} Get From Dictionary dating dating-agency-uec/user/get/org/list + ${data} Get From Dictionary ${reps.json()} data #用户组织数组 + ${orgData} Evaluate random.choice(${data}) random #随机获取用户组织信息 + ${orgId} Get From Dictionary ${orgData} id #组织id + ${orgName} Get From Dictionary ${orgData} fullName #组织name + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END + Set Global Variable ${orgId} + Set Global Variable ${orgName} + +填写${dating}店铺申请信息 + #填写店铺申请信息 + ${orgId} Set Variable 1023317811931516928 + ${orgId} Convert To String ${orgId} + FOR ${client_header} ${phone} IN ZIP ${Cheader_list} ${phoneList} + region固定省市-广州 + Create Session dating ${${dating}.dating域名} ${client_header} + ${DateTime} Get Current Date result_format=%Y-%m-%d #获取当天日期 + ${data} Set Variable {"operationCenterOrgId":"${orgId}","managerName":"测试${DateTime}","phone":"${phone}","captcha":"888888","serviceAreaList":[{"provinceCode":${provinceCode},"provinceName":"${provinceName}","cityCode":${cityCode},"cityName":"${cityName}","districtCode":${districtCode},"districtName":"${districtName}"}],"storeName":"测试门店${DateTime}"} + ${reps} POST On Session dating dating-agency-uec/user/apply/store-audit ${data.encode('utf-8')} + ${storeAuditId} Get From Dictionary ${reps.json()} data #门店id + ${message} Get From Dictionary ${reps.json()} message #响应体信息 + Run Keyword If ${storeAuditId}==None log ${message} + ... ELSE Should Be Equal As Strings ${message} successful + END + Set Global Variable ${storeAuditId} + +查询${dating}门店管理审核列表 + #代理商门店管理审核列表 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-uec/user/page/store-audit/by/operation-center params=pageNum=1&pageSize=10 + ${records} Get From Dictionary ${reps.json()['data']} records #门店待审核列表 + Set Global Variable ${records} + 遍历门店待审核列表 + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful #断言是否相等 + END + +遍历门店待审核列表 + FOR ${storeData} IN @{records} + ${SAuditId} Get From Dictionary ${storeData} id #门店审核列表id + ${storeName} Get From Dictionary ${storeData} storeName #门店name + ${operationId} Get From Dictionary ${storeData} operationCenterId #代理商id + ${operationOrgId} Get From Dictionary ${storeData} operationCenterOrgId #代理商orgid + Exit For Loop If ${SAuditId}==${storeAuditId} + END + Set Global Variable ${SAuditId} + Set Global Variable ${storeName} + Set Global Variable ${operationId} + Set Global Variable ${operationOrgId} region固定省市-广州 Disable Warnings @@ -59,3 +111,10 @@ region固定省市-广州 Set Global Variable ${districtName} Set Global Variable ${provinceCode} Set Global Variable ${provinceName} + +代理商审核${dating}门店 + #审核门店信息 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${status} Evaluate random.choice(1,2,3) random #审核状态 + ${data} Set Variable {"id":"${SAuditId}","status":${status}} diff --git a/Phone.txt b/Phone.txt index 641785e..9dd7e9b 100644 --- a/Phone.txt +++ b/Phone.txt @@ -136,3 +136,4 @@ 13229786174,888888 13978591607,888888 13597054183,888888 +13494708367,888888 diff --git a/output/log.html b/output/log.html index 9fab7dc..1cbe8ea 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};