Merge branch 'common_dev' into zzsq_dev

all_backend_api/user_request.py

@@ -148,9 +148,27 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["favors_answers"])
 
+    #忘记密码-设置密码
+    def change_pwd(self,version, change_type,new_password, repeat_password):
+        self.params["version"] = version
+        self.params["change_type"] = change_type
+        self.params["new_password"] = new_password
+        self.params["repeat_password"] = repeat_password
 
+        return self.api_send(self.data["change_pwd"])
 
+    # 修改密码
+    def change_pwdd(self, version, change_type, password, new_password, repeat_password):
+        self.params["version"] = version
+        self.params["change_type"] = change_type
+        self.params["password"] = password
+        self.params["new_password"] = new_password
+        self.params["repeat_password"] = repeat_password
+        return self.api_send(self.data["change_pwdd"])
 
+    #点击修改密码时获取用户信息
+    def check_pwd(self):
+        return self.api_send(self.data["check_pwd"])
 
 if __name__ == '__main__':
     #个人中心
@@ -188,6 +206,15 @@ if __name__ == '__main__':
     # 我的-收藏-日记贴
     print(user_request().favors_topics(0, 10))
 
+    #忘记密码-修改密码
+    print(user_request().change_pwd('7.48.0',1,123456,123456))
+
+    #修改密码
+    print(user_request().change_pwdd('7.48.0',123456,1,123456,123456))
+
+    #修改密码时获取账号信息
+    print(user_request().check_pwd())
+
 
 
 

all_backend_api/user_request.yaml

@@ -210,3 +210,39 @@ favors_answers:
   data: {}
   json: {}
   isLogin: 1
+
+#忘记密码-设置密码
+change_pwd:
+  method: post
+  url: /api/user/change_pwd
+  params:
+    version: ${version}
+  data:
+    change_type: ${change_type}
+    new_password: ${new_password}
+    repeat_password: ${repeat_password}
+  json: {}
+  isLogin: 1
+
+#修改密码
+change_pwdd:
+  method: post
+  url: /api/user/change_pwd
+  params:
+    version: ${version}
+  data:
+    password: ${password}
+    change_type: ${change_type}
+    new_password: ${new_password}
+    repeat_password: ${repeat_password}
+  json: {}
+  isLogin: 1
+
+#修改密码时获取用户信息
+check_pwd:
+  method: get
+  url: /api/user/check_pwd
+  params:
+  data:
+  json: {}
+  isLogin: 1
\ No newline at end of file

all_backend_api/verification_code_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+#获取验证码
+class verification_code_request(BaseRequest):
+
+    def __init__(self):
+        self.data = self.api_load(path_setting.VERIFICATION_CODE_REQUEST_CONFIG)
+#获取验证码
+    def verification_code(self, phone,type,verifier):
+        self.params["phone"] = phone
+        self.params["type"] = type
+        self.params["verifier"] = verifier
+        return self.api_send(self.data["verification_code"])
+
+if __name__ == '__main__':
+    print(verification_code_request().verification_code(12345678999,2, 'fd94aa08c242a00496aba1e5b556c436'))
\ No newline at end of file

all_backend_api/verification_code_request.yaml

+verification_code:
+  method: post
+  url: /api/verification_code
+  params: {}
+  data:
+    phone: ${phone}
+    type: ${type}
+    verifier: ${verifier}
+  json: {}
\ No newline at end of file

path_setting.py

@@ -644,7 +644,12 @@ BEAUTY_POST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data"
 #直播关注/取关主播
 FOLLOW_ADD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "follow_add.yaml")
 FOLLOW_DEL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "follow_del.yaml")
-
+#忘记密码-设置密码
+CHANGE_PWD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "change_pwd.yaml")
+#修改密码
+CHANGE_PWDD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "change_pwdd.yaml")
+#设置密码时获取用户信息
+CHECK_PWD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "check_pwd.yaml")
 
 #主播-推荐袋美购列表展示
 LIVESERVICES_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
@@ -787,5 +792,9 @@ FAVORS_ANASWERS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_da
 ACCOUNT_HOMEPAGE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "account_request.yaml")
 ACCOUNT_HOMEPAGE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/account_data", "account_homepage.yaml")
 
+#获取验证码
+VERIFICATION_CODE_REQUEST_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "verification_code_request.yaml")
+VERIFICATION_CODE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/verification_code_data", "verification_code.yaml")
+
 if __name__ == '__main__':
     print("==========",LIVEYAML_CONFIG)
\ No newline at end of file

test_backend_case/user_case/test_change_pwd.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+class TestChangePwd:
+    data = BaseRequest().api_load(path_setting.CHANGE_PWD)
+    change_pwd_case, change_pwd_data = get_ids(data, "change_pwd")
+
+    @pytest.mark.parametrize("param",change_pwd_data, ids=change_pwd_case)
+    def test_change_pwd(self, param):
+        r = user_request().change_pwd(param["version"], param["change_type"],param["new_password"],param["repeat_password"])
+        if r.get("error_code") == 22006:
+            assert r["message"] == param["assert"]
+        elif r.get("error_code") == -1:
+            assert r["message"] == param["assert"]
+        elif r.get("error") == 0:
+            assert r["error"] == param["assert1"]

