fix for skipped event

extent-framework · Nov 22, 2018 · c1aa9f5 · c1aa9f5
1 parent 05c231f
commit c1aa9f5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/com/aventstack/extentreports/cucumber/adapter/ExtentCucumberAdapter.java b/src/main/java/com/aventstack/extentreports/cucumber/adapter/ExtentCucumberAdapter.java
@@ -14,6 +14,7 @@
 import com.aventstack.extentreports.ExtentTest;
 import com.aventstack.extentreports.GherkinKeyword;
 import com.aventstack.extentreports.MediaEntityBuilder;
+import com.aventstack.extentreports.Status;
 import com.aventstack.extentreports.markuputils.MarkupHelper;
 import com.aventstack.extentreports.service.ExtentService;
 
@@ -389,17 +390,20 @@ private synchronized void updateResult(Result result) {
                 break;
             case "skipped":
             case "pending":
+                Boolean currentEndingEventSkipped = stepTestThreadLocal.get().getModel().getLogContext() != null 
+                    && !stepTestThreadLocal.get().getModel().getLogContext().isEmpty()
+                        ? stepTestThreadLocal.get().getModel().getLogContext().getLast().getStatus() == Status.SKIP
+                        : false;
                 if (result.getError() != null) {
                     stepTestThreadLocal.get().skip(result.getError());
-                }
-                else {
+                } else if (!currentEndingEventSkipped) {
                     String details = result.getErrorMessage() == null ? "Step skipped" : result.getErrorMessage();
                     stepTestThreadLocal.get().skip(details);
                 }
                 break;
             case "passed":
                 if (stepTestThreadLocal.get()!= null && stepTestThreadLocal.get().getModel().getLogContext().isEmpty())
-                    stepTestThreadLocal.get().pass("Step passed");
+                    stepTestThreadLocal.get().pass("");
                 break;
             default:
                 break;