Merge remote-tracking branch 'origin/master' into develop

robertgates55 · robertgates55 · commit 8c2e9168488d · 2015-12-04T06:00:56.000+08:00
Conflicts:
	src/main/java/com/frameworkium/tests/internal/BaseTest.java
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.frameworkium</groupId>
   <artifactId>Frameworkium-core</artifactId>
-  <version>1.1.5</version>
+  <version>1.1.6</version>
 
   <name>Frameworkium-core</name>
   <description>
diff --git a/src/main/java/com/frameworkium/jira/zapi/Execution.java b/src/main/java/com/frameworkium/jira/zapi/Execution.java
@@ -96,11 +96,12 @@ private void updateStatusAndComment(final Integer executionId, final int status,
                 comment = comment.substring(0, 747) + "...";
             }
             obj.put("comment", comment);
+            
+            given().contentType("application/json").and().body(obj.toString()).then().put("execution/" + executionId + "/execute");
+
         } catch (JSONException e) {
             logger.error("Update status and comment failed", e);
         }
-
-        given().contentType("application/json").and().body(obj).then().put("execution/" + executionId + "/execute");
     }
 
     private void deleteExistingAttachments(final Integer executionId) {

Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,12 @@ private void updateStatusAndComment(final Integer executionId, final int status,`
`96`	`96`	`comment = comment.substring(0, 747) + "...";`
`97`	`97`	`}`
`98`	`98`	`obj.put("comment", comment);`
	`99`	`+`
	`100`	`+ given().contentType("application/json").and().body(obj.toString()).then().put("execution/" + executionId + "/execute");`
	`101`	`+`
`99`	`102`	`} catch (JSONException e) {`
`100`	`103`	`logger.error("Update status and comment failed", e);`
`101`	`104`	`}`
`102`		`-`
`103`		`- given().contentType("application/json").and().body(obj).then().put("execution/" + executionId + "/execute");`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`private void deleteExistingAttachments(final Integer executionId) {`