diff --git a/recycle/api/login/ldap_login_password.yml b/recycle/api/login/ldap_login_password.yml index fb9c7fa..86a1c49 100644 --- a/recycle/api/login/ldap_login_password.yml +++ b/recycle/api/login/ldap_login_password.yml @@ -1,7 +1,7 @@ name: ldap登录 variables: code: 200 - message: 登陆成功 + successful: 登陆成功 username: liangjinman@qniao.cn password: qn123456 base_url: ${ENV(BURL)} @@ -16,4 +16,4 @@ request: password: $password validate: - eq: ["status_code", $code] - - {"check": "content.message", "comparator": "contains", "expect": $message} \ No newline at end of file + - {"check": "content.message", "comparator": "contains", "expect": $successful} \ No newline at end of file diff --git a/recycle/api/papermill/admin_add_papermill.yml b/recycle/api/papermill/admin_add_papermill.yml new file mode 100644 index 0000000..162f8b0 --- /dev/null +++ b/recycle/api/papermill/admin_add_papermill.yml @@ -0,0 +1,30 @@ +name: 运营新建纸厂 +variables: + code: 200 + message: successful + token: ${ENV(LDAPTOKEN)} + name: 纸厂名称1 + locDistrictId: 440106 + logoImg: null + shortName: 纸厂简称1 + enableSalesAgent: 1 + paybackIntever: 回款日期 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/paperMill/add/paper-mill + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token + json: + name: $name + locDistrictId: $locDistrictId + logoImg: $logoImg + shortName: $shortName + enableSalesAgent: $enableSalesAgent + paperMillSettlementInfo: + - paybackIntever: $paybackIntever +validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} diff --git a/recycle/api/papermill/admin_get_papermill.yml b/recycle/api/papermill/admin_get_papermill.yml new file mode 100644 index 0000000..cbd0a0f --- /dev/null +++ b/recycle/api/papermill/admin_get_papermill.yml @@ -0,0 +1,17 @@ +name: 运营获取纸厂列表 +variables: + code: 200 + message: successful + token: ${ENV(LDAPTOKEN)} +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/paperMill/get/paper-mill-list + method: GET + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token + +validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} diff --git a/recycle/api/papermill/admin_get_papermill_details.yml b/recycle/api/papermill/admin_get_papermill_details.yml new file mode 100644 index 0000000..70495ef --- /dev/null +++ b/recycle/api/papermill/admin_get_papermill_details.yml @@ -0,0 +1,17 @@ +name: 运营获取纸厂信息详情 +variables: + code: 200 + message: successful + token: ${ENV(LDAPTOKEN)} + paperMillId: 518132960424235008 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/paperMill/get/paper-mill-details/$paperMillId + method: GET + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token +validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} diff --git a/recycle/api/papermill/admin_update_papermill.yml b/recycle/api/papermill/admin_update_papermill.yml new file mode 100644 index 0000000..011248f --- /dev/null +++ b/recycle/api/papermill/admin_update_papermill.yml @@ -0,0 +1,32 @@ +name: 运营修改纸厂信息 +variables: + code: 200 + message: successful + token: ${ENV(LDAPTOKEN)} + name: 纸厂名称2 + locDistrictId: 440106 + logoImg: null + shortName: 纸厂简称2 + enableSalesAgent: 1 + paybackIntever: 回款日期 + paperMillId: 518132960424235008 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/paperMill/update/paper-mill + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token + json: + name: $name + locDistrictId: $locDistrictId + logoImg: $logoImg + shortName: $shortName + enableSalesAgent: $enableSalesAgent + paperMillSettlementInfo: + - paybackIntever: $paybackIntever + paperMillId: $paperMillId +validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} diff --git a/recycle/api/papermill_vehicle_queuing/admin_add_papermill_vehicle_queuing.yml b/recycle/api/papermill_vehicle_queuing/admin_add_papermill_vehicle_queuing.yml new file mode 100644 index 0000000..ae7bc40 --- /dev/null +++ b/recycle/api/papermill_vehicle_queuing/admin_add_papermill_vehicle_queuing.yml @@ -0,0 +1,25 @@ +name: 运营新建纸厂车辆排队 +variables: + code: 200 + message: successful + token: ${ENV(LDAPTOKEN)} + paperMillId: 518132960424235008 + retainedQuantity: 2 + time: "2020-10-26" + totalQuantity: 3 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/received-weight/add/daily-received-weight + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token + json: + paperMillId: $paperMillId + retainedQuantity: $retainedQuantity + time: $time + totalQuantity: $totalQuantity +validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} diff --git a/recycle/api/papermill_vehicle_queuing/admin_get_papermill_vehicle_queuing_list.yml b/recycle/api/papermill_vehicle_queuing/admin_get_papermill_vehicle_queuing_list.yml new file mode 100644 index 0000000..9455553 --- /dev/null +++ b/recycle/api/papermill_vehicle_queuing/admin_get_papermill_vehicle_queuing_list.yml @@ -0,0 +1,16 @@ +name: 运营获取纸厂车辆排队列表 +variables: + code: 200 + message: successful + token: ${ENV(LDAPTOKEN)} +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/received-weight/get/daily-received-weight-list + method: GET + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token +validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} diff --git a/recycle/api/papermill_vehicle_queuing/admin_update_papermill_vehicle_queuing.yml b/recycle/api/papermill_vehicle_queuing/admin_update_papermill_vehicle_queuing.yml new file mode 100644 index 0000000..8a009a0 --- /dev/null +++ b/recycle/api/papermill_vehicle_queuing/admin_update_papermill_vehicle_queuing.yml @@ -0,0 +1,27 @@ +name: 运营新建纸厂车辆排队 +variables: + code: 200 + message: successful + token: ${ENV(LDAPTOKEN)} + id: + paperMillId: 518132960424235008 + retainedQuantity: 2 + time: "2020-10-26" + totalQuantity: 3 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/admin/received-weight/update/daily-received-weight + method: POST + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token + json: + id: $id + paperMillId: $paperMillId + retainedQuantity: $retainedQuantity + time: $time + totalQuantity: $totalQuantity +validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} diff --git a/recycle/api/share/share_papermill.yml b/recycle/api/share/share_papermill.yml new file mode 100644 index 0000000..6b2cbca --- /dev/null +++ b/recycle/api/share/share_papermill.yml @@ -0,0 +1,17 @@ +name: 分享纸厂今日报价 +variables: + code: 200 + message: successful + token: ${ENV(ATOKEN)} + paperMillId: 498492951731769344 +base_url: ${ENV(BURL)} +request: + url: /recycle-service/share/paper-mill/$paperMillId/categories-daily-price/on-today + method: GET + headers: + Content-Type: "application/json;charset=UTF-8" + X-APP-ID: "1" + Authorization: $token +validate: + - eq: ["status_code", $code] + - {"check": "content.message", "comparator": "contains", "expect": $message} \ No newline at end of file diff --git a/recycle/api/share/share_get_product.yml b/recycle/api/share/share_product.yml similarity index 100% rename from recycle/api/share/share_get_product.yml rename to recycle/api/share/share_product.yml diff --git a/recycle/api/share/share_get_userproduct.yml b/recycle/api/share/share_userproduct.yml similarity index 100% rename from recycle/api/share/share_get_userproduct.yml rename to recycle/api/share/share_userproduct.yml diff --git a/recycle/cases/login/ldap_login_password.yml b/recycle/cases/login/ldap_login_password.yml index b557a92..7d6377f 100644 --- a/recycle/cases/login/ldap_login_password.yml +++ b/recycle/cases/login/ldap_login_password.yml @@ -3,7 +3,7 @@ testcases: name: ldap密码登录测试套件 testcase: steps/login/ldap_login_password.yml parameters: - - title-username-password-code-message: + - title-username-password-code-successful: - ["登录成功","liangjinman@qniao.cn","qn123456",200,"登陆成功"] - ["账号错误","admin","qn123456",200,"20003"] - ["账号为空","","qn123456",200,"20001"] diff --git a/recycle/steps/customer_and_business_relations/admin_customerbizrelation_relation.yml b/recycle/steps/customer_and_business_relations/admin_customerbizrelation_relation.yml index 38769aa..269509c 100644 --- a/recycle/steps/customer_and_business_relations/admin_customerbizrelation_relation.yml +++ b/recycle/steps/customer_and_business_relations/admin_customerbizrelation_relation.yml @@ -16,7 +16,6 @@ teststeps: - bizUserId: content.data.0.adminId - bizUserName: content.data.0.name - - name: app密码登录获取token api: api/login/app_login_password.yml diff --git a/recycle/steps/customer_and_business_relations/admin_customerbizrelation_save_relation.yml b/recycle/steps/customer_and_business_relations/admin_customerbizrelation_save_relation.yml index 00f136b..ff159cf 100644 --- a/recycle/steps/customer_and_business_relations/admin_customerbizrelation_save_relation.yml +++ b/recycle/steps/customer_and_business_relations/admin_customerbizrelation_save_relation.yml @@ -11,7 +11,7 @@ teststeps: name: $title api: api/customer_and_business_relations/admin_customerbizrelation_save_relation.yml variables: - accesstoken: $token + token: $token bizUserId: $bizUserId bizUserName: $bizUserName cusormerId: $cusormerId diff --git a/recycle/steps/customer_and_business_relations/admin_customerbizrelation_update_relation.yml b/recycle/steps/customer_and_business_relations/admin_customerbizrelation_update_relation.yml index 513c6c6..bdd2629 100644 --- a/recycle/steps/customer_and_business_relations/admin_customerbizrelation_update_relation.yml +++ b/recycle/steps/customer_and_business_relations/admin_customerbizrelation_update_relation.yml @@ -19,7 +19,7 @@ teststeps: name: $title api: api/customer_and_business_relations/admin_customerbizrelation_update_relation.yml variables: - accesstoken: $accesstoken + token: $token bizUserId: $bizUserId bizUserName: $bizUserName id: $id diff --git a/recycle/steps/login/ldap_login_password.yml b/recycle/steps/login/ldap_login_password.yml index ab9dd58..f44a99a 100644 --- a/recycle/steps/login/ldap_login_password.yml +++ b/recycle/steps/login/ldap_login_password.yml @@ -6,4 +6,4 @@ teststeps: api: api/login/ldap_login_password.yml validate: - eq: ["status_code", $code] - - {"check": "content.message", "comparator": "contains", "expect": $message} + - {"check": "content.message", "comparator": "contains", "expect": $successful} diff --git a/recycle/steps/share/app_share.yml b/recycle/steps/share/app_share.yml index e191031..45d0010 100644 --- a/recycle/steps/share/app_share.yml +++ b/recycle/steps/share/app_share.yml @@ -8,11 +8,11 @@ teststeps: - apptoken: content.data.token - name: app分享采购商品 - api: api/share/share_get_product.yml + api: api/share/share_product.yml variables: apptoken: $apptoken - name: app分享一口价/竞价商品 - api: api/share/share_get_userproduct.yml + api: api/share/share_userproduct.yml variables: apptoken: $apptoken