-修改错误函数，新增路径判断,添加首页tab相关接口

all_backend_api/common_request.py

@@ -9,13 +9,13 @@ class common_request(BaseRequest):
     # 日记贴评论列表--一级评论列表
     def diary_common_reply(self, id, type):
         self.params["id"] = id
-        self.params["type"] = type
+        self.params["com_type"] = type
         return self.api_send(self.data["reply_detail"])
 
     # 日记贴评论列表--二级评论
     def topic_sub_common(self, id, type, reply_id):
         self.params["id"] = id
-        self.params["type"] = type
+        self.params["com_type"] = type
         self.params["reply_id"] = reply_id
         return self.api_send(self.data["sub_common"])
 

all_backend_api/common_request.yaml

@@ -4,7 +4,7 @@ reply_detail:
   url:  /api/common/reply
   params:
     id: ${id}
-    type: ${type}
+    type: ${com_type}
   data: {}
   json: {}
   isLogin: 0  #需要登录添加这个字段，值为1  0是不需要登录的情况，如不需要登录，可以不添加这个字段
@@ -16,7 +16,7 @@ sub_common:
   url:  /api/common/reply/sub_reply
   params:
     id: ${id}
-    type: ${type}
+    type: ${com_type}
     reply_id: ${reply_id}
   data: {}
   json: {}

all_backend_api/hybrid_api_topic_request.py

@@ -10,9 +10,9 @@ class hybrid_api_topic_request(BaseRequest):
         self.params["id"] = id
         return self.api_send(self.data["vote"])
 
-    def diary_canclevote(self, id):
+    def diary_cancelvote(self, id):
         self.params["id"] = id
-        return self.api_send(self.data["canclevote"])
+        return self.api_send(self.data["cancelvote"])
 
     # 进入日记贴详情页-用来判断这篇日记贴点赞过没
     def diary_detail(self, topic_id):

all_backend_api/hybrid_api_topic_request.yaml

@@ -9,7 +9,7 @@ vote:
   isLogin: 1  #需要登录添加这个字段，值为1  0是不需要登录的情况，如不需要登录，可以不添加这个字段
 
 #取消点赞
-canclevote:
+cancelvote:
   method: post
   url: /hybrid/api/topic/cancel_vote/_data
   params:

all_backend_api/hybrid_request.py

@@ -50,6 +50,16 @@ class hybrid_request(BaseRequest):
         self.params['question_id'] = question_id
         return self.api_send(self.data['question_new_answer_list'])
 
+    # 回答详情页评论点赞
+    def answer_reply_vote(self, id):
+        self.params['id'] = id
+        return self.api_send(self.data['answer_reply_vote'])
+
+    def answer_reply_cancel_vote(self, id):
+        self.params['id'] = id
+        return self.api_send(self.data['answer_reply_cancel_vote'])
+
+
 
 
 

all_backend_api/hybrid_request.yaml

@@ -61,3 +61,25 @@ question_new_answer_list:
   isLogin: 1
 
 
+# 回答详情页评论点赞
+answer_reply_vote:
+  method: post
+  url: /hybrid/answer/answer_reply_vote/_data
+  params:
+  data:
+    id: ${id}
+  json: {}
+  isLogin: 1
+
+
+# 回答详情页评论取消点赞
+answer_reply_cancel_vote:
+  method: post
+  url: /hybrid/answer/answer_reply_cancel_vote/_data
+  params:
+  data:
+    id: ${id}
+  json: {}
+  isLogin: 1
+
+

all_backend_api/janus_request.py

@@ -212,6 +212,17 @@ class janus_request(BaseRequest):
 
         return self.api_send(self.data["service_hospital"])
 
+    # 首页（灰度）feed-推荐商品类型tab[除必要参数外其余参数使用默认参数形式方便之后调整]
+    def feed_service(self, tab_value, first_load, version = '7.42.2' , device_id = 'androidid_49973caa1b578d85', current_city_id = 'beijing'):
+        self.params['version'] = version
+        self.params['device_id'] = device_id
+        self.params['tab_value'] = tab_value
+        self.params['current_city_id'] = current_city_id
+        self.params['first_load'] = first_load
+
+        return self.api_send(self.data["feed_service"])
+
+
 if __name__ == '__main__':
     #打印购物车-猜你喜欢列表接口返回
     print(janus_request().mine_guess_you_like())

