diff --git a/httprunner/.gitignore b/httprunner/.gitignore new file mode 100644 index 0000000..7678876 --- /dev/null +++ b/httprunner/.gitignore @@ -0,0 +1,5 @@ +reports/* +__pycache__/* +*.pyc +.python-version +logs/* \ No newline at end of file diff --git a/httprunner/api/login/admin_login_password.yml b/httprunner/api/login/admin_login_password.yml index c59953a..32f801f 100644 --- a/httprunner/api/login/admin_login_password.yml +++ b/httprunner/api/login/admin_login_password.yml @@ -15,4 +15,4 @@ request: rememberMe: $rememberMe validate: - eq: ["status_code", 200] - - {"check": "content.msg", "comparator": "contains", "expect": "success"} + - {"check": "content.msg", "comparator": "contains", "expect": "success"} \ No newline at end of file diff --git a/httprunner/api/login/admin_login_password1.yml b/httprunner/api/login/admin_login_password1.yml deleted file mode 100644 index d1d53de..0000000 --- a/httprunner/api/login/admin_login_password1.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: 销售账号登录 -variables: - phone: 13060994305 - password: 9602BF7A8C5FEAB91385D1BB9EA70DF0 - rememberMe: null -base_url: ${ENV(BURL)} -request: - url: /login/admin/adminLogin - method: POST - headers: - Content-Type: "application/json;charset=UTF-8" - json: - phone: $phone - password: $password - rememberMe: $rememberMe -validate: - - eq: ["status_code", 200] - - {"check": "content.msg", "comparator": "contains", "expect": "success"} diff --git a/httprunner/api/login/ldap_login_password.yml b/httprunner/api/login/ldap_login_password.yml index 0f606f7..9504904 100644 --- a/httprunner/api/login/ldap_login_password.yml +++ b/httprunner/api/login/ldap_login_password.yml @@ -1,4 +1,7 @@ name: ldap登录 +variables: + username: liangjinman@qniao.cn + password: qn123456 base_url: ${ENV(BURL)} request: url: /recycle-service/admin/login @@ -7,8 +10,7 @@ request: Content-Type: "application/x-www-form-urlencoded" X-APP-ID: "1" data: - username: liangjinman@qniao.cn - password: qn123456 + username: $username + password: $password validate: - - eq: ["status_code", 200] - - {"check": "content.message", "comparator": "eq", "expect": "登陆成功"} \ No newline at end of file + - eq: ["status_code", 200] \ No newline at end of file diff --git a/httprunner/api/product/app_product_create.yml b/httprunner/api/product/app_product_create.yml new file mode 100644 index 0000000..b9f0f8c --- /dev/null +++ b/httprunner/api/product/app_product_create.yml @@ -0,0 +1,51 @@ +name: app用户创建商品 +variables: + apptoken: ${ENV(ATOKEN)} + bidType: 0 + biddingInterval: 0 + coverImgUrl: "string" + description: "string" + dopantRate: 0 + firstCategoryId: 0 + imgList: ["string"] + initialUnitPrice: 0 + locCityId: 0 + locDetails: "string" + locDistrictId: 0 + locProvinceId: 0 + lowestNum: 0 + secondCategoryId: 0 + stock: 0 + unitPrice: 0 + videoUrl: "string" + waterRate: 0 +base_url: ${ENV(AURL)} +request: + url: /recycle-service/create/product + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $apptoken + json: + bidType: $bidType + biddingInterval: $biddingInterval + coverImgUrl: $coverImgUrl + description: $description + dopantRate: $dopantRate + firstCategoryId: $firstCategoryId + imgList: $imgList + initialUnitPrice: $initialUnitPrice + locCityId: $locCityId + locDetails: $locDetails + locDistrictId: $locDistrictId + locProvinceId: $locProvinceId + lowestNum: $lowestNum + secondCategoryId: $secondCategoryId + stock: $stock + unitPrice: $unitPrice + videoUrl: $videoUrl + waterRate: $waterRate +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/product/app_product_delete.yml b/httprunner/api/product/app_product_delete.yml new file mode 100644 index 0000000..d5e965d --- /dev/null +++ b/httprunner/api/product/app_product_delete.yml @@ -0,0 +1,17 @@ +name: app用户删除商品 +variables: + apptoken: ${ENV(ATOKEN)} + productId: 0 +base_url: ${ENV(AURL)} +request: + url: /recycle-service/delete/product + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $apptoken + json: + productId: $productId +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/product/app_product_get.yml b/httprunner/api/product/app_product_get.yml new file mode 100644 index 0000000..640f3cc --- /dev/null +++ b/httprunner/api/product/app_product_get.yml @@ -0,0 +1,15 @@ +name: app用户查询商品 +variables: + apptoken: ${ENV(ATOKEN)} + productId: 0 +base_url: ${ENV(AURL)} +request: + url: /recycle-service/get/product/$productId + method: GET + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $apptoken +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/product/app_product_update.yml b/httprunner/api/product/app_product_update.yml new file mode 100644 index 0000000..e926691 --- /dev/null +++ b/httprunner/api/product/app_product_update.yml @@ -0,0 +1,51 @@ +name: app用户修改商品 +variables: + apptoken: ${ENV(ATOKEN)} + bidType: 0 + biddingInterval: 0 + coverImgUrl: "string" + description: "string" + dopantRate: 0 + firstCategoryId: 0 + imgList: ["string"] + initialUnitPrice: 0 + locCityId: 0 + locDetails: "string" + locDistrictId: 0 + locProvinceId: 0 + lowestNum: 0 + secondCategoryId: 0 + stock: 0 + unitPrice: 0 + videoUrl: "string" + waterRate: 0 +base_url: ${ENV(AURL)} +request: + url: /recycle-service/update/product + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $apptoken + json: + bidType: $bidType + biddingInterval: $biddingInterval + coverImgUrl: $coverImgUrl + description: $description + dopantRate: $dopantRate + firstCategoryId: $firstCategoryId + imgList: $imgList + initialUnitPrice: $initialUnitPrice + locCityId: $locCityId + locDetails: $locDetails + locDistrictId: $locDistrictId + locProvinceId: $locProvinceId + lowestNum: $lowestNum + secondCategoryId: $secondCategoryId + stock: $stock + unitPrice: $unitPrice + videoUrl: $videoUrl + waterRate: $waterRate +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/shop/app_shop_edit.yml b/httprunner/api/shop/app_shop_edit.yml new file mode 100644 index 0000000..cac01c8 --- /dev/null +++ b/httprunner/api/shop/app_shop_edit.yml @@ -0,0 +1,27 @@ +name: app用户修改店铺信息 +variables: + apptoken: ${ENV(ATOKEN)} + contactPhoneNo: 18219557422 + coverImgUrlList: ["http://medou.oss-cn-shenzhen.aliyuncs.com/bird_user/20090917463455009.jpg"] + locDetails: 车陂 + locDistrictId: 440106 + contacts: 测试 + name: 测试店铺 +base_url: ${ENV(AURL)} +request: + url: /recycle-service/edit/store-information + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $apptoken + json: + contactPhoneNo: $contactPhoneNo + coverImgUrlList: $coverImgUrlList + locDetails: $locDetails + locDistrictId: $locDistrictId + contacts: $contacts + name: $name +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/shop/app_shop_getinfo.yml b/httprunner/api/shop/app_shop_getinfo.yml new file mode 100644 index 0000000..133b106 --- /dev/null +++ b/httprunner/api/shop/app_shop_getinfo.yml @@ -0,0 +1,15 @@ +name: app用户完善店铺 +variables: + apptoken: ${ENV(ATOKEN)} + storeId: 18219557422 +base_url: ${ENV(AURL)} +request: + url: /recycle-service/get/store-information/$storeId + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $apptoken +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/shop/app_shop_perfect.yml b/httprunner/api/shop/app_shop_perfect.yml new file mode 100644 index 0000000..9c04eff --- /dev/null +++ b/httprunner/api/shop/app_shop_perfect.yml @@ -0,0 +1,27 @@ +name: app用户完善店铺 +variables: + apptoken: ${ENV(ATOKEN)} + contactPhoneNo: 18219557422 + coverImgUrlList: ["http://medou.oss-cn-shenzhen.aliyuncs.com/bird_user/20090917463455009.jpg"] + locDetails: 车陂 + locDistrictId: 440106 + contacts: 测试 + name: 测试店铺 +base_url: ${ENV(AURL)} +request: + url: /recycle-service/update/store-information + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $apptoken + json: + contactPhoneNo: $contactPhoneNo + coverImgUrlList: $coverImgUrlList + locDetails: $locDetails + locDistrictId: $locDistrictId + contacts: $contacts + name: $name +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/store_paper/admin_store_create_paper.yml b/httprunner/api/store_paper/admin_store_create_paper.yml new file mode 100644 index 0000000..a1b2f4c --- /dev/null +++ b/httprunner/api/store_paper/admin_store_create_paper.yml @@ -0,0 +1,27 @@ +name: 后台管理员创建纸品品类 +variables: + token: ${ENV(LDAPTOKEN)} + description: "string" + enable: 0 + id: 0 + level: 0 + name: "string" + parentId: 0 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/store/create/paper + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token + json: + description: $description + enable: $enable + id: $id + level: $level + name: $name + parentId: $parentId +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/store_paper/admin_store_delete_paper.yml b/httprunner/api/store_paper/admin_store_delete_paper.yml new file mode 100644 index 0000000..b9edf04 --- /dev/null +++ b/httprunner/api/store_paper/admin_store_delete_paper.yml @@ -0,0 +1,15 @@ +name: 后台管理员启用/禁用纸品品类 +variables: + token: ${ENV(LDAPTOKEN)} + paperId: "string" +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/store/update/paper-status/$paperId + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/store_paper/admin_store_get_paperCategoryList.yml b/httprunner/api/store_paper/admin_store_get_paperCategoryList.yml new file mode 100644 index 0000000..dc29663 --- /dev/null +++ b/httprunner/api/store_paper/admin_store_get_paperCategoryList.yml @@ -0,0 +1,14 @@ +name: 后台管理员查询纸品品类列表 +variables: + token: ${ENV(LDAPTOKEN)} +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/store/get/paperCategoryList + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/api/store_paper/admin_store_update_paper.yml b/httprunner/api/store_paper/admin_store_update_paper.yml new file mode 100644 index 0000000..dc78655 --- /dev/null +++ b/httprunner/api/store_paper/admin_store_update_paper.yml @@ -0,0 +1,27 @@ +name: 后台管理员编辑纸品品类 +variables: + token: ${ENV(LDAPTOKEN)} + description: "string" + enable: 0 + id: 0 + level: 0 + name: "string" + parentId: 0 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/store/update/paper + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token + json: + description: $description + enable: $enable + id: $id + level: $level + name: $name + parentId: $parentId +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "contains", "expect": "successful"} \ No newline at end of file diff --git a/httprunner/cases/case.yml b/httprunner/cases/case.yml index b3e53de..54492d4 100644 --- a/httprunner/cases/case.yml +++ b/httprunner/cases/case.yml @@ -1,18 +1,15 @@ - config: - name: "demo testsuite" - variables: - device_sn: "XYZ" - base_url: "http://127.0.0.1:5000" + name: "testsuites" + base_url: "http://127.0.0.1:80" testcases: - - name: call demo_testcase with data 1 - testcase: path/to/step.yml - variables: - device_sn: $device_sn + name: case one + testcase: path/to/step1.yml + parameters: + - - name: call demo_testcase with data 2 - testcase: path/to/step.yml - variables: - device_sn: $device_sn + name: case two + testcase: path/to/step2.yml + parameters: + diff --git a/httprunner/cases/consignment_process/admin_proxysell_update_reservation.yml b/httprunner/cases/consignment_process/admin_proxysell_update_reservation.yml index 22a70da..2733aa3 100644 --- a/httprunner/cases/consignment_process/admin_proxysell_update_reservation.yml +++ b/httprunner/cases/consignment_process/admin_proxysell_update_reservation.yml @@ -4,7 +4,7 @@ testcases: testcase: steps/consignment_process/admin_proxysell_update_reservation.yml parameters: - title-millSupplierId-scrapeOrderId-code-message: - - ["上传预约信息错误的纸厂供应商id","12345","501462195926863872",500,"No message available"] - - ["上传预约信息错误的订单号","498227745344589800","12345",500,"Internal Server Error"] + - ["上传预约信息错误的纸厂供应商id","12345","501462195926863872",200,"No message available"] + - ["上传预约信息错误的订单号","498227745344589800","12345",200,"No message available"] - ["上传预约信息纸厂供应商id为空","","501462195926863872",200,"millSupplierId:纸厂供应商不能为空"] - ["上传预约信息订单号为空","498227745344589800","",200,"scrapeOrderId:订单id不能为空"] diff --git a/httprunner/cases/login/ldap_login_password.yml b/httprunner/cases/login/ldap_login_password.yml new file mode 100644 index 0000000..b557a92 --- /dev/null +++ b/httprunner/cases/login/ldap_login_password.yml @@ -0,0 +1,11 @@ +testcases: +- + name: ldap密码登录测试套件 + testcase: steps/login/ldap_login_password.yml + parameters: + - title-username-password-code-message: + - ["登录成功","liangjinman@qniao.cn","qn123456",200,"登陆成功"] + - ["账号错误","admin","qn123456",200,"20003"] + - ["账号为空","","qn123456",200,"20001"] + - ["密码错误","liangjinman@qniao.cn","12345",200,"20003"] + - ["密码为空","liangjinman@qniao.cn","",200,"20002"] diff --git a/httprunner/debugtalk.py b/httprunner/debugtalk.py index 8b13789..e69de29 100644 --- a/httprunner/debugtalk.py +++ b/httprunner/debugtalk.py @@ -1 +0,0 @@ - diff --git a/httprunner/steps/login/ldap_login_password.yml b/httprunner/steps/login/ldap_login_password.yml new file mode 100644 index 0000000..ab9dd58 --- /dev/null +++ b/httprunner/steps/login/ldap_login_password.yml @@ -0,0 +1,9 @@ +config: + name: ldap密码登录 +teststeps: +- + name: $title + api: api/login/ldap_login_password.yml + validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} diff --git a/httprunner/steps/step.yml b/httprunner/steps/step.yml index 45300e1..e2db3ad 100644 --- a/httprunner/steps/step.yml +++ b/httprunner/steps/step.yml @@ -1,7 +1,5 @@ config: name: 依赖上个接口 - variables: - base_url: https://api-test.qniao.cn/recycle-service teststeps: - name: 第一个接口 diff --git a/zhitongbao/zhitongbao/.env b/zhitongbao/.env similarity index 86% rename from zhitongbao/zhitongbao/.env rename to zhitongbao/.env index 38497a9..5463596 100644 --- a/zhitongbao/zhitongbao/.env +++ b/zhitongbao/.env @@ -3,5 +3,7 @@ URL=http://api-test.qniao.cn BURL=http://api-admin-test.qniao.cn TOKEN=eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJhY2NvdW50Tm9uRXhwaXJlZFwiOnRydWUsXCJhY2NvdW50Tm9uTG9ja2VkXCI6dHJ1ZSxcImF1dGhvcml0aWVzXCI6W10sXCJjb21wYW55SWRcIjowLFwiY3JlZGVudGlhbHNOb25FeHBpcmVkXCI6dHJ1ZSxcImVuYWJsZWRcIjp0cnVlLFwicGFzc3dvcmRcIjpcIlwiLFwicm9sZUlkXCI6MzcsXCJyb2xlTmFtZXNcIjpbXSxcInVzZXJJZFwiOjIxMixcInVzZXJuYW1lXCI6XCLlvKDlsbFcIn0iLCJjcmVhdGVkIjoxNTk5Mjc4NTY3NTYyLCJleHAiOjE1OTk4ODMzNjd9.t0g8YOGp7PJ7svjGSNyBpa3XXF0TDdJDJNHWOUtvKjDqmFL_wmg8XOnNAE80pEJpTAgHRP4QF2N5RSNpAdqozg LDAPTOKEN=Token a4289fbdfb3422e76232906b1ccdffb7 +QNURL=https://api-admin.qniao.cn +QNTOKEN=Token a4289fbdfb3422e76232906b1ccdffb7 APPTOKEN=/yDwpvROT9aG3+EAFtz5mWwBM16YhZpAhpVUx6OkLxJ+c8uvEgM7u9E4/vH6Wc3Y APPUSERID=485090339129004032 \ No newline at end of file diff --git a/zhitongbao/zhitongbao/api/A_list_of_the_query.yml b/zhitongbao/api/A_list_of_the_query.yml similarity index 100% rename from zhitongbao/zhitongbao/api/A_list_of_the_query.yml rename to zhitongbao/api/A_list_of_the_query.yml diff --git a/zhitongbao/zhitongbao/api/Employees/ldap_Employee_details.yml b/zhitongbao/api/Employees/ldap_Employee_details.yml similarity index 100% rename from zhitongbao/zhitongbao/api/Employees/ldap_Employee_details.yml rename to zhitongbao/api/Employees/ldap_Employee_details.yml diff --git a/zhitongbao/zhitongbao/api/Employees/ldap_Employees_list.yml b/zhitongbao/api/Employees/ldap_Employees_list.yml similarity index 100% rename from zhitongbao/zhitongbao/api/Employees/ldap_Employees_list.yml rename to zhitongbao/api/Employees/ldap_Employees_list.yml diff --git a/zhitongbao/zhitongbao/api/Employees/ldap_Employees_update.yml b/zhitongbao/api/Employees/ldap_Employees_update.yml similarity index 100% rename from zhitongbao/zhitongbao/api/Employees/ldap_Employees_update.yml rename to zhitongbao/api/Employees/ldap_Employees_update.yml diff --git a/zhitongbao/api/Member/Member_add.yml b/zhitongbao/api/Member/Member_add.yml new file mode 100644 index 0000000..ffedef7 --- /dev/null +++ b/zhitongbao/api/Member/Member_add.yml @@ -0,0 +1,30 @@ +name: 新增会员 +variables: + bidPrice: 1000 + days: 30 + description: 新人首充优惠大大~~ + enable: 1 + icon: http://medou.oss-cn-shenzhen.aliyuncs.com/saas/20200624155949.png + realPrice: 100 + sellStrategy: common + title: 天 + +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/member/new/member-expense-config + method: POST + headers: + Content-Type: "application/json" + X-APP-ID: "470236309865238555" + Authorization: ${ENV(LDAPTOKEN)} + json: + bidPrice: $bidPrice + days: $days + description: $description + enable: $enable + icon: $icon + realPrice: $realPrice + sellStrategy: $sellStrategy + title: $title +validate: + - eq: ["status_code", 200] diff --git a/zhitongbao/api/Member/Member_delete.yml b/zhitongbao/api/Member/Member_delete.yml new file mode 100644 index 0000000..5120e89 --- /dev/null +++ b/zhitongbao/api/Member/Member_delete.yml @@ -0,0 +1,13 @@ +name: 删除会员 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/member/delete-batch/member-expense-config + method: POST + headers: + Content-Type: application/json + X-APP-ID: "470236309865238555" + Authorization: ${ENV(LDAPTOKEN)} + json: + idList: ["503182395336429568"] +validate: + - eq: ["status_code", 200] \ No newline at end of file diff --git a/zhitongbao/api/Member/Member_list.yml b/zhitongbao/api/Member/Member_list.yml new file mode 100644 index 0000000..df3b624 --- /dev/null +++ b/zhitongbao/api/Member/Member_list.yml @@ -0,0 +1,11 @@ +name: 会员列表查询 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/member/get/member-expense-config-list + method: GET + headers: + Content-Type: application/json + X-APP-ID: "470236309865238555" + Authorization: ${ENV(LDAPTOKEN)} +validate: + - eq: ["status_code", 200] \ No newline at end of file diff --git a/zhitongbao/api/Member/Member_update.yml b/zhitongbao/api/Member/Member_update.yml new file mode 100644 index 0000000..b378a82 --- /dev/null +++ b/zhitongbao/api/Member/Member_update.yml @@ -0,0 +1,30 @@ +name: 修改会员 +variables: + bidPrice: 1500 + days: 30 + description: 充就送，好礼等你来~~ + enable: 1 + icon: http://medou.oss-cn-shenzhen.aliyuncs.com/saas/20200624155949.png + realPrice: 200 + sellStrategy: common + title: 天 + +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/member/update/member-expense-config/502180735986307072 + method: POST + headers: + Content-Type: "application/json" + X-APP-ID: "470236309865238555" + Authorization: ${ENV(LDAPTOKEN)} + json: + bidPrice: $bidPrice + days: $days + description: $description + enable: $enable + icon: $icon + realPrice: $realPrice + sellStrategy: $sellStrategy + title: $title +validate: + - eq: ["status_code", 200] diff --git a/zhitongbao/zhitongbao/api/Menu/ldap_Menu_add.yml b/zhitongbao/api/Menu/ldap_Menu_add.yml similarity index 100% rename from zhitongbao/zhitongbao/api/Menu/ldap_Menu_add.yml rename to zhitongbao/api/Menu/ldap_Menu_add.yml diff --git a/zhitongbao/zhitongbao/api/Menu/ldap_Menu_delete.yml b/zhitongbao/api/Menu/ldap_Menu_delete.yml similarity index 100% rename from zhitongbao/zhitongbao/api/Menu/ldap_Menu_delete.yml rename to zhitongbao/api/Menu/ldap_Menu_delete.yml diff --git a/zhitongbao/zhitongbao/api/Menu/ldap_Menu_list.yml b/zhitongbao/api/Menu/ldap_Menu_list.yml similarity index 100% rename from zhitongbao/zhitongbao/api/Menu/ldap_Menu_list.yml rename to zhitongbao/api/Menu/ldap_Menu_list.yml diff --git a/zhitongbao/zhitongbao/api/Menu/ldap_Menu_update.yml b/zhitongbao/api/Menu/ldap_Menu_update.yml similarity index 100% rename from zhitongbao/zhitongbao/api/Menu/ldap_Menu_update.yml rename to zhitongbao/api/Menu/ldap_Menu_update.yml diff --git a/zhitongbao/zhitongbao/api/ldap_department_list.yml b/zhitongbao/api/ldap_department_list.yml similarity index 100% rename from zhitongbao/zhitongbao/api/ldap_department_list.yml rename to zhitongbao/api/ldap_department_list.yml diff --git a/zhitongbao/zhitongbao/api/login.yml b/zhitongbao/api/login.yml similarity index 100% rename from zhitongbao/zhitongbao/api/login.yml rename to zhitongbao/api/login.yml diff --git a/zhitongbao/zhitongbao/api/login/app_login.yml b/zhitongbao/api/login/app_login.yml similarity index 100% rename from zhitongbao/zhitongbao/api/login/app_login.yml rename to zhitongbao/api/login/app_login.yml diff --git a/zhitongbao/api/login/ldap_QN_login.yml b/zhitongbao/api/login/ldap_QN_login.yml new file mode 100644 index 0000000..0c28f50 --- /dev/null +++ b/zhitongbao/api/login/ldap_QN_login.yml @@ -0,0 +1,15 @@ +name: ldap登录 +# QN 表示正式环境 +base_url: ${ENV(QNURL)} +request: + url: /recycle-service/admin/login + method: POST + headers: + Content-Type: application/x-www-form-urlencoded + X-APP-ID: "470236309865238555" + data: + username: zhangshan@qniao.cn + password: zhangshan123456 +validate: + - eq: ["status_code", 200] + - {"check": "content.message", "comparator": "eq", "expect": "登陆成功"} \ No newline at end of file diff --git a/zhitongbao/zhitongbao/api/login/ldap_login.yml b/zhitongbao/api/login/ldap_login.yml similarity index 100% rename from zhitongbao/zhitongbao/api/login/ldap_login.yml rename to zhitongbao/api/login/ldap_login.yml diff --git a/zhitongbao/zhitongbao/api/login/ldap_logout.yml b/zhitongbao/api/login/ldap_logout.yml similarity index 100% rename from zhitongbao/zhitongbao/api/login/ldap_logout.yml rename to zhitongbao/api/login/ldap_logout.yml diff --git a/zhitongbao/zhitongbao/api/notification.yml b/zhitongbao/api/notification.yml similarity index 70% rename from zhitongbao/zhitongbao/api/notification.yml rename to zhitongbao/api/notification.yml index 11592d8..43f8a5f 100644 --- a/zhitongbao/zhitongbao/api/notification.yml +++ b/zhitongbao/api/notification.yml @@ -1,11 +1,11 @@ name: 账期过期钉钉提醒相关人员 -base_url: ${ENV(BURL)} +base_url: ${ENV(QNURL)} request: url: /recycle-service/admin/proxy-sell/test/schedule method: GET headers: Content-Type: "application/json" X-APP-ID: "470236309865238555" - Authorization: ${ENV(LDAPTOKEN)} + Authorization: ${ENV(QNTOKEN)} validate: - eq: ["status_code", 200] \ No newline at end of file diff --git a/zhitongbao/zhitongbao/api/product/product_add.yml b/zhitongbao/api/product/product_add.yml similarity index 100% rename from zhitongbao/zhitongbao/api/product/product_add.yml rename to zhitongbao/api/product/product_add.yml diff --git a/zhitongbao/zhitongbao/api/product/product_delete.yml b/zhitongbao/api/product/product_delete.yml similarity index 100% rename from zhitongbao/zhitongbao/api/product/product_delete.yml rename to zhitongbao/api/product/product_delete.yml diff --git a/zhitongbao/zhitongbao/api/product/product_list.yml b/zhitongbao/api/product/product_list.yml similarity index 100% rename from zhitongbao/zhitongbao/api/product/product_list.yml rename to zhitongbao/api/product/product_list.yml diff --git a/zhitongbao/zhitongbao/api/product/product_list_b.yml b/zhitongbao/api/product/product_list_b.yml similarity index 100% rename from zhitongbao/zhitongbao/api/product/product_list_b.yml rename to zhitongbao/api/product/product_list_b.yml diff --git a/zhitongbao/zhitongbao/api/product/product_update.yml b/zhitongbao/api/product/product_update.yml similarity index 100% rename from zhitongbao/zhitongbao/api/product/product_update.yml rename to zhitongbao/api/product/product_update.yml diff --git a/zhitongbao/zhitongbao/api/product/product_update_status.yml b/zhitongbao/api/product/product_update_status.yml similarity index 100% rename from zhitongbao/zhitongbao/api/product/product_update_status.yml rename to zhitongbao/api/product/product_update_status.yml diff --git a/zhitongbao/zhitongbao/api/role/ldap_roleMenu_list.yml b/zhitongbao/api/role/ldap_roleMenu_list.yml similarity index 100% rename from zhitongbao/zhitongbao/api/role/ldap_roleMenu_list.yml rename to zhitongbao/api/role/ldap_roleMenu_list.yml diff --git a/zhitongbao/zhitongbao/api/role/ldap_role_add.yml b/zhitongbao/api/role/ldap_role_add.yml similarity index 100% rename from zhitongbao/zhitongbao/api/role/ldap_role_add.yml rename to zhitongbao/api/role/ldap_role_add.yml diff --git a/zhitongbao/zhitongbao/api/role/ldap_role_list.yml b/zhitongbao/api/role/ldap_role_list.yml similarity index 100% rename from zhitongbao/zhitongbao/api/role/ldap_role_list.yml rename to zhitongbao/api/role/ldap_role_list.yml diff --git a/zhitongbao/zhitongbao/api/role/ldap_role_mass_update.yml b/zhitongbao/api/role/ldap_role_mass_update.yml similarity index 100% rename from zhitongbao/zhitongbao/api/role/ldap_role_mass_update.yml rename to zhitongbao/api/role/ldap_role_mass_update.yml diff --git a/zhitongbao/zhitongbao/api/role/ldap_role_update.yml b/zhitongbao/api/role/ldap_role_update.yml similarity index 100% rename from zhitongbao/zhitongbao/api/role/ldap_role_update.yml rename to zhitongbao/api/role/ldap_role_update.yml diff --git a/zhitongbao/zhitongbao/debugtalk.py b/zhitongbao/debugtalk.py similarity index 100% rename from zhitongbao/zhitongbao/debugtalk.py rename to zhitongbao/debugtalk.py diff --git a/zhitongbao/reports/1600134084.html b/zhitongbao/reports/1600134084.html new file mode 100644 index 0000000..866fa0e --- /dev/null +++ b/zhitongbao/reports/1600134084.html @@ -0,0 +1,492 @@ + + + + - TestReport + + + + +

Test Report:

+ +

Summary

+ + + + + + + + + + + + + + + + + + + + + + + + + +
START AT2020-09-15 09:41:24
DURATION0.369 seconds
PLATFORMHttpRunner 2.3.0 CPython 3.8.4 Windows-10-10.0.18362-SP0
STATTESTCASES (success/fail)TESTSTEPS (success/fail/error/skip)
total (details) =>1 (1/0)1 (1/0/0/0)
+ +

Details

+ + + +

修改会员

+ + + + + + + + + + + + + + + + + + + + + + + + + +
TOTAL: 1SUCCESS: 1FAILED: 0ERROR: 0SKIPPED: 0
StatusNameResponse TimeDetail
success修改会员355.38 ms + + + + log-1 + + + + + +
+ + \ No newline at end of file diff --git a/zhitongbao/reports/1600134497.html b/zhitongbao/reports/1600134497.html new file mode 100644 index 0000000..2fd85d5 --- /dev/null +++ b/zhitongbao/reports/1600134497.html @@ -0,0 +1,492 @@ + + + + - TestReport + + + + +

Test Report:

+ +

Summary

+ + + + + + + + + + + + + + + + + + + + + + + + + +
START AT2020-09-15 09:48:17
DURATION0.235 seconds
PLATFORMHttpRunner 2.3.0 CPython 3.8.4 Windows-10-10.0.18362-SP0
STATTESTCASES (success/fail)TESTSTEPS (success/fail/error/skip)
total (details) =>1 (1/0)1 (1/0/0/0)
+ +

Details

+ + + +

新增会员

+ + + + + + + + + + + + + + + + + + + + + + + + + +
TOTAL: 1SUCCESS: 1FAILED: 0ERROR: 0SKIPPED: 0
StatusNameResponse TimeDetail
success新增会员197.34 ms + + + + log-1 + + + + + +
+ + \ No newline at end of file diff --git a/zhitongbao/reports/1600134541.html b/zhitongbao/reports/1600134541.html new file mode 100644 index 0000000..d060c97 --- /dev/null +++ b/zhitongbao/reports/1600134541.html @@ -0,0 +1,516 @@ + + + + - TestReport + + + + +

Test Report:

+ +

Summary

+ + + + + + + + + + + + + + + + + + + + + + + + + +
START AT2020-09-15 09:49:01
DURATION0.116 seconds
PLATFORMHttpRunner 2.3.0 CPython 3.8.4 Windows-10-10.0.18362-SP0
STATTESTCASES (success/fail)TESTSTEPS (success/fail/error/skip)
total (details) =>1 (0/1)1 (0/1/0/0)
+ +

Details

+ + + +

删除会员

+ + + + + + + + + + + + + + + + + + + + + + + + + +
TOTAL: 1SUCCESS: 0FAILED: 1ERROR: 0SKIPPED: 0
StatusNameResponse TimeDetail
failure删除会员58.55 ms + + + + log-1 + + + + + traceback + + + +
+ + \ No newline at end of file diff --git a/zhitongbao/reports/1600134565.html b/zhitongbao/reports/1600134565.html new file mode 100644 index 0000000..e7b2c1c --- /dev/null +++ b/zhitongbao/reports/1600134565.html @@ -0,0 +1,492 @@ + + + + - TestReport + + + + +

Test Report:

+ +

Summary

+ + + + + + + + + + + + + + + + + + + + + + + + + +
START AT2020-09-15 09:49:25
DURATION0.887 seconds
PLATFORMHttpRunner 2.3.0 CPython 3.8.4 Windows-10-10.0.18362-SP0
STATTESTCASES (success/fail)TESTSTEPS (success/fail/error/skip)
total (details) =>1 (1/0)1 (1/0/0/0)
+ +

Details

+ + + +

删除会员

+ + + + + + + + + + + + + + + + + + + + + + + + + +
TOTAL: 1SUCCESS: 1FAILED: 0ERROR: 0SKIPPED: 0
StatusNameResponse TimeDetail
success删除会员854.67 ms + + + + log-1 + + + + + +
+ + \ No newline at end of file diff --git a/zhitongbao/reports/1600134650.html b/zhitongbao/reports/1600134650.html new file mode 100644 index 0000000..519e502 --- /dev/null +++ b/zhitongbao/reports/1600134650.html @@ -0,0 +1,492 @@ + + + + - TestReport + + + + +

Test Report:

+ +

Summary

+ + + + + + + + + + + + + + + + + + + + + + + + + +
START AT2020-09-15 09:50:50
DURATION0.281 seconds
PLATFORMHttpRunner 2.3.0 CPython 3.8.4 Windows-10-10.0.18362-SP0
STATTESTCASES (success/fail)TESTSTEPS (success/fail/error/skip)
total (details) =>1 (1/0)1 (1/0/0/0)
+ +

Details

+ + + +

删除会员

+ + + + + + + + + + + + + + + + + + + + + + + + + +
TOTAL: 1SUCCESS: 1FAILED: 0ERROR: 0SKIPPED: 0
StatusNameResponse TimeDetail
success删除会员255.39 ms + + + + log-1 + + + + + +
+ + \ No newline at end of file diff --git a/zhitongbao/zhitongbao/testcases/demo_testcase.yml b/zhitongbao/testcases/demo_testcase.yml similarity index 100% rename from zhitongbao/zhitongbao/testcases/demo_testcase.yml rename to zhitongbao/testcases/demo_testcase.yml diff --git a/zhitongbao/zhitongbao/testcases/ldap_Menu.yml b/zhitongbao/testcases/ldap_Menu.yml similarity index 100% rename from zhitongbao/zhitongbao/testcases/ldap_Menu.yml rename to zhitongbao/testcases/ldap_Menu.yml diff --git a/zhitongbao/zhitongbao/testcases/ldap_token.yml b/zhitongbao/testcases/ldap_token.yml similarity index 100% rename from zhitongbao/zhitongbao/testcases/ldap_token.yml rename to zhitongbao/testcases/ldap_token.yml diff --git a/zhitongbao/zhitongbao/testcases/product.yml b/zhitongbao/testcases/product.yml similarity index 100% rename from zhitongbao/zhitongbao/testcases/product.yml rename to zhitongbao/testcases/product.yml diff --git a/zhitongbao/zhitongbao/testcases/product_add.yml b/zhitongbao/testcases/product_add.yml similarity index 100% rename from zhitongbao/zhitongbao/testcases/product_add.yml rename to zhitongbao/testcases/product_add.yml diff --git a/zhitongbao/zhitongbao/testsuites/demo_testsuite.yml b/zhitongbao/testsuites/demo_testsuite.yml similarity index 100% rename from zhitongbao/zhitongbao/testsuites/demo_testsuite.yml rename to zhitongbao/testsuites/demo_testsuite.yml diff --git a/zhitongbao/zhitongbao/testsuites/product/product_add.yml b/zhitongbao/testsuites/product/product_add.yml similarity index 100% rename from zhitongbao/zhitongbao/testsuites/product/product_add.yml rename to zhitongbao/testsuites/product/product_add.yml