Merge remote-tracking branch 'origin/master' into test/20200623-test

# Conflicts:
#	src/test/java/com/kjj/qa/config/BasicConfig.java
#	target/test-classes/com/kjj/qa/cases/SellerCard.class
#	target/test-classes/com/kjj/qa/cases/Upload.class
#	target/test-classes/com/kjj/qa/utils/NetworkUtil.class
#	test-output/report.html

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

@@ -143,12 +143,15 @@ public class CircleFriends {
         String currentId = response.jsonPath().getString("data.materialVos[0].contentId");
         Assert.assertNotNull(currentId,network.message(HOME_GETHOMETIMELINECONTENT,"获取首页发圈列表有误"));
 
-        // 进入发圈
-        Map<String, Object> params = new HashMap<String, Object>();
-        params.put("currentId",currentId);
-        response = network.getResponse(params,FRIENDS_GETCURRENTINFO);
-        String topContentId = response.jsonPath().getString("data.contentId");
-        Assert.assertEquals(topContentId,currentId,network.message(params,FRIENDS_GETCURRENTINFO,"从首页进入发圈的头部素材有误"));
+        // 如果有推荐列表,进入发圈
+        if (currentId.length() > 0){
+            Map<String, Object> params = new HashMap<String, Object>();
+            params.put("currentId",currentId);
+            response = network.getResponse(params,FRIENDS_GETCURRENTINFO);
+            String topContentId = response.jsonPath().getString("data.contentId");
+            Assert.assertEquals(topContentId,currentId,network.message(params,FRIENDS_GETCURRENTINFO,"从首页进入发圈的头部素材有误"));
+        }
+
     }
 
     @AfterClass

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

@@ -14,9 +14,9 @@ public class BasicConfig {
 
     // *************** 钉钉机器人 ***************
     // 线上-告警群
-//  public static final String DINGTALKPATH = "https://oapi.dingtalk.com/robot/send?access_token=f63c9cb36e89dd68e9af82d926933b3afc6544e57b23a3a55ed5b3b772d5e8d2";
+    public static final String DINGTALKPATH = "https://oapi.dingtalk.com/robot/send?access_token=f63c9cb36e89dd68e9af82d926933b3afc6544e57b23a3a55ed5b3b772d5e8d2";
     // 测试
-    public static final String DINGTALKPATH = "https://oapi.dingtalk.com/robot/send?access_token=e4b7d997fb9f90b17672dcdb9c9922d52c59f741b82081a368f4d3c305c1afcd";
+//    public static final String DINGTALKPATH = "https://oapi.dingtalk.com/robot/send?access_token=e4b7d997fb9f90b17672dcdb9c9922d52c59f741b82081a368f4d3c305c1afcd";
     ;
 
     // *************** 客集集域名 ***************

src/test/testNG.xml

@@ -6,11 +6,16 @@
     <!--            <class name="com.kjj.qa.cases.Home"/>-->
     <!--        </classes>-->
     <!--    </test>-->
-<!--    <test preserve-order="true" name="支付">-->
-<!--        <classes>-->
-<!--            <class name="com.kjj.qa.cases.Pay"/>-->
-<!--        </classes>-->
-<!--    </test>-->
+    <!--    <test preserve-order="true" name="支付">-->
+    <!--        <classes>-->
+    <!--            <class name="com.kjj.qa.cases.Pay"/>-->
+    <!--        </classes>-->
+    <!--    </test>-->
+    <!--    <test preserve-order="true" name="新手任务">-->
+    <!--        <classes>-->
+    <!--            <class name="com.kjj.qa.cases.Novice"/>-->
+    <!--        </classes>-->
+    <!--    </test>-->
     <test preserve-order="true" name="名片">
         <classes>
             <class name="com.kjj.qa.cases.SellerCard"/>
@@ -21,11 +26,6 @@
             <class name="com.kjj.qa.cases.Upload"/>
         </classes>
     </test>
-<!--    <test preserve-order="true" name="新手任务">-->
-<!--        <classes>-->
-<!--            <class name="com.kjj.qa.cases.Novice"/>-->
-<!--        </classes>-->
-<!--    </test>-->
     <test preserve-order="true" name="文章">
         <classes>
             <class name="com.kjj.qa.cases.Article"/>