all_backend_api/janus_request.yaml

@@ -284,3 +284,18 @@ beauty_card_order_detail:
   data: {}
   json: {}
   isLogin: 1
+
+
+#首页（灰度）feed-推荐商品类型tab[除必要参数外其余参数使用默认参数形式方便之后调整]
+feed_service:
+  method: get
+  url:  /api/janus/product/mall/service_home_feed
+  params:
+    version:  ${version}
+    device_id: ${device_id}
+    current_city_id: ${current_city_id}
+    tab_value: ${tab_value}
+    first_load: ${first_load}
+  data: {}
+  json: {}
+  isLogin: 0
\ No newline at end of file

all_backend_api/service_request.py

@@ -15,6 +15,16 @@ class service_request(BaseRequest):
     def service_favor(self):
         return self.api_send(self.data["service_favor"])
 
+    # 首页（灰度）feed-推荐机构&推荐医生tab[除必要参数外其余参数使用默认参数形式方便之后调整]
+    def feed_home(self, tab_value, input_type, version = '7.42.2' , device_id = 'androidid_49973caa1b578d85', current_city_id = 'beijing'):
+        self.params['version'] = version
+        self.params['device_id'] = device_id
+        self.params['tab_value'] = tab_value
+        self.params['current_city_id'] = current_city_id
+        self.params['input_type'] = input_type
+        return self.api_send(self.data["feed_home"])
+
+
 
 if __name__ == '__main__':
     print(service_request().home_v5())

all_backend_api/service_request.yaml

@@ -16,3 +16,18 @@ service_favor:
   data: {}
   json: {}
   isLogin: 1
+
+
+#首页（灰度）feed-推荐机构&推荐医生tab[除必要参数外其余参数使用默认参数形式方便之后调整]
+feed_home:
+  method: get
+  url:   /api/service/home/feed
+  params:
+    version:  ${version}
+    device_id: ${device_id}
+    current_city_id: ${current_city_id}
+    tab_value: ${tab_value}
+    input_type: ${input_type}
+  data: {}
+  json: {}
+  isLogin: 0
\ No newline at end of file

path_setting.py

@@ -30,8 +30,6 @@ DIARY_ALBUM_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "hyb
 DIARY_ALBUM = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_data", "diary_album.yaml")
 
 
-
-
 # 日记本列表-日记贴点赞相关（）
 DIARY_VOTE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "hybrid_api_topic_request.yaml")
 DIARY_VOTE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_data", "api_topic_vote.yaml")
@@ -73,8 +71,6 @@ TOPIC_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/topic_data
 TOPIC_VOTE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/topic_data", "vote.yaml")
 
 
-
-
 # 帖子详情页内容--也是总的tractate接口的配置
 TRACTATE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "tractate_request.yaml")
 # 帖子详情页内容
@@ -105,6 +101,17 @@ QA_FAVOR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/qa_data", "fav
 # TEST_QA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/qa_data", "test.yaml")
 
 
+# 回答评论点赞&取消点赞
+QA_REPLY_VOTE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_data", "answer_answer_reply_vote.yaml")
+
+
+# 首页feed流tab切换--推荐商品类型tab[除必要参数外其余参数使用默认参数形式方便之后调整]
+FEED_TAB_SERVICE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "product_mall_service_home_feed.yaml")
+
+
+# 首页（灰度）feed-推荐机构&推荐医生tab[除必要参数外其余参数使用默认参数形式方便之后调整]
+FEED_TAB_SERVICE_DOCTORS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/service_data", "home_feed.yaml")
+
 
 #搜索首页-热门搜索
 KEYWORDS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
@@ -136,9 +143,6 @@ TAG_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "tag_
 #医生后台 - 发布商品选择类目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")
-KEYWORDS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "keywords.yaml")
 
 #医生后台-保存新增商品
 REGISTER_URL=os.path.join(BASE_DIR, "backend_auto/all_doctor_api", "glmer_request.yaml")

test_backend_case/common_case/test_reply.py

@@ -13,12 +13,12 @@ class TestReply:
     @pytest.mark.parametrize("param", diary_common_reply_data, ids=diary_common_reply_case)
     def test_reply(self, param):
         # 日记贴的评论列表
