解决冲突

all_doctor_api/web2_request.py

@@ -13,11 +13,18 @@ class web2_request(BaseRequest):
 
         return self.api_send(self.data["service_list"])
 
+    def tag_all(self) :
+        return self.api_send(self.data["tag_all"])
+
+
 if __name__ == '__main__':
-<<<<<<< HEAD
+
     print(web2_request().service_list("1", "10", "-1"))
-=======
+
     print(web2_request().service_list("1", "10", "-1", "-1"))
     print(web2_request().service_review_list("1", "10", "0"))
     print(web2_request().servicereview_option("209989", "1", "PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
->>>>>>> 350a88c602aa982cfdafc10ea6d1f4946f15da96
+
+
+    print(web2_request().tag_all())
+

all_doctor_api/web2_request.yaml

@@ -6,5 +6,46 @@ service_list:
     pagesize: ${pagesize}
     is_online: ${is_online}
   data: {}
+  json: {}
+
+  isLogin: 1
+
+
+service_review_list:
+   method: get
+   url: /api/web2/service/review/list
+   params:
+     page: ${page}
+     pagesize: ${pagesize}
+     type: ${type}
+   data:
+     phone_num: ${phone_num}
+     vfc_code: ${vfc_code}
+     face_token: ${face_token}
+   json: {}
+   isLogin: 1
+
+
+servicereview_option:
+   method: POST
+   url: /api/web2/servicereview/option
+   params: {}
+   data:
+     id: ${id}
+     type: ${type}
+     csrfmiddlewaretoken: ${csrfmiddlewaretoken}
+     phone_num: ${phone_num}
+     vfc_code: ${vfc_code}
+     face_token: ${face_token}
+   json: {}
+   isLogin: 1
+
+
+tag_all:
+  method: get
+  url: /api/web2/tag/all
+  param: {}
+  data: {}
+
   json: {}
   isLogin: 1
\ No newline at end of file

all_doctor_api/web_request.py

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

all_doctor_api/web_request.yaml

@@ -2,10 +2,7 @@ account_unreadbadgecount:
   method: get
   url: /api/web/account/unread_badge_count
   param: {}
-  data:
-    phone_num: ${phone_num}
-    vfc_code: ${vfc_code}
-    face_token: ${face_token}
+  data: {}
   json: {}
   isLogin: 1
 
@@ -15,10 +12,15 @@ article_videotoken:
   method: get
   url: /api/web/article/video_token
   param: {}
-  data:
-    phone_num: ${phone_num}
-    vfc_code: ${vfc_code}
-    face_token: ${face_token}
+  data: {}
   json: {}
   isLogin: 1
 
+
+doctor_submechanisms:
+  method: get
+  url: /api/web/doctor/submechanisms
+  param: {}
+  data: {}
+  json: {}
+  isLogin: 1

path_setting.py

@@ -39,6 +39,11 @@ ACCOUNT_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "a
 # 医生后台-发布商品选择类目article
 ARTICLE_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "article_videotoken.yaml")
 
+#医生后台 - 发布商品选择类目tag
+TAG_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "tag_all.yaml")
+
+#医生后台 - 发布商品选择类目doctor
+DOCTOR_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "doctor_submechanisms.yaml")
 
 #搜索首页-热门搜索
 KEYWORDS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")

test_doctor_case/web2_case/test_tag_all.py

+import pytest
+
+import path_setting
+from all_doctor_api.web2_request import web2_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestTagAll:
+
+    tag_all = BaseRequest().api_load(path_setting.TAG_DATA)
+    TagAll_case, TagAll_data = get_ids(tag_all, "tag_all")
+
+    @pytest.mark.parametrize("param", TagAll_data, ids=TagAll_case)
+    def test_TagAll(self, param):
+
+        r = web2_request().tag_all()
+        print("---------",r)
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]
+
+        # elif r["error"] == 1:
+        #     assert r["data"] == params["assert"]
\ No newline at end of file

test_doctor_case/web_case/test_doctor_submechanisms.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 TestDoctorSubmechanisms:
+
+    doctor_submechanisms = BaseRequest().api_load(path_setting.DOCTOR_DATA)
+    DoctorSubmechanisms_case, DoctorSubmechanisms_data = get_ids(doctor_submechanisms, "doctor_submechanisms")
+
+    @pytest.mark.parametrize("param",DoctorSubmechanisms_data,ids=DoctorSubmechanisms_case)
+    def test_DoctorSubmechanisms_data(self,param):
+
+        r = web_request().doctor_submechanisms()
+        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/web2_data/tag_all.yaml

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

test_doctor_data/web_data/doctor_submechanisms.yaml

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