test_backend_case/user_case/test_change_pwdd.py

+import pytest
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+class TestChangePwdd:
+    data = BaseRequest().api_load(path_setting.CHANGE_PWDD)
+    change_pwdd_case, change_pwdd_data = get_ids(data, "change_pwdd")
+
+    @pytest.mark.parametrize("param",change_pwdd_data, ids=change_pwdd_case)
+    def test_change_pwdd(self, param):
+        r = user_request().change_pwdd(param["version"],param["password"] ,param["change_type"],param["new_password"],param["repeat_password"])
+        if r.get("error_code") == 22006:
+            assert r["message"] == param["assert"]
+        elif r.get("error_code") == -1:
+            assert r["message"] == param["assert"]
+        elif r.get("error") == 0:
+            assert r["error"] == param["assert"]
+ #       else:
+  #          assert r["message"] == param["assert2"]

test_backend_case/user_case/test_check_pwd.py

+import pytest
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+class TestCheckPwd:
+    data = BaseRequest().api_load(path_setting.CHECK_PWD)
+    check_pwd_case, check_pwd_data = get_ids(data, "check_pwd")
+
+    @pytest.mark.parametrize("param",check_pwd_data, ids=check_pwd_case)
+    def test_check_pwd(self, param):
+        r = user_request().check_pwd()
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]
\ No newline at end of file

test_backend_case/verification_code_case/test_verification_code.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.verification_code_request import verification_code_request
+
+class TestVerificationCode:
+    data = BaseRequest().api_load(path_setting.VERIFICATION_CODE)
+    verification_code_case, verification_code_data = get_ids(data, "verification_code")
+
+    @pytest.mark.parametrize("param",verification_code_data, ids=verification_code_case)
+    def test_verification_code(self, param):
+        r = verification_code_request().verification_code(param["phone"], param["type"], param["verifier"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]

test_backend_data/user_data/change_pwd.yaml

+change_pwd:
+#忘记密码-设置密码
+  -
+    case: "新密码不可与旧密码相同"
+    version: 7.47.0
+    change_type: 1
+    new_password: 123456
+    repeat_password: 123456
+    assert: "新密码不可与旧密码相同"
+    #error_code: 22006
+  -
+    case: "密码不符合要求"
+    version: 7.48.0
+    change_type: 1
+    new_password: 123456
+    repeat_password: 123456
+    assert: "密码应包含数字、大小写字母、特殊字符的两种或两种以上"
+
+  -
+    case: "密码长度不对"
+    version: 7.48.0
+    change_type: 1
+    new_password: 12345
+    repeat_password: 12345
+    assert: "密码长度在6-16位之间"
+
+  -
+    case: "两次输入密码不一致"
+    version: 7.48.0
+    change_type: 1
+    new_password: 123456
+    repeat_password: 1234567
+    assert: "两次输入的密码不一致"
+
+  -
+    case: "修改密码成功"
+    version: 7.48.0
+    change_type: 1
+    new_password: ceshi123
+    repeat_password: ceshi123
+    assert1: 0
+
+  -
+    case: "修改密码成功2"
+    version: 7.47.0
+    change_type: 1
+    new_password: 123456
+    repeat_password: 123456
+    assert1: 0

test_backend_data/user_data/change_pwdd.yaml

+change_pwdd:
+#修改密码
+  -
+    case: "新密码不可与旧密码相同"
+    version: 7.47.0
+    change_type: 0
+    password: 123456
+    new_password: 123456
+    repeat_password: 123456
+    assert: "新密码不可与旧密码相同"
+
+  -
+    case: "密码不符合要求"
+    version: 7.48.0
+    change_type: 0
+    password: 123456
+    new_password: 123456
+    repeat_password: 123456
+    assert: "密码应包含数字、大小写字母、特殊字符的两种或两种以上"
+
+  -
+    case: "密码长度不对"
+    version: 7.48.0
+    change_type: 0
+    password: 123456
+    new_password: 12345
+    repeat_password: 12345
+    assert: "密码长度在6-16位之间"
+
+  -
+    case: "两次输入密码不一致"
+    version: 7.48.0
+    change_type: 0
+    password: 123456
+    new_password: 123456
+    repeat_password: 1234567
+    assert: "两次输入的密码不一致"
+
+  -
+    case: "修改密码成功"
+    version: 7.48.0
+    change_type: 0
+    password: 123456
+    new_password: ceshi123
+    repeat_password: ceshi123
+    assert: 0
+
+  -
+    case: "修改密码成功2"
+    version: 7.47.0
+    change_type: 0
+    password: 123456
+    new_password: 123456
+    repeat_password: 123456
+    assert: 0
+

test_backend_data/user_data/check_pwd.yaml

+check_pwd:
+#点击修改密码时获取用户信息
+  -
+    case: "点击修改密码时成功获取用户信息"
+    assert: 0
\ No newline at end of file

test_backend_data/verification_code_data/verification_code.yaml

+verification_code:
+  -
+   #发送验证码
+    case: "发送验证码"
+    phone: 12345678999
+    type: 2
+    verifier: 'fd94aa08c242a00496aba1e5b556c436'
+    assert: 0
+
+
+