Merge pull request #34 from trivago/0.5.0

fixed wrong order of background steps
trivago · Mar 8, 2018 · ec2f647 · ec2f647
2 parents 2ef6982 + 5ac7adf
commit ec2f647
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Back to [Readme](README.md).
 
+## [0.5.0] - 2018-03-08
+
+# Fixed
+
+* Background Scenario steps are now rendered correctly
+
 ## [0.3.0] - 2018-02-19
 
 # Added

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

diff --git a/src/main/java/com/trivago/rta/json/postprocessors/ReportPostProcessor.java b/src/main/java/com/trivago/rta/json/postprocessors/ReportPostProcessor.java
@@ -20,7 +20,6 @@
 import com.google.gson.JsonElement;
 import com.trivago.rta.json.pojo.Element;
 import com.trivago.rta.json.pojo.Report;
-import com.trivago.rta.json.pojo.Step;
 import com.trivago.rta.logging.CluecumberLogger;
 import io.gsonfire.PostProcessor;
 
@@ -53,9 +52,7 @@ private void mergeBackgroundScenarios(final Report report) {
                 currentBackgroundElement = element;
             } else {
                 if (currentBackgroundElement != null) {
-                    for (Step step : currentBackgroundElement.getSteps()) {
-                        element.getSteps().add(0, step);
-                    }
+                    element.getSteps().addAll(0, currentBackgroundElement.getSteps());
                 }
                 cleanedUpElements.add(element);
             }

diff --git a/src/test/java/com/trivago/rta/json/postprocessors/ReportPostProcessorTest.java b/src/test/java/com/trivago/rta/json/postprocessors/ReportPostProcessorTest.java
@@ -30,9 +30,15 @@ public void postDeserializeTest(){
 
         Element backgroundElement = new Element();
         List<Step> backgroundSteps = new ArrayList<>();
-        Step backgroundStep = new Step();
-        backgroundStep.setName("background step");
-        backgroundSteps.add(backgroundStep);
+
+        Step backgroundStep1 = new Step();
+        backgroundStep1.setName("background step 1");
+        backgroundSteps.add(backgroundStep1);
+
+        Step backgroundStep2 = new Step();
+        backgroundStep2.setName("background step 2");
+        backgroundSteps.add(backgroundStep2);
+
         backgroundElement.setSteps(backgroundSteps);
         backgroundElement.setType("background");
         elements.add(backgroundElement);
@@ -53,6 +59,11 @@ public void postDeserializeTest(){
         assertThat(report.getElements().size(), is(2));
         reportPostProcessor.postDeserialize(report, null,null);
         assertThat(report.getElements().size(), is(1));
-        assertThat(report.getElements().get(0).getSteps().size(), is(3));
+        List<Step> firstElementSteps = report.getElements().get(0).getSteps();
+        assertThat(firstElementSteps.size(), is(4));
+        assertThat(firstElementSteps.get(0).getName(), is("background step 1"));
+        assertThat(firstElementSteps.get(1).getName(), is("background step 2"));
+        assertThat(firstElementSteps.get(2).getName(), is("element step 1"));
+        assertThat(firstElementSteps.get(3).getName(), is("element step 2"));
     }
 }