Merge branch 'cx_dev' into common_dev

all_doctor_api/glmer_request.py

@@ -28,7 +28,13 @@ class glmer_request(BaseRequest):
 
 
 
+    def service_detail(self) :
+        return self.api_send(self.REGISTER_URL["service_detail"])
+
+
+
 
 
 if __name__ == '__main__':
     print(glmer_request().service_register("激光溶脂瘦脸", "[236]", "true", "测试", "wangyang", "1624377600", "1627660800", "<p>12</p>", "https://heras.igengmei.com/service/2021/06/01/0b9b110e60", "UPCOYIJkZOMcdd9FDzpBqYjzWUh55fBpVi3AhWpL:nBdvXYz_CR7wNcuroo3TLyvuQiY=:eyJzY29wZSI6InZpZGVvIiwiZGVhZGxpbmUiOjE2MjI1MTg2NTd9", "0", "false", "1", "false", "0", '[{"gengmei_price":100,"original_price":200,"is_online":true}]',"PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
+    print(glmer_request().service_detail())
\ No newline at end of file

all_doctor_api/glmer_request.yaml

@@ -25,3 +25,12 @@ service_register:
     face_token: ${face_token}
   json: {}
   isLogin: 1
+
+
+service_detail:
+   method: get
+   url: /api/glmer/service/detail/5885425
+   params: {}
+   data: {}
+   json: {}
+   isLogin: 1

all_doctor_api/web2_request.py

@@ -35,5 +35,4 @@ if __name__ == '__main__':
     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"))
-
     print(web2_request().tag_all())

path_setting.py

@@ -55,6 +55,9 @@ DOCTOR_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "do
 REGISTER_URL=os.path.join(BASE_DIR, "backend_auto/all_doctor_api", "glmer_request.yaml")
 REGISTER_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/glmer_data", "service_register.yaml")
 
+#医生后台-编辑商品
+DETAIL_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/glmer_data", "service_detail.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/glmer_case/test_service_detail.py

+import pytest
+
+import path_setting
+from all_doctor_api.glmer_request import glmer_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestServiceDetail:
+    service_detail = BaseRequest().api_load(path_setting.DETAIL_DATA)
+    ServiceDetail_case, ServiceDetail_data = get_ids(service_detail, "service_detail")
+
+    @pytest.mark.parametrize("params",ServiceDetail_data,ids=ServiceDetail_case)
+    def test_ServiceDetail(self,params):
+
+        r =glmer_request().service_detail()
+        print("------",r)
+        if r["code"] == 0:
+            assert r["code"] == params["assert"]
\ No newline at end of file

test_doctor_case/glmer_case/test_service_register.py

@@ -14,7 +14,6 @@ class TestServiceRegister:
     def test_ServiceRegister(self,params):
 
         r =glmer_request().service_register(params['name'],params['project_type'],params['upgrade'],params['short_description'],params['doctor_id'],params['start_time'],params['end_time'],params['photo_details'],params['image_header'],params['video_token'],params['service_type'],params['is_specialreview'],params['reservation'],params['have_extra_pay'],params['is_draft'],params['items'],params['csrfmiddlewaretoken'])
-        print("======",r)
 
         if r["code"] == 0:
             assert r["code"] == params["assert"]

test_doctor_data/glmer_data/service_detail.yaml

+service_detail:
+  -
+    case:  "编辑商品-进入商品详情页 "
+    assert: 0
\ No newline at end of file