Merge branch 'master' into feature/20210903-xmc

src/test/java/com/kjj/cases/live/agent/Potential.java

@@ -94,19 +94,9 @@ public class Potential  implements Authorization {
         System.out.println(response.body().asString());
         boolean data=response.jsonPath().getBoolean("data");
         Assert.assertTrue(data, network.message(Params, BasicConfig.ANCHOR_agreeStatus, "客跟进机会同意状态为false", response.body().asString()));
-
-    }
-
-    @Test(description = "获取对话模版oss地址", priority =7)
-    public void 获取对话模版oss地址() {
-        Response response = network.getResponse(BasicConfig.ANCHOR_ossDialogue);
-        System.out.println(response.body().asString());
-        boolean data=response.jsonPath().getBoolean("data");
-        Assert.assertNotNull(data, network.message(BasicConfig.ANCHOR_ossDialogue, "未获取到对话模版oss地址", response.body().asString()));
-
     }
 
-    @Test(description = "二度用户获取话术模板", priority =8)
+    @Test(description = "二度用户获取话术模板", priority =7)
     public void 二度用户获取话术模板() {
         visitorAuth5();
         Map<String, Object> Params = new HashMap<>();

src/test/java/com/kjj/cases/live/liveConfig/SaveLive.java

@@ -2327,7 +2327,7 @@ public class SaveLive implements Authorization {
     /**
      * 亲友抽奖券配置
      */
-    @Test(description = "保存亲友抽奖券配置", priority = 128)
+    @Test(description = "保存亲友抽奖券配置", priority = 124)
     public void 保存亲友抽奖券配置(){
         ssoLogin();
         Map<String, Object> Params = new HashMap<>();
@@ -2345,7 +2345,7 @@ public class SaveLive implements Authorization {
         Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_relativeLottery, "保存亲友券配置失败", response.body().asString()));
     }
 
-    @Test(description = "查看亲友抽奖券配置详情", priority = 129)
+    @Test(description = "查看亲友抽奖券配置详情", priority = 125)
     public void 查看亲友抽奖券配置详情() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
@@ -2360,7 +2360,7 @@ public class SaveLive implements Authorization {
         Assert.assertEquals(lotteryNum,3, network.message(Params, BasicConfig.MANAGER_detailLottery, "亲友抽奖券数量错误", response.body().asString()));
     }
 
-    @Test(description = "开启亲友抽奖券配置", priority = 130)
+    @Test(description = "开启亲友抽奖券配置", priority = 126)
     public void 开启亲友抽奖券配置() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
@@ -2371,7 +2371,7 @@ public class SaveLive implements Authorization {
         Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_switchStatusLottery, "开启亲友券配置失败", response.body().asString()));
     }
 
-    @Test(description = "查询亲友抽奖券配置状态", priority = 131)
+    @Test(description = "查询亲友抽奖券配置状态", priority = 127)
     public void 查询亲友抽奖券配置状态() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
@@ -2388,7 +2388,7 @@ public class SaveLive implements Authorization {
     /**
      *  准客户承诺话术配置
      */
-    @Test(description = "保存客户承诺话术配置", priority = 132)
+    @Test(description = "保存客户承诺话术配置", priority = 128)
     public void 保存客户承诺话术配置(){
         ssoLogin();
         Map<String, Object> Params = new HashMap<>();
@@ -2404,7 +2404,7 @@ public class SaveLive implements Authorization {
         Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_saveDialogue, "保存客户承诺话术配置失败", response.body().asString()));
     }
 
-    @Test(description = "查看客户承诺话术配置", priority = 133)
+    @Test(description = "查看客户承诺话术配置", priority = 129)
     public void 查看客户承诺话术配置() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));

src/test/java/com/kjj/config/BasicConfig.java

@@ -108,7 +108,6 @@ public class BasicConfig {
     public static final String ANCHOR_agree = MOBILE_HOST + "/kjy/live/agent/potential/agree";
     public static final String ANCHOR_questionSubmitted = MOBILE_HOST + "/kjy/live/agent/potential/questionSubmitted";
     public static final String ANCHOR_agreeStatus = MOBILE_HOST + "/kjy/live/agent/potential/agreeStatus";
-    public static final String ANCHOR_ossDialogue = MOBILE_HOST + "/kjy/live/agent/potential/ossDialogue";
 
     // ***************  预告页配置  ***************
     public static final String MANAGER_preViewWelfareList = MANAGER_HOST + "/kjy/manager/preView/conf/welfareList";

src/test/wechatTestNG.xml

@@ -11,6 +11,11 @@
             <class name="com.kjj.cases.assistant.pay.Pay"/>
         </classes>
     </test>
+    <test preserve-order="true" name="签到领红包">
+        <classes>
+            <class name="com.kjj.cases.assistant.homePage.SignRed"/>
+        </classes>
+    </test>
     <test preserve-order="true" name="邀请返现">
         <classes>
             <class name="com.kjj.cases.assistant.pay.Cashback"/>