-        r = common_request().diary_common_reply(param["id"], param["type"])
+        r = common_request().diary_common_reply(param["id"], param["com_type"])
         # print(r)
         if r["error"] == 0:
             assert r["error"] == param["assert1"]
             # 先判断有没有评论，然后判断里面需要的那些字段，如点赞字段，评论总数等，不传值，传空值
-            if r["data"]["reply_data"]:
+            if r["data"]["reply_data"] and (param["assert1"] == 2):
                 assert r["data"]["reply_data"][0]["user_id"] is not None and r["data"]["reply_data"][0]["user_id"] is not ""  # 用户id
                 assert r["data"]["reply_data"][0]["user_portrait"] is not None and r["data"]["reply_data"][0]["user_portrait"] is not ""  # 用户头像
                 assert r["data"]["reply_data"][0]["gm_url"] is not None and r["data"]["reply_data"][0]["gm_url"] is not ""  # 头像跳转链接

test_backend_case/common_case/test_reply_sub_reply.py

@@ -13,7 +13,7 @@ class TestRrplySubReply:
     @pytest.mark.parametrize("param", topic_sub_common_data, ids=topic_sub_common_case)
     def test_reply_sub_reply(self, param):
         # print(2)
-        r = common_request().topic_sub_common(param["id"], param["type"], param["reply_id"])
+        r = common_request().topic_sub_common(param["id"], param["com_type"], param["reply_id"])
         # print(r)
         if r["error"] == 0:
             assert r["error"] == param["assert1"]
@@ -26,7 +26,7 @@ class TestRrplySubReply:
                 assert r["data"][0]["content"] is not None and r["data"][0]["content"] is not ""  # 评论内容
                 assert r["data"][0]["comment_user_id"] is not None and r["data"][0]["comment_user_id"] is not ""  # 评论人
                 assert r["data"][0]["comment_id"] is not None and r["data"][0]["comment_id"] is not ""  # 评论id
-                assert r["data"]["reply_data"][0]["_type"] == param["type"]  # 校验评论列表返回类型
+                # assert r["data"]["reply_data"][0]["_type"] == param["type"]  # 校验评论列表返回类型
 
 
 

test_backend_case/hybrid_case/test_answer_answer_reply_vote.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.hybrid_request import hybrid_request
+
+
+class TestAnswerAnswerReplyVote:
+    data = BaseRequest().api_load(path_setting.QA_REPLY_VOTE)
+    test_case, test_data = get_ids(data, "answer_reply_vote")
+
+    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    def test_answer_answer_reply_vote(self, param):
+        # 直接点赞，看是否能点赞，如果返回1，就直接进入取消点赞
+        vote = hybrid_request().answer_reply_vote(param["id"])
+        if vote["error"] == 0:
+            print(1)
+            # 校验二次点赞无效
+            vote = hybrid_request().answer_reply_vote(param["id"])
+            assert vote["message"] == param["assert3"]
+            assert vote["error"] == 1
+            # 取消点赞，回到取消点赞的状态
+            cancelvote = hybrid_request().answer_reply_cancel_vote(param["id"])
+            assert cancelvote["error"] == 0
+            print(2)
+        else:
+            assert vote["error"] == 1
+            assert vote["message"] == param["assert3"]
+            # 取消点赞，回到取消点赞的状态
+            cancelvote = hybrid_request().answer_reply_cancel_vote(param["id"])
+            assert cancelvote["error"] == 0
+            print(2)
+
+
+
+
+
+
+

test_backend_case/hybrid_case/test_api_topic_vote.py

@@ -29,13 +29,13 @@ class TestDiaryVote:
                 assert vote["message"] == param["assert3"]
                 assert vote["error"] == 1
                 # 取消点赞，回到取消点赞的状态
-                canclevote = hybrid_api_topic_request().diary_canclevote(param["id"])
-                assert canclevote["error"] == 0
+                cancelvote = hybrid_api_topic_request().diary_cancelvote(param["id"])
+                assert cancelvote["error"] == 0
             else:
                 # 如果是已经点过赞的状态就直接取消点赞
                 # print(111)
-                canclevote = hybrid_api_topic_request().diary_canclevote(param["id"])
-                assert canclevote["error"] == 0
+                cancelvote = hybrid_api_topic_request().diary_cancelvote(param["id"])
+                assert cancelvote["error"] == 0
 
 
 

