diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 0c4bca5..443de94 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -15121074365 \ No newline at end of file +19128859944 \ No newline at end of file diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot index 3edc2c9..e2ddd79 100644 --- a/1-Applet/1-WriteInfo/InfoResource.robot +++ b/1-Applet/1-WriteInfo/InfoResource.robot @@ -133,12 +133,14 @@ Library OperatingSystem ${Data} Get From Dictionary ${reps.json()} data #关系json ${relationshipData} Evaluate random.choice(${data}) random #随机获取关系 ${identityType} Get From Dictionary ${relationshipData} value #关系编码 + ${identityTypeName} Get From Dictionary ${relationshipData} desc #关系名称 Set Global Variable ${identityType} + Set Global Variable ${identityTypeName} #提交资料与用户关系 ${Number} Evaluate 9 ${miId} Set Variable If ${miId}==None null ${miId} Create Session dating ${${dating}.dating域名} ${client_header} - ${data} Set Variable {"id":${miId},"fillSerialNumber":${Number},"identityType":${identityType}} + ${data} Set Variable {"id":${miId},"fillSerialNumber":${Number},"identityType":${identityType},"identityTypeName":"${identityTypeName}"} ${reps} POST On Session dating dating-agency-service/user/save/first/fill/marriage/Information ${data.encode('utf-8')} ${miId} Get From Dictionary ${reps.json()} data ${message} Get From Dictionary ${reps.json()} message diff --git a/1-Applet/2-Homepage/SeekingReward/SeekingResource.robot b/1-Applet/2-Homepage/SeekingReward/SeekingResource.robot new file mode 100644 index 0000000..e69de29 diff --git a/1-Applet/2-Homepage/SeekingReward/SeekingReward.robot b/1-Applet/2-Homepage/SeekingReward/SeekingReward.robot new file mode 100644 index 0000000..1701ca8 --- /dev/null +++ b/1-Applet/2-Homepage/SeekingReward/SeekingReward.robot @@ -0,0 +1,6 @@ +*** Settings *** +Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml +Resource SeekingResource.robot + +*** Test Cases *** +用户发布招亲榜 diff --git a/1-Applet/2-Homepage/SeekingReward/__init__.robot b/1-Applet/2-Homepage/SeekingReward/__init__.robot new file mode 100644 index 0000000..8d92d94 --- /dev/null +++ b/1-Applet/2-Homepage/SeekingReward/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 招亲榜 diff --git a/1-Applet/4-Invite/Invite.robot b/1-Applet/4-Invite/Invite.robot new file mode 100644 index 0000000..75a276c --- /dev/null +++ b/1-Applet/4-Invite/Invite.robot @@ -0,0 +1,9 @@ +*** Settings *** +Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml +Resource InviteResource.robot + +*** Test Cases *** +红娘邀请嘉宾 + Given 红娘邀请婚介用户成为嘉宾 + When 后台查询婚介红娘列表 + Then 数据库查询是否邀请成功 diff --git a/1-Applet/4-Invite/InviteResource.robot b/1-Applet/4-Invite/InviteResource.robot new file mode 100644 index 0000000..2a817da --- /dev/null +++ b/1-Applet/4-Invite/InviteResource.robot @@ -0,0 +1,47 @@ +*** Settings *** +Library urllib3 +Library String +Library Collections +Library RequestsLibrary +Library DatabaseLibrary + +*** Keywords *** +红娘邀请${dating}用户成为嘉宾 + #红娘邀请嘉宾 + FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${matchmakerUserId} Set Variable 977568001438126080 #红娘userid,就是不吃饭:978668013433786368;15121074365:977568001438126080 + ${data} Set Variable {"initiatorUserId":${matchmakerUserId}} + ${reps} Post Request dating dating-agency-service/user/save/matchmaker/invite/user?userId=${userId} ${data.encode('utf-8')} + ${message} Get From Dictionary ${reps.json()} message #获取响应信息 + Should Be Equal As Strings ${message} successful #断言 + END + Set Global Variable ${matchmakerUserId} + +后台查询${dating}红娘列表 + #查询红娘列表,找到红娘后获取红娘ID + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${reps} GET On Session dating dating-agency-uec/user/page/matchmaker params=pageSize=10&pageNum=1 + ${matchmaker_list} Get From Dictionary ${reps.json()['data']} records #红娘列表 + Set Global Variable ${matchmaker_list} + 遍历红娘列表 + END + +遍历红娘列表 + #遍历红娘列表 + FOR ${matchmaker} IN @{matchmaker_list} + ${matchmakerId} Get From Dictionary ${matchmaker} id #获取红娘Id + ${userId} Get From Dictionary ${matchmaker} userId #获取红娘userId + Exit For Loop If ${userId}==${matchmakerUserId} + END + Set Global Variable ${matchmakerId} + +数据库查询是否邀请成功 + #查询数据库数据 + FOR ${userId} IN @{userid_list} + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${check} Query SELECT matchmaker_id FROM `dating_agency_service`.`da_matchmaker_marriage_information` WHERE `user_id` = '${userId}' AND `matchmaker_id` = '${matchmakerId}' AND `is_delete` = '0' AND `relation_type` = '1' #数据库查询数据 + ${matchmaker_id} Set Variable ${check[0][0]} + Should Be Equal ${matchmaker_id} ${matchmakerId} + END diff --git a/1-Applet/4-Invite/__init__.robot b/1-Applet/4-Invite/__init__.robot new file mode 100644 index 0000000..00685a7 --- /dev/null +++ b/1-Applet/4-Invite/__init__.robot @@ -0,0 +1,5 @@ +*** Settings *** +Documentation 1、红娘邀请加盟 +... 2、红娘邀请嘉宾 +... 3、邀请帮忙认证 +... 4、资料分享 diff --git a/output/log.html b/output/log.html index 15dd5da..e5b3cf2 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};