diff --git a/Dating/DA_data.yaml b/Dating/DA_data.yaml new file mode 100644 index 0000000..d13d5e0 --- /dev/null +++ b/Dating/DA_data.yaml @@ -0,0 +1,10 @@ +婚介: + dating域名: https://dating-agency-api-test.qniao.cn + Client域名: + CHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} + + + +用户: + 手机号: 15014242835 + 验证码: 888888 \ No newline at end of file diff --git a/Dating/Dating_data.robot b/Dating/Dating_data.robot new file mode 100644 index 0000000..9a1204f --- /dev/null +++ b/Dating/Dating_data.robot @@ -0,0 +1,8 @@ +*** Settings *** +Suite Setup Import Variables ${CURDIR}\\DA_data.yaml +Resource dating.robot + +*** Test Cases *** +游客使用婚介平台 + #游客打开婚介平台 + Given 游客登录婚介平台 diff --git a/Dating/__init__.robot b/Dating/__init__.robot new file mode 100644 index 0000000..48df7b9 --- /dev/null +++ b/Dating/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 相亲页面 diff --git a/Dating/dating.robot b/Dating/dating.robot new file mode 100644 index 0000000..d13ba6d --- /dev/null +++ b/Dating/dating.robot @@ -0,0 +1,14 @@ +*** Settings *** +Library urllib3 +Library String +Library Collections +Library RequestsLibrary + +*** Keywords *** +游客登录${dating}平台 + #游客登录婚介平台 + Disable Warnings + Create Session dating ${${dating}.dating域名} ${${dating}.CHeader} + ${reps} GET On Session dating /dating-agency-service/user/get/marriage-information/tourist-recommend + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful diff --git a/Login/phone-test.txt b/Login/phone-test.txt index 443de94..f7bd761 100644 --- a/Login/phone-test.txt +++ b/Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -19128859944 \ No newline at end of file +13168550964 \ No newline at end of file diff --git a/Login/resource.robot b/Login/resource.robot index e827f6d..ce5ebdf 100644 --- a/Login/resource.robot +++ b/Login/resource.robot @@ -77,11 +77,13 @@ Library OperatingSystem ${userId} Get From Dictionary ${reps.json()['data']} userId #获取用户id ${message} Get From Dictionary ${reps.json()} message ${login_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795881','Authorization':'QNT ${token}'} #更新header + ${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'} Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful ... ELSE Should Be Equal As Strings ${message} 验证码错误或无效验证码,请重试! END Set Global Variable ${userId} Set Global Variable ${login_header} + Set Global Variable ${client_header} 用户手机号错误验证码登录${dating}平台 #用户手机号验证码登录婚介平台 diff --git a/Opr-Center-RF-Api/000Login/LoginCase.robot b/Opr-Center-RF-Api/000Login/LoginCase.robot deleted file mode 100644 index 65001a6..0000000 --- a/Opr-Center-RF-Api/000Login/LoginCase.robot +++ /dev/null @@ -1,10 +0,0 @@ -*** Settings *** -Suite Setup Import Variables ${CURDIR}\\login.yaml -Resource LoginResource.robot - -*** Test Cases *** -WebLogin - [Template] ${user}手机验证码登录opr运营端并查看订单管理-蓝纸 - 用户1 - 用户2 - 用户3 diff --git a/Opr-Center-RF-Api/000Login/LoginResource.robot b/Opr-Center-RF-Api/000Login/LoginResource.robot deleted file mode 100644 index 1ba2181..0000000 --- a/Opr-Center-RF-Api/000Login/LoginResource.robot +++ /dev/null @@ -1,37 +0,0 @@ -*** Settings *** -Library urllib3 -Library String -Library Collections -Library RequestsLibrary - -*** Keywords *** -用户${user}使用手机验证码登录${Web_site}运营端 - #登录UEC - Disable Warnings - Create Session opr-center ${${Web_site}.UEC域名} ${${Web_site}.Header} - ${Data} Set Variable { \ \ \ \ \ \ \ \ \ \ "account": \ "${${user}.手机号}", \ \ \ \ \ \ \ \ \ \ "accountType": \ 2, \ \ \ \ \ \ \ \ \ \ "captcha": \ "${${user}.验证码}" } - ${reps} POST On Session opr-center uec/authorize/by-captcha ${Data.encode('utf-8')} - Sleep 1 - ${token} Get From Dictionary ${reps.json()['data']} token #获取UECtoken - ${message} Get From Dictionary ${reps.json()} message #获取返回的message - Set Global Variable ${token} - #转换业务线token - Create Session opr-center ${${Web_site}.Client域名} ${${Web_site}.Header} - ${LoginToken} Set Variable { \ \ \ \ \ \ \ \ \ \ "loginToken": \ "${token}" } - ${reps} POST On Session opr-center cloud-print-user-center/authorize/get/product-line-token/by/login-token ${LoginToken.encode('utf-8')} - ${Token} Get From Dictionary ${reps.json()} data - #${Login_Header} Set Variable {'Content-Type':'application/json','X-APP-ID':'503258978847966425','Authorization':'QNT ${Token}'} - ${Base_Header} Set Variable {'Content-Type':'application/json','X-APP-ID':'503258978847966425','Authorization':'QNT ${Token}','X-Enterprise-Id':'723635193163943936','X-Factory-Id':'546450842056790018','X-Organization-Id':'723635193096835072'} - #Set Global Variable ${Login_Header} - Set Global Variable ${Base_Header} - #获取用户基本信息 - #${reps} GET On Session opr-center yyt-uec/get/base-info - -用户${user}查看${Web_site}订单管理-蓝纸列表 - #用户查看订单管理页面 - Create Session opr-center ${${Web_site}.Client域名} ${Base_Header} - ${reps} GET On Session opr-center printing-packaging-factory-service/user/page/product/batch/sales params=status=4&pageNum=1&pageSize=10 - -${user}手机验证码登录opr运营端并查看订单管理-蓝纸 - Given 用户${user}使用手机验证码登录opr运营端 - Then 用户${user}查看opr订单管理-蓝纸列表 diff --git a/Opr-Center-RF-Api/000Login/__init__.robot b/Opr-Center-RF-Api/000Login/__init__.robot deleted file mode 100644 index e69de29..0000000 diff --git a/Opr-Center-RF-Api/000Login/login.yaml b/Opr-Center-RF-Api/000Login/login.yaml deleted file mode 100644 index 3eb0202..0000000 --- a/Opr-Center-RF-Api/000Login/login.yaml +++ /dev/null @@ -1,17 +0,0 @@ -opr: - UEC域名: https://api-client-uec-test.qniao.cn - Client域名: https://api-client-yyt-test.qniao.cn - Header: {'Content-Type':'application/json','X-APP-ID':'503258978847966425'} - - -用户1: - 手机号: 15014242835 - 验证码: 888888 - -用户2: - 手机号: 19128859944 - 验证码: 888888 - -用户3: - 手机号: 18814092561 - 验证码: 888888 \ No newline at end of file diff --git a/Opr-Center-RF-Api/000Login/新建 文本文档.txt b/Opr-Center-RF-Api/000Login/新建 文本文档.txt deleted file mode 100644 index 6a252e3..0000000 --- a/Opr-Center-RF-Api/000Login/新建 文本文档.txt +++ /dev/null @@ -1,14 +0,0 @@ -opr-center: - 登录页URL: https://opr-center-test.qniao.cn/#/user/login - -用户1: - 手机号: 15014242835 - 验证码: 888888 - -用户2: - 手机号: 15014242835 - 验证码: 666666 - -用户3: - 手机号: 10000000000 - 验证码: 888888 \ No newline at end of file diff --git a/OprLogin/Login/Login01.robot b/OprLogin/Login/Login01.robot deleted file mode 100644 index b48f6e0..0000000 --- a/OprLogin/Login/Login01.robot +++ /dev/null @@ -1,14 +0,0 @@ -*** Settings *** -Library Selenium2Library -Resource ../Resource.robot - -*** Variables *** -${Login_URL} https://opr-center-test.qniao.cn/#/user/login - -*** Test Cases *** -LoginCase - Given User open Chrome with the url "${Login_URL}" - When User Login System with "15014242835" and "888888" - #Then Should Contain ${title} 首页 - 运营中心 - AND Sleep 2s - THEN Close Browser diff --git a/OprLogin/Resource.robot b/OprLogin/Resource.robot deleted file mode 100644 index 3421799..0000000 --- a/OprLogin/Resource.robot +++ /dev/null @@ -1,18 +0,0 @@ -*** Settings *** -Library urllib3 -Library Collections -Library RequestsLibrary -Library DatabaseLibrary -Library Selenium2Library - -*** Keywords *** -User open Chrome with the url "${URL}" - Open Browser ${URL} Chrome - -User Login System with "${account}" and "${password}" - Input Text xpath=//*[@id="app"]/div/div/div[2]/div/div/div/div[2]/input ${account} - Input Text xpath=//*[@id="app"]/div/div/div[2]/div/div/div/div[2]/div[2]/input ${password} - Click Button xpath=//*[@class="ant-btn ant-btn-primary ant-btn-block"] - Evaluate time.sleep(2) time - ${title} get title - Close Browser diff --git a/WriteInfo/DA_data.yaml b/WriteInfo/DA_data.yaml index 763f3a5..0ad92fe 100644 --- a/WriteInfo/DA_data.yaml +++ b/WriteInfo/DA_data.yaml @@ -1,8 +1,8 @@ 婚介: - dating域名: https://dating-agency-api-test.qniao.cn + dating域名: http://dating-agency-api-test.qniao.cn Client域名: CHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} - AHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795881'} + Header: {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'iHP4V/g6O5DXHixyNrf7tn7+VIdU5Zwq5m1fgO3jm5PtMrj2OlLQWd+AfAy9eJMn9vowK3P78Iz93vXw55+blg=='} diff --git a/WriteInfo/InfoResource.robot b/WriteInfo/InfoResource.robot index 57f9221..0167fd4 100644 --- a/WriteInfo/InfoResource.robot +++ b/WriteInfo/InfoResource.robot @@ -12,42 +12,11 @@ Library OperatingSystem 用户首次填写${dating}资料 Disable Warnings #获取首次婚介资料信息 - Import Variables ${CURDIR}\\DA_data.yaml - Create Session dating ${${dating}.UEC域名} ${${dating}.Header} - ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=8576 + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} ${Data} Get From Dictionary ${reps.json()} data log ${Data} - ${id} Get From Dictionary ${reps.json()['data']} id #资料id - ${height} Get From Dictionary ${reps.json()['data']} height #证婚人身高 - ${nickName} Get From Dictionary ${reps.json()['data']} nickName #证婚人昵称 - ${cityCode} Get From Dictionary ${reps.json()['data']} cityCode #市编号 - ${cityName} Get From Dictionary ${reps.json()['data']} cityName #市名称 - ${birthYear} Get From Dictionary ${reps.json()['data']} birthYear #证婚人出生年份 - ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #证婚人性别 - ${incomeCode} Get From Dictionary ${reps.json()['data']} incomeCode #证婚人月收入 - ${districtCode} Get From Dictionary ${reps.json()['data']} districtCode #区编码 - ${districtName} Get From Dictionary ${reps.json()['data']} districtName #区名称 - ${provinceCode} Get From Dictionary ${reps.json()['data']} provinceCode #省编码 - ${provinceName} Get From Dictionary ${reps.json()['data']} provinceName #省名称 - ${educationCode} Get From Dictionary ${reps.json()['data']} educationCode #证婚人学历编码 - ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #资料填写序号 - ${maritalStatusCode} Get From Dictionary ${reps.json()['data']} maritalStatusCode #证婚人婚姻状况,0:未婚,1:离异,2:丧偶的 0:未婚,1:离异,2:丧偶的 - Set Global Variable ${id} Set Global Variable ${Data} - Set Global Variable ${height} - Set Global Variable ${nickName} - Set Global Variable ${cityCode} - Set Global Variable ${cityName} - Set Global Variable ${birthYear} - Set Global Variable ${genderCode} - Set Global Variable ${incomeCode} - Set Global Variable ${districtCode} - Set Global Variable ${districtName} - Set Global Variable ${provinceCode} - Set Global Variable ${provinceName} - Set Global Variable ${educationCode} - Set Global Variable ${fillSerialNumber} - Set Global Variable ${maritalStatusCode} 检查首次填写${dating}资料序号 #检查首次填写序号 @@ -58,14 +27,14 @@ Library OperatingSystem 选择${dating}性别资料 #选择性别 - Log To Console ${CURDIR} + Log To Console ${CURDIR} #打印当前路径 Disable Warnings #用户首次填写婚介资料 ${sex-code} Create List 0 1 ${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号 #${SexCode} Evaluate 1 #男:0,女:1 ${Number} Evaluate 0 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成" - Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.genderCode ${SexCode} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} ${Data} Evaluate demjson.encode(${DATA}) demjson @@ -76,7 +45,7 @@ Library OperatingSystem ${message} Get From Dictionary ${reps.json()} message Should Be Equal As Strings ${message} successful Set Global Variable ${DataId} - #检查首次填写婚介资料序号 + 用户首次填写婚介资料 选择${dating}征婚人的城市 #选择城市 @@ -109,10 +78,9 @@ Library OperatingSystem Set Global Variable ${provinceName} #选择征婚人地区资料 ${Number} Evaluate 1 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成" - Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} - ${Data} Update Value To Json ${Data} $.fillSerialNumber ${fillSerialNumber} ${Data} Update Value To Json ${Data} $.cityCode ${cityCode} ${Data} Update Value To Json ${Data} $.cityName ${cityName} ${Data} Update Value To Json ${Data} $.districtCode ${districtCode} @@ -124,8 +92,7 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} - #检查首次填写婚介资料序号 - #用户首次填写婚介资料 + 用户首次填写婚介资料 选择${dating}征婚人的出生年份 #选择征婚人出生年份 @@ -134,6 +101,7 @@ Library OperatingSystem ${end-year} Evaluate ${get_year}-18 ${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份 ${Number} Evaluate 2 #填写序号 + Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} ${Data} Update Value To Json ${Data} $.birthYear ${year} @@ -142,6 +110,7 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + 用户首次填写婚介资料 选择${dating}征婚人的身高 #选择征婚人身高 @@ -149,6 +118,7 @@ Library OperatingSystem ${hight-height} Evaluate 207 ${height} Evaluate random.randint(${low-height},${hight-height}) random ${Number} Evaluate 3 + Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} ${Data} Update Value To Json ${Data} $.height ${height} @@ -157,13 +127,14 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + 用户首次填写婚介资料 选择${dating}征婚人的学历 #选择征婚人的学历 ${code} Create List 0 1 2 3 4 5 #0:高中及以下,1:中专,2:大专,3:大学本科,4:硕士,5:硕士 ${educode} Evaluate random.choice(${code}) random #随机获取学历编码 ${Number} Evaluate 4 - Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} ${Data} Update Value To Json ${Data} $.educationCode ${educode} @@ -172,13 +143,14 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + 用户首次填写婚介资料 选择${dating}征婚人的婚姻状况 #选择征婚人的婚姻状况 ${code} Create List 0 1 2 #0:未婚,1:离异,2:丧偶的 ${maritalCode} Evaluate random.choice(${code}) random #随机获取婚姻状态编码 ${Number} Evaluate 5 - Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} ${Data} Update Value To Json ${Data} $.maritalStatusCode ${maritalCode} @@ -187,13 +159,14 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + 用户首次填写婚介资料 选择${dating}征婚人的月收入 #选择征婚人的月收入 ${code} Create List 0 1 2 3 4 5 6 #0:3000以下,1:3001~5000,2:5001~8000,3:8001~12000,4:12001~20000,5:20001~50000,6:50000以上 ${incomeCode} Evaluate random.choice(${code}) random #随机获取婚姻状态编码 ${Number} Evaluate 6 - Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} ${Data} Update Value To Json ${Data} $.incomeCode ${incomeCode} @@ -202,13 +175,14 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + 用户首次填写婚介资料 选择${dating}征婚人的昵称 #填写征婚人昵称 ${num} Evaluate random.randint(1,999) random #随机获取一个数字 ${nickName} Set Variable 寻伴用户${num} ${Number} Evaluate 7 - Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} ${Data} Update Value To Json ${Data} $.nickName ${nickName} @@ -217,9 +191,9 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} + 查询首次填写的婚介资料信息 查询首次填写的${dating}资料信息 #获取用户首次填写的资料 - Create Session dating ${${dating}.UEC域名} ${${dating}.Header} - ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=8576 - ${} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} diff --git a/WriteInfo/Infomation.robot b/WriteInfo/Infomation.robot index 8d23f31..fc68ecc 100644 --- a/WriteInfo/Infomation.robot +++ b/WriteInfo/Infomation.robot @@ -1,7 +1,7 @@ *** Settings *** Suite Setup Import Variables ${CURDIR}\\DA_data.yaml Resource InfoResource.robot -Resource ../Login/LoginResource.robot +Resource ../Login/resource.robot Library Collections Library RequestsLibrary @@ -14,7 +14,7 @@ WritebaseInfo And 选择婚介征婚人的身高 And 选择婚介征婚人的学历 And 选择婚介征婚人的婚姻状况 - And 选择婚介征婚人的婚姻状况 + And 选择婚介征婚人的月收入 And 选择婚介征婚人的昵称 sex_info