test_backend_case/janus_case/test_product_mall_service_home_feed.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.janus_request import janus_request
+
+
+class TestProductMallServiceHomeFeed:
+    data = BaseRequest().api_load(path_setting.FEED_TAB_SERVICE)
+    test_case, test_data = get_ids(data, "feed_service")
+
+    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    def test_product_mall_service_home_feed(self,param):
+        r = janus_request().feed_service(param["tab_value"], param["first_load"])
+        assert r["error"] == 0
+        if r["error"] == 0:
+            features = r.get("data").get("result",[])
+            print(len(features))
+            assert len(features) > param["assert"]
+
+

test_backend_case/service_case/test_home_feed.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.service_request import service_request
+
+
+class TestProductMallServiceHomeFeed:
+    data = BaseRequest().api_load(path_setting.FEED_TAB_SERVICE_DOCTORS)
+    test_case, test_data = get_ids(data, "home_feed")
+
+    @pytest.mark.parametrize("param", test_data, ids=test_case)
+    def test_product_mall_service_home_feed(self,param):
+        r = service_request().feed_home(param["tab_value"], param["input_type"])
+        assert r["error"] == 0
+        if r["error"] == 0:
+            s = param["tab_value"] + "s"
+            features = r["data"][s]
+            assert len(features) > param["assert"]
+
+

test_backend_case/topic_case/test_topic_reply_create.py

 import time
 import yaml
 import pytest
+import os
+import sys
 
 from ids_list import get_ids
 import path_setting
@@ -33,8 +35,26 @@ class TestTopicReplyCreate:
 
 
         # 运行完用例后修改topic_reply_create.yaml文件里的content内容避免下一次重复,工作路径是backend_auto，用的是相对路径
-        a_path = "test_backend_data/topic_data/topic_reply_create.yaml"
-        with open(a_path, "r", encoding="utf-8") as f:
+        project_path2 = os.getcwd()
+        dd1 = os.path.split(project_path2)
+        dd = os.path.split(project_path2)[1]
+        if dd == "backend_auto":
+            path_test = dd1[0] + "/backend_auto/test_backend_data/topic_data/topic_reply_create.yaml"
+        elif dd == "test_backend_case":
+            path_test = dd1[0] + "/test_backend_data/topic_data/topic_reply_create.yaml"
+        elif dd == "topic_case":
+            path_test = os.path.split(dd1[0])[0] + "/test_backend_data/topic_data/topic_reply_create.yaml"
+        else:
+            i = 0
+            while dd != "backend_auto":
+                dd1 =os.path.split(dd1[0])[0]
+                dd = os.path.split(dd1)[1]
+                i = i + 1
+                if i > 6:
+                    break
+            path_test = dd1 + "/test_backend_data/topic_data/topic_reply_create.yaml"
+
+        with open(path_test, "r", encoding="utf-8") as f:
             res = yaml.load(f, Loader=yaml.FullLoader)
             a_content = res["reply_create"][0]["content"]
             a_new_content = "ces测试+" + str(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())))
@@ -42,7 +62,7 @@ class TestTopicReplyCreate:
             for k in res["reply_create"][0]:
                 if k == "content":
                     res["reply_create"][0][k] = a_new_content
-        with open(a_path, "w", encoding="utf-8") as f:
+        with open(path_test, "w", encoding="utf-8") as f:
             yaml.dump(res, f, encoding='utf-8', allow_unicode=True)
-        #
-        #
+
+

test_backend_case/topic_case/test_topic_reply_vote.py

@@ -6,6 +6,8 @@ from in_common.base_request import BaseRequest
 from all_backend_api.topicreply_vote_request import topicreply_vote_request
 
 
+
+
 class TestTopicReplyVote:
     data = BaseRequest().api_load(path_setting.TOPIC_REPLY_VOTE)
     topic_reply_vote_case, topic_reply_vote_data = get_ids(data, "topic_reply_vote")
@@ -17,8 +19,8 @@ class TestTopicReplyVote:
         if r["error"] == 1:
             assert r["message"] == param["assert3"]
             # 回到取消点赞状态
