diff --git a/YiMao/data/YongHui.yaml b/YiMao/data/YongHui.yaml index 8a01720..7d218cd 100644 --- a/YiMao/data/YongHui.yaml +++ b/YiMao/data/YongHui.yaml @@ -38,19 +38,19 @@ SaleGoods: # 8-促销白名单商品 PromotionalWhitelistGoods: GoodsInputcode: 6954865921564 - GoodsName: + GoodsName: 优颂一次性纸浆碗500mL # 9-重量放通白名单商品 WeightToWhitelistGoods: GoodsInputcode: 230148601000020005 - GoodsName: + GoodsName: 香菇(折价) # 10-散称计重商品 MisspellingWeightGoods: GoodsInputcode: 2327912000002 - GoodsName: + GoodsName: 手剥山核桃手抓包 # 11-计件商品 PieceRateGoods: GoodsInputcode: 231172900650010005 - GoodsName: + GoodsName: 当前伪散称商品条码售价与系统单价不一致，请检查条码价格是否正确！ diff --git a/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py index f2d116d..9c1bf82 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py @@ -21,23 +21,25 @@ class Test_CAnon017(unittest.TestCase): allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) bulk_goods = data["MisspellingWeightGoods"]["GoodsInputcode"] - - allure.step("步骤1：session开始") - ymc.session_start() - allure.step("步骤2：匿名登录") - Payload01 = {"action": 0, "isAnon": True} - LoginData = ymc.login_app_v2(Payload01) - allure.step("步骤3：获取商品信息") - GetGoodsInfoResp_01 = ymc.get_goods_info(bulk_goods) - if GetGoodsInfoResp_01['msg'] != '加购商品不存在': - allure.step("步骤4：添加会员有优惠商品") - ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) - allure.step("步骤5：获取购物车商品信息") - ymc.get_cart_goods_info([GetGoodsInfoResp_01]) - allure.step("步骤6：请求订单结算") - ymc.request_order_settlement(LoginData) + if bulk_goods is not None: + allure.step("步骤1：session开始") + ymc.session_start() + allure.step("步骤2：匿名登录") + Payload01 = {"action": 0, "isAnon": True} + LoginData = ymc.login_app_v2(Payload01) + allure.step("步骤3：获取商品信息") + GetGoodsInfoResp_01 = ymc.get_goods_info(bulk_goods) + if GetGoodsInfoResp_01['msg'] != '加购商品不存在': + allure.step("步骤4：添加会员有优惠商品") + ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) + allure.step("步骤5：获取购物车商品信息") + ymc.get_cart_goods_info([GetGoodsInfoResp_01]) + allure.step("步骤6：请求订单结算") + ymc.request_order_settlement(LoginData) + else: + pytest.fail(f"---商品 {data["MisspellingWeightGoods"]} 不存在") else: - pytest.fail(f"---商品 {data["MisspellingWeightGoods"]} 不存在") + pytest.skip(f"---{data['MarketName']} 计重商品未提供，跳过该场景测试") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py b/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py index cff526e..439aa1b 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py @@ -22,30 +22,31 @@ class Test_CAnon018(unittest.TestCase): allure.dynamic.description(f"描述：{data['MarketName']}-{DescName}\n") ymc = YMClientApi(data["ShoppingCartMac"]) bulk_goods = data["MisspellingWeightGoods"]["GoodsInputcode"] + if bulk_goods is not None: + allure.step("步骤1：session开始") + ymc.session_start() + allure.step("步骤2：匿名登录") + Payload01 = {"action": 0, "isAnon": True} + LoginData = ymc.login_app_v2(Payload01) + allure.step("步骤3：获取商品信息") + GetGoodsInfoResp_01 = ymc.get_goods_info(bulk_goods) + if GetGoodsInfoResp_01['msg'] != '加购商品不存在': + allure.step("步骤4：添加会员有优惠商品") + AddGoodsResp = ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) - allure.step("步骤1：session开始") - ymc.session_start() - allure.step("步骤2：匿名登录") - Payload01 = {"action": 0, "isAnon": True} - LoginData = ymc.login_app_v2(Payload01) - allure.step("步骤3：获取商品信息") - GetGoodsInfoResp_01 = ymc.get_goods_info(bulk_goods) - if GetGoodsInfoResp_01['msg'] != '加购商品不存在': - allure.step("步骤4：添加会员有优惠商品") - AddGoodsResp = ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) + allure.step("\n步骤5：退购一件商品") + GetGoodsInfoList = [GetGoodsInfoResp_01] + AddGoodsResp_List = [AddGoodsResp] + ymc.delete_cart_goods(GetGoodsInfoList, LoginData, AddGoodsResp_List) - allure.step("\n步骤5：退购一件商品") - GetGoodsInfoList = [GetGoodsInfoResp_01] - AddGoodsResp_List = [AddGoodsResp] - ymc.delete_cart_goods(GetGoodsInfoList, LoginData, AddGoodsResp_List) - - allure.step("步骤6：获取购物车商品信息") - ymc.get_cart_goods_info([GetGoodsInfoResp_01]) - allure.step("步骤7：请求订单结算") - ymc.request_order_settlement(LoginData) + allure.step("步骤6：获取购物车商品信息") + ymc.get_cart_goods_info([GetGoodsInfoResp_01]) + allure.step("步骤7：请求订单结算") + ymc.request_order_settlement(LoginData) + else: + pytest.fail(f"---商品 {data["MisspellingWeightGoods"]} 不存在") else: - LOGGER.info(f"---商品 {data["MisspellingWeightGoods"]} 不存在") - pytest.fail(f"---商品 {data["MisspellingWeightGoods"]} 不存在") + pytest.skip(f"---{data['MarketName']} 计重商品未提供，跳过该场景测试") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py b/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py index fbd7d94..ec90617 100644 --- a/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py +++ b/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py @@ -32,7 +32,6 @@ class Test_CNoLogin001(unittest.TestCase): for adId in adIdList: ymc.query_ad_detail(str(adId)) else: - LOGGER.info(f"---该商超未配置广告---\n") pytest.fail(f"---该商超未配置广告---\n") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py b/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py index 1f2ae5d..18b5cc0 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py +++ b/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py @@ -23,28 +23,30 @@ class Test_CVip017(unittest.TestCase): ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] bulk_goods = data["MisspellingWeightGoods"]["GoodsInputcode"] + if bulk_goods is not None: + allure.step("步骤1：session开始") + ymc.session_start() + allure.step("步骤2：匿名登录") + Payload01 = {"action": 0, "isAnon": True} + LoginData = ymc.login_app_v2(Payload01) - allure.step("步骤1：session开始") - ymc.session_start() - allure.step("步骤2：匿名登录") - Payload01 = {"action": 0, "isAnon": True} - LoginData = ymc.login_app_v2(Payload01) + allure.step("步骤3：切换会员登录") + Payload02 = {"action": 1, "code": vip_phone_num, "isAnon": False} + ymc.login_app_v2(Payload02) - allure.step("步骤3：切换会员登录") - Payload02 = {"action": 1, "code": vip_phone_num, "isAnon": False} - ymc.login_app_v2(Payload02) - - allure.step("步骤3：获取商品信息") - GetGoodsInfoResp_01 = ymc.get_goods_info(bulk_goods) - if GetGoodsInfoResp_01['msg'] != '加购商品不存在': - allure.step("步骤4：添加会员有优惠商品") - ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) - allure.step("步骤5：获取购物车商品信息") - ymc.get_cart_goods_info([GetGoodsInfoResp_01]) - allure.step("步骤6：请求订单结算") - ymc.request_order_settlement(LoginData) + allure.step("步骤3：获取商品信息") + GetGoodsInfoResp_01 = ymc.get_goods_info(bulk_goods) + if GetGoodsInfoResp_01['msg'] != '加购商品不存在': + allure.step("步骤4：添加会员有优惠商品") + ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) + allure.step("步骤5：获取购物车商品信息") + ymc.get_cart_goods_info([GetGoodsInfoResp_01]) + allure.step("步骤6：请求订单结算") + ymc.request_order_settlement(LoginData) + else: + pytest.fail(f"---商品 {bulk_goods} 不存在") else: - pytest.fail(f"---商品 {bulk_goods} 不存在") + pytest.skip(f"---{data['MarketName']} 计重商品未提供，跳过该场景测试") if __name__ == '__main__': diff --git a/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py b/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py index 56a47a8..cefb5dc 100644 --- a/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py +++ b/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py @@ -23,33 +23,35 @@ class Test_CVip018(unittest.TestCase): ymc = YMClientApi(data["ShoppingCartMac"]) vip_phone_num = data["VIPPhoneNumber"] bulk_goods = data["MisspellingWeightGoods"]["GoodsInputcode"] + if bulk_goods is not None: + allure.step("步骤1：session开始") + ymc.session_start() + allure.step("步骤2：匿名登录") + Payload01 = {"action": 0, "isAnon": True} + LoginData = ymc.login_app_v2(Payload01) - allure.step("步骤1：session开始") - ymc.session_start() - allure.step("步骤2：匿名登录") - Payload01 = {"action": 0, "isAnon": True} - LoginData = ymc.login_app_v2(Payload01) + allure.step("步骤3：切换会员登录") + Payload02 = {"action": 1, "code": vip_phone_num, "isAnon": False} + ymc.login_app_v2(Payload02) - allure.step("步骤3：切换会员登录") - Payload02 = {"action": 1, "code": vip_phone_num, "isAnon": False} - ymc.login_app_v2(Payload02) + allure.step("步骤3：获取商品信息") + GetGoodsInfoResp_01 = ymc.get_goods_info(bulk_goods) + if GetGoodsInfoResp_01['msg'] != '加购商品不存在': + allure.step("步骤4：添加会员有优惠商品") + AddGoodsResp = ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) - allure.step("步骤3：获取商品信息") - GetGoodsInfoResp_01 = ymc.get_goods_info(bulk_goods) - if GetGoodsInfoResp_01['msg'] != '加购商品不存在': - allure.step("步骤4：添加会员有优惠商品") - AddGoodsResp = ymc.add_cart_goods(GetGoodsInfoResp_01, 1, LoginData) + allure.step("\n步骤5：退购一件商品") + GetGoodsInfoList = [GetGoodsInfoResp_01] + ymc.delete_cart_goods(GetGoodsInfoList, LoginData, [AddGoodsResp]) - allure.step("\n步骤5：退购一件商品") - GetGoodsInfoList = [GetGoodsInfoResp_01] - ymc.delete_cart_goods(GetGoodsInfoList, LoginData, [AddGoodsResp]) - - allure.step("步骤6：获取购物车商品信息") - ymc.get_cart_goods_info([GetGoodsInfoResp_01]) - allure.step("步骤7：请求订单结算") - ymc.request_order_settlement(LoginData) + allure.step("步骤6：获取购物车商品信息") + ymc.get_cart_goods_info([GetGoodsInfoResp_01]) + allure.step("步骤7：请求订单结算") + ymc.request_order_settlement(LoginData) + else: + pytest.fail(f"---商品 {bulk_goods} 不存在") else: - pytest.fail(f"---商品 {bulk_goods} 不存在") + pytest.skip(f"---{data['MarketName']} 计重商品未提供，跳过该场景测试") if __name__ == '__main__': diff --git a/configs/Configs.yaml b/configs/Configs.yaml index 0211375..9e17b92 100644 --- a/configs/Configs.yaml +++ b/configs/Configs.yaml @@ -12,4 +12,4 @@ ReportsURL: http://192.168.1.165 # 4-联测测试的商超列表: WuShang\ZhongBai\YongHui\JiajiaYue MarketsArray: - - WuShang \ No newline at end of file + - ZhongBai \ No newline at end of file