Merge branch 'cx_dev' into common_dev

all_doctor_api/web_request.py

@@ -10,8 +10,12 @@ class web_request(BaseRequest):
     def account_unreadbadgecount(self) :
         return self.api_send(self.data["account_unreadbadgecount"])
 
+    def article_videotoken(self) :
+        return self.api_send(self.data["article_videotoken"])
+
 
 
 
 if __name__ == '__main__':
     print(web_request().account_unreadbadgecount())
+    print(web_request().article_videotoken())

all_doctor_api/web_request.yaml

@@ -7,4 +7,18 @@ account_unreadbadgecount:
     vfc_code: ${vfc_code}
     face_token: ${face_token}
   json: {}
-  isLogin: 1
\ No newline at end of file
+  isLogin: 1
+
+
+
+article_videotoken:
+  method: get
+  url: /api/web/article/video_token
+  param: {}
+  data:
+    phone_num: ${phone_num}
+    vfc_code: ${vfc_code}
+    face_token: ${face_token}
+  json: {}
+  isLogin: 1
+

path_setting.py

@@ -32,10 +32,14 @@ SERVICE_URL=os.path.join(BASE_DIR, "backend_auto/all_doctor_api", "web2_request.
 
 
 
-#医生后台-发布商品选择类目
+#医生后台-发布商品选择类目ACCOUNT
 ACCOUNT_URL=os.path.join(BASE_DIR, "backend_auto/all_doctor_api", "web_request.yaml")
 ACCOUNT_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "account_unreadbadgecount.yaml")
 
+# 医生后台-发布商品选择类目article
+ARTICLE_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "article_videotoken.yaml")
+
+
 #搜索首页-热门搜索
 KEYWORDS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
 KEYWORDS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "keywords.yaml")

test_doctor_case/web_case/test_account_unreadbadgecount.py

@@ -7,10 +7,10 @@ from in_common.base_request import BaseRequest
 
 
 class TestAccountUnreadbadgecount:
+
     account_unreadbadgecount = BaseRequest().api_load(path_setting.ACCOUNT_DATA)
     AccountUnreadbadgecount_case, AccountUnreadbadgecount_data = get_ids(account_unreadbadgecount, "account_unreadbadgecount")
 
-    print("-----",account_unreadbadgecount)
     @pytest.mark.parametrize("param",AccountUnreadbadgecount_data,ids=AccountUnreadbadgecount_case)
     def test_AccountUnreadbadgecount(self,param):
 

test_doctor_case/web_case/test_article_videotoken.py

+import pytest
+
+import path_setting
+from all_doctor_api.web_request import web_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestArticleVideotoken:
+
+    article_videotoken = BaseRequest().api_load(path_setting.ARTICLE_DATA)
+    ArticleVideotoken_case, ArticleVideotoken_data = get_ids(article_videotoken, "article_videotoken")
+
+    @pytest.mark.parametrize("param",ArticleVideotoken_data,ids=ArticleVideotoken_case)
+    def test_ArticleVideotokent(self,param):
+
+        r = web_request().article_videotoken()
+        print("======",r)
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]
+        # elif r["error"] == 1:
+        #     assert r["message"] == params["assert"]
\ No newline at end of file

test_doctor_data/web_data/account_unreadbadgecount.yaml

 account_unreadbadgecount:
   -
-    case:  "发布商品-选择类目跳转发布商品页面"
+    case:  "发布商品-选择类目跳转发布商品页面account接口"
     assert: 0
\ No newline at end of file

test_doctor_data/web_data/article_videotoken.yaml

+article_videotoken:
+  -
+    case:  "发布商品-选择类目跳转发布商品页面article接口"
+    assert: 0
\ No newline at end of file