-            canclevote = topicreply_vote_request().topic_reply_cancelvote(param["id"])
-            assert canclevote["error"] == 0
+            cancelvote = topicreply_vote_request().topic_reply_cancelvote(param["id"])
+            assert cancelvote["error"] == 0
             # 校验点赞
             vote = topicreply_vote_request().topic_reply_vote(param["id"])
             assert vote["error"] == 0

test_backend_data/common_data/reply.yaml

@@ -3,13 +3,13 @@ common_reply:
   -
     case: "日记本列表评论列表--校验"
     id: 21250007
-    type: 2
+    com_type: 2
     assert1:  0
     type: "TOPIC"
   -
     case: "帖子列表评论列表--校验"
     id: 82208
-    type: 4
+    com_type: 4
     assert1:  0
     type: "TRACTATE"
 

test_backend_data/common_data/sub_common.yaml

@@ -3,7 +3,7 @@ topic_sub_common:
   -
     case: "日记贴二级评论列表--展示--用户信息校验"
     id: 21249632
-    type: 2
+    com_type: 2
     reply_id: 35526987
     assert1:  0
     assert2: "请登录后再试"
@@ -14,7 +14,7 @@ topic_sub_common:
   -
     case: "贴子二级评论列表--展示--用户信息校验"
     id: 2087079
-    type: 4
+    com_type: 4
     reply_id: 2087079
     assert1:  0
     assert2: "请登录后再试"

test_backend_data/feed_data/index_v9.yaml

@@ -6,3 +6,15 @@ index_v9:
     tabtype: "choice"
     version: "7.42.2"
     assert: 0
+
+  - case: "推荐内容/接口请求成功，有数据返回"
+    current_city_id: "beijing"
+    tabtype: "home_video"
+    version: "7.42.2"
+    assert: 0
+
+  - case: "直播tab接口请求成功，有数据返回"
+    current_city_id: "beijing"
+    tabtype: "customize_commodity"
+    version: "7.42.2"
+    assert: 0
\ No newline at end of file

test_backend_data/hybrid_data/answer_answer_reply_vote.yaml

+answer_reply_vote:
+  #点赞case--评论点赞
+  -
+    case: "回答评论点赞--点赞&取消点赞成功case--校验"
+    id: 5477513
+    assert1:  0
+    assert2: "请登录后再试"
+    assert3: "操作不允许"
+
+  -
+    case: "回答评论点赞--点赞&取消点赞成功case--校验"
+    id: 5477513
+    assert1:  0
+    assert2: "请登录后再试"
+    assert3: "操作不允许"

test_backend_data/janus_data/product_mall_service_home_feed.yaml

+feed_service:
+  #成功登录case
+  -
+    case: "请求成功，有数据返回"
+    current_city_id: "beijing"
+    tab_value: "choice"
+    version: "7.42.2"
+    first_load: 1
+    assert: 0
+
+  - case: "推荐内容/接口请求成功，有数据返回"
+    current_city_id: "beijing"
+    tab_value: "home_video"
+    version: "7.42.2"
+    first_load: 1
+    assert: 0
+
+  - case: "直播tab接口请求成功，有数据返回"
+    current_city_id: "beijing"
+    tab_value: "customize_commodity"
+    first_load: 1
+    version: "7.42.2"
+    assert: 0
\ No newline at end of file

test_backend_data/service_data/home_feed.yaml

+home_feed:
+  #成功登录case
+  -
+    case: "推荐医生.接口请求成功，有数据返回"
+    current_city_id: "beijing"
+    tab_value: "doctor"
+    version: "7.42.2"
+    input_type: 3
+    assert: 0
+
+  - case: "推荐医院，接口请求成功，有数据返回"
+    current_city_id: "beijing"
+    tab_value: "hospital"
+    version: "7.42.2"
+    input_type: 3
+    assert: 0
+

test_backend_data/topic_data/topic_reply_create.yaml

 reply_create:
 - assert1: null
+  beuzhu: '# 备注： 这个文件有冲突的话，那个版本都行不会影响，回退/接受当前版本都行，因为每次运行content都会改变'
   case: 日记贴一级评论创建--正常校验&创建二级评论--正常校验
   channel: benzhan
-  content: ces测试+2021-06-18 16:41:48
+  content: ces测试+2021-06-23 11:41:50
   message: 请勿回复重复内容
   message1: 回复成功
   message2: 你的回复有点频繁，稍后再来