Merge branch 'master' into feature/20210805-xmc

src/test/java/com/kjj/cases/assistant/card/PersonCard.java

@@ -747,7 +747,7 @@ public class PersonCard implements Authorization {
         Response response = network.getResponse(params, SELLERCARD_getQuestions);
         boolean success = response.jsonPath().getBoolean("success");
         Object data = response.jsonPath().getJsonObject("data");
-        questionId = response.jsonPath().getJsonObject("data.questionList.get(0).id");
+        questionId = response.jsonPath().getString("data.questionList.get(0).id");
         Assert.assertTrue(success,network.message(params, SELLERCARD_getQuestions,"接口返回失败",response.body().asString()));
         Assert.assertNotNull(data,network.message(params, SELLERCARD_getQuestions,"配置为空",response.body().asString()));
     }

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

@@ -623,6 +623,7 @@ public class BasicConfig {
     public static final String QRCODE_create=  HOST + "/kjy/mp/qrcode/create";
     public static final String UPLOAD_image=  HOST + "/kjy/mp/upload/image";
     public static final String DYNAMIC_addVisit=  HOST + "/kjy/mp/seller/dynamic/addVisit";
+    public static final String ROOKIEGUIDE_homeGuide=  HOST + "/kjy/mp/rookieGuide/homeGuide";
 
     // ***************   支付  ***************
     public static final String PAY_getMiddleDetail = HOST + "/kjy/mp/payMiddle/getMiddleDetail";
@@ -986,5 +987,11 @@ public class BasicConfig {
     public static final String MANAGER_addExclusiveArea = MANAGER_HOST +  "/kjy/manager/exclusiveArea/add";
     public static final String MANAGER_searchTemplateList = MANAGER_HOST + "/kjy/manager/game/searchTemplateList";
     public static final String MANAGER_getTemplateDetail = MANAGER_HOST + "/kjy/manager/game/getTemplateDetail";
+    public static final String MANAGER_vipList = MANAGER_HOST + "/kjy/manager/seller/vipList";
+    public static final String MANAGER_disableUser = MANAGER_HOST + "/kjy/manager/testUser/disableUser";
+    public static final String MANAGER_updateTypeOrDate = MANAGER_HOST + "/kjy/manager/seller/updateTypeOrDate";
+    public static final String MANAGER_oamsg = HOST + "/kjy/notify/oamsg";
+    public static final String MANAGER_encryptTku = MANAGER_HOST + "/kjy/manager/testUser/encryptTku";
+    public static final String MANAGER_changeCompany = MANAGER_HOST + "/kjy/manager/seller/changeCompany";
     public static final String MANAGER_feedBackList = MANAGER_HOST + "/kjy/manager/feedback/list";
 }

src/test/java/com/kjj/utils/BaseUtils.java

@@ -44,6 +44,4 @@ public class BaseUtils {
         network.agentCookies.put("sso_ticket", "autotest");
 
     }
-
-
 }

src/test/java/com/kjj/utils/NetworkUtils.java

@@ -115,6 +115,19 @@ public class NetworkUtils {
         return response;
     }
 
+    // post xml请求方式
+    public Response postXMLResponse(String str, String path) {
+        Response response = given()
+                .cookies(agentCookies)
+                .headers(agentHeaders)
+                .body(str)
+                .post(path);
+        if (!Objects.equals(response.statusCode(),200)){
+            System.out.println("请求状态码错误，path=【"+path+"】 code=【"+response.statusCode()+"】");
+        }
+        return response;
+    }
+
     // 管理后台
     public Response getManagerCookies(String path){
         Response response = given().

src/test/wechatTestNG.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="集客助手" verbose="1" thread-count="3">
-
+    <test preserve-order="true" name = "新手引导">
+        <classes>
+            <class name="com.kjj.cases.assistant.menu.NoviceGuidance"/>
+        </classes>
+    </test>
     <test preserve-order="true" name="支付">
         <classes>
             <class name="com.kjj.cases.assistant.pay.Pay"/>