fixed after hooks

trivago · Nov 27, 2020 · b8c24d8 · b8c24d8
1 parent 1c2aaa1
commit b8c24d8
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Back to [Readme](README.md).
 
+## [2.6.1] - 2020-11-27
+
+### Fixed
+* After hooks with content were not displayed anymore
+
 ## [2.6.0] - 2020-11-27
 
 ### Fixed
@@ -603,6 +608,7 @@ steps with status `pending` or `undefined` (default value is `false`) (#74)
 
 Initial project version on GitHub and Maven Central.
 
+[2.6.1]: https://github.com/trivago/cluecumber-report-plugin/tree/2.6.1
 [2.6.0]: https://github.com/trivago/cluecumber-report-plugin/tree/2.6.0
 [2.5.0]: https://github.com/trivago/cluecumber-report-plugin/tree/2.5.0
 [2.4.0]: https://github.com/trivago/cluecumber-report-plugin/tree/2.4.0

diff --git a/example-project/pom.xml b/example-project/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.benjamin-bischoff</groupId>
     <artifactId>cluecumber-test-project</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -69,8 +69,8 @@
 
                     <!-- Optional properties to expand scenario hooks, step hooks and doc strings when scenario details are shown (default: false) -->
                     <expandBeforeAfterHooks>true</expandBeforeAfterHooks>
-                    <!--<expandStepHooks>true</expandStepHooks>-->
-                    <!--<expandDocStrings>true</expandDocStrings>-->
+                    <expandStepHooks>true</expandStepHooks>
+                    <expandDocStrings>true</expandDocStrings>
 
                     <!-- optional: Cluecumber log level -->
                     <!--<logLevel>default</logLevel>-->

diff --git a/plugin-code/pom.xml b/plugin-code/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.trivago.rta</groupId>
     <artifactId>cluecumber-report-plugin</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
     <url>https://github.com/trivago/cluecumber-report-plugin</url>
 
     <name>Cluecumber Maven Plugin for Cucumber Reports</name>

diff --git a/plugin-code/src/main/java/com/trivago/cluecumber/json/pojo/Element.java b/plugin-code/src/main/java/com/trivago/cluecumber/json/pojo/Element.java
@@ -149,7 +149,7 @@ public void setAfter(final List<ResultMatch> after) {
     }
 
     public boolean anyAfterHookHasContent() {
-        for (ResultMatch resultMatch : before) {
+        for (ResultMatch resultMatch : after) {
             if (resultMatch.hasContent()) {
                 return true;
             }
@@ -319,6 +319,10 @@ public boolean hasHooks() {
         return getBefore().size() > 0 || getAfter().size() > 0;
     }
 
+    public boolean hasHooksWithContent() {
+        return anyBeforeHookHasContent() || anyAfterHookHasContent();
+    }
+
     public boolean hasDocStrings() {
         for (Step step : backgroundSteps) {
             if (step.getDocString() != null) {
@@ -353,6 +357,22 @@ public boolean hasStepHooks() {
         return false;
     }
 
+    public boolean hasStepHooksWithContent() {
+        for (Step step : backgroundSteps) {
+            if (step.hasHooksWithContent())
+            {
+                return true;
+            }
+        }
+        for (Step step : steps) {
+            if (step.hasHooksWithContent())
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public List<ResultMatch> getAllResultMatches() {
         List<ResultMatch> resultMatches = new ArrayList<>(getBefore());
         resultMatches.addAll(getBackgroundSteps());

diff --git a/plugin-code/src/main/java/com/trivago/cluecumber/json/pojo/Step.java b/plugin-code/src/main/java/com/trivago/cluecumber/json/pojo/Step.java
@@ -35,6 +35,20 @@ public class Step extends ResultMatch {
     @SerializedName("doc_string")
     private DocString docString;
 
+    public boolean hasHooksWithContent() {
+        for (ResultMatch resultMatch : before) {
+            if (resultMatch.hasContent()) {
+                return true;
+            }
+        }
+        for (ResultMatch resultMatch : after) {
+            if (resultMatch.hasContent()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public List<ResultMatch> getBefore() {
         return before;
     }
@@ -65,7 +79,10 @@ public String returnNameWithArguments() {
         for (int i = arguments.size() - 1; i >= 0; i--) {
             String argument = arguments.get(i).getVal();
             if (argument != null) {
-                tmpName = tmpName.replaceFirst(Pattern.quote(argument), Matcher.quoteReplacement("<span class=\"parameter\">" + argument + "</span>"));
+                tmpName = tmpName.replaceFirst(
+                        Pattern.quote(argument),
+                        Matcher.quoteReplacement("<span class=\"parameter\">" + argument + "</span>")
+                );
             }
         }
         return tmpName;
@@ -116,7 +133,8 @@ public void setDocString(final DocString docString) {
     }
 
     public long getTotalDuration() {
-        long totalDurationNanoseconds = before.stream().mapToLong(beforeStep -> beforeStep.getResult().getDuration()).sum();
+        long totalDurationNanoseconds =
+                before.stream().mapToLong(beforeStep -> beforeStep.getResult().getDuration()).sum();
         totalDurationNanoseconds += getResult().getDuration();
         totalDurationNanoseconds += after.stream().mapToLong(afterStep -> afterStep.getResult().getDuration()).sum();
         return totalDurationNanoseconds;
@@ -132,8 +150,12 @@ public String getUrlFriendlyName() {
 
     @Override
     public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         Step step = (Step) o;
         return Objects.equals(getGlueMethodName(), step.getGlueMethodName());
     }

diff --git a/plugin-code/src/main/resources/template/scenario-detail.ftl b/plugin-code/src/main/resources/template/scenario-detail.ftl
@@ -59,13 +59,13 @@ preheadlineLink="pages/feature-scenarios/feature_${element.featureIndex?c}.html"
                     ${element.totalNumberOfSkippedSteps} skipped <@common.status status="skipped"/>
                 </li>
             </ul>
-            <#if element.hasHooks() && (element.anyBeforeHookHasContent() || element.anyAfterHookHasContent())>
+            <#if element.hasHooks() && element.hasHooksWithContent()>
                 <button class="btn btn-outline-secondary btn-block collapsed" type="button" data-toggle="collapse"
                         aria-expanded="true" data-cluecumber-item="before-after-hooks-button"
                         data-target=".scenarioHook">Scenario Hooks with content
                 </button>
             </#if>
-            <#if element.hasStepHooks()>
+            <#if element.hasStepHooks() && element.hasStepHooksWithContent()>
                 <button class="btn btn-outline-secondary btn-block collapsed" type="button" data-toggle="collapse"
                         aria-expanded="true" data-cluecumber-item="step-hooks-button"
                         data-target=".stepHook">Step Hooks with content