Merge remote-tracking branch 'origin/test/20200628-test' into test/20200628-test

# Conflicts:
#	src/test/java/com/kjj/qa/config/BasicConfig.java

src/test/java/com/kjj/qa/cases/Boss.java

@@ -28,7 +28,7 @@ public class Boss {
     public void setUp() {
 
     }
-
+    //BOSS看板正式版
     //判断代理人的会员及版本
     @Test(description="会员及版本判断",priority = 1)
     public void 会员及版本判断() throws IOException{
@@ -102,6 +102,13 @@ public class Boss {
         Response response = network.getResponse(params,BOSS_BOUND);
         boolean data = response.jsonPath().getBoolean("data");  //1 true:邀请成功；2 false:邀请失败
         Assert.assertTrue(data, network.message(params,BOSS_BOUND,"接受邀请失败"));
+
+    //获取被邀请人上级昵称
+        Map<String, Object> inviteparams = new HashMap<String, Object>();
+        params.put("sellerId",usellerId);
+        Response responses = network.getResponse(inviteparams,BOSS_BOSS);
+        String datae = responses.jsonPath().getString("data");
+        Assert.assertEquals(datae,"$张",network.message(params,BOSS_BOSS,"昵称不匹配"));
     }
 
 
@@ -184,4 +191,7 @@ public class Boss {
         apiCount += 8;
     }
 
+
 }
+
+

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

@@ -23,8 +23,8 @@ public class BasicConfig {
     public static final String HOST = "https://kjj.m.duibatest.com.cn"; //  "https://kjj.m.duiba.com.cn";
 
     // *************** TKU ***************
-    public static final String VISITOR_TKU = "T3gM31f18jAW2hicRDxbwHFSuwA4MMVLLeHZ5G4yvb3kN3PcWwcLdzfxPp2gghfE4x3BFH8JN3f8PUzQ6W";
-
+    public static final String VISITOR_TKU = "T3gM31f18jAW31GHJuxJmoCFoANch7fXayUgd4zHHg2hpXAyjSrevfGfzyNfVoHzSvenik8qR9nTEkCSy6";
+//    public static final String VISITOR_TKU = "T3gM31f18jAW2hicRDxbwHFSuwA4MMVLLeHZ5G4yvb3kN3PcWwcLdzfxPp2gghfE4x3BFH8JN3f8PUzQ6W";
     // ***************  素材ID  ***************
     public static final String ARTICLE_CONTENTID = "Kj21NjM4NDc";
 
@@ -191,7 +191,7 @@ public class BasicConfig {
 
 
     // **************  BOSS看板  ***************
-    public static final String BOSS_INFO = "/kjy/mp/version/info";
+    public static final String BOSS_VERSIONINFO = "/kjy/mp/version/info";
 
     public static final String BOSS_ROLE = "/kjy/mp/seller/team/member/role";
 
@@ -205,6 +205,10 @@ public class BasicConfig {
 
     public static final String BOSS_REMOVE = "/kjy/mp/seller/team/member/remove";
 
+    public static final String BOSS_USERINFO = "/kjy/mp/user/info";
+
+
+
 
 
 }