Merge pull request #50 from trivago/0.8.0

0.8.0
trivago · Jun 10, 2018 · 4ad3872 · 4ad3872
2 parents c94fec8 + 21884e0
commit 4ad3872
Show file tree

Hide file tree

Showing 19 changed files with 279 additions and 170 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,89 +7,105 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Back to [Readme](README.md).
 
+## [0.8.0] - 2018-06-10
+
+### Fixed
+
+* Scenario.write outputs with null values lead to rendering exceptions
+* Scenario.write outputs are not shown in before and after steps
+
+### Added
+
+* Support for Before and After hock attachments
+* Updated example JSON files in example project
+
+### Removed
+
+* Capitalization of scenario names
+
 ## [0.7.1] - 2018-05-08
 
-# Added
+### Added
 
 * Feature description is now shown in the feature tool tip on hover
 
-# Fixed
+### Fixed
 
 * Chart was not rendered when a scenario contained step data tables
 
 ## [0.7.0] - 2018-04-18
 
-# Changed
+### Changed
 
 * Unified report design
 * Updated all dependencies
 * Completely changed freemarker code to be better extensible
 
 ## [0.6.0] - 2018-04-12
 
-# Added
+### Added
 
 * Example project
 
-# Changed
+### Changed
 
 * Cluecumber is now a monorepo
 
-# Fixed
+### Fixed
 
 * Table header error on tab overview page
 
 ## [0.5.0] - 2018-03-19
 
-# Added
+### Added
 
 * Tag summary page
 
-# Fixed
+### Fixed
 
 * Background Scenario steps are now rendered correctly
 * Various small bug fixes
 
 ## [0.3.0] - 2018-02-19
 
-# Added
+### Added
 
 * Scenario.output is now displayed in the scenario details
 
-# Fixed
+### Fixed
 
 * Scenarios with pending and skipped steps are also considered skipped.
 * Background scenarios are now merged to the following scenarios.
 
-# Changed
+### Changed
 
 * Before and after steps have a lower opacity to focus on test steps.
 * Internal organization of page types allows easier extension.
 
 ## [0.2.0] - 2018-01-16
 
-# Added
+### Added
 
 - Support for data tables within steps
 - Cleaner report headers
 
-# Removed
+### Removed
 
 - Javascript back method is replaced with simple links on the detail pages
 
-# Fixed
+### Fixed
 
 - Report generation is now much more resilient if information is missing in the JSON sources
 
 ## [0.1.1] - 2017-12-12
 
-# Removed
+### Removed
 
 - Unnecessary log outputs for attachments
 
 ## [0.1.0] - 2017-12-12
 
-# Added
+### Added
 
 - Support for Cucumber 2 attachments
 
@@ -142,6 +158,8 @@ Back to [Readme](README.md).
 
 Initial project version on GitHub and Maven Central.
 
+[0.8.0]: https://github.com/trivago/cluecumber-report-plugin/tree/0.8.0
+[0.7.1]: https://github.com/trivago/cluecumber-report-plugin/tree/0.7.1
 [0.6.0]: https://github.com/trivago/cluecumber-report-plugin/tree/0.6.0
 [0.5.0]: https://github.com/trivago/cluecumber-report-plugin/tree/0.5.0
 [0.3.0]: https://github.com/trivago/cluecumber-report-plugin/tree/0.3.0

diff --git a/documentation/img/browserstack.png b/documentation/img/browserstack.png
diff --git a/example-project/json/attachments.json b/example-project/json/attachments.json
@@ -0,0 +1,72 @@
+[
+  {
+    "description": "This is an attachment test",
+    "elements": [
+      {
+        "description": "Attachment in every step",
+        "id": ";",
+        "keyword": "Scenario",
+        "line": 2,
+        "name": "This scenario passes",
+        "steps": [
+          {
+            "keyword": "Given ",
+            "line": 3,
+            "match": {
+              "location": "someMethod()"
+            },
+            "name": "this step has an attachment",
+            "result": {
+              "duration": 244280571,
+              "status": "passed"
+            },
+            "embeddings": [
+              {
+                "mime_type": "image/png",
+                "data": "Zm9v"
+              }
+            ]
+          },
+          {
+            "keyword": "And ",
+            "line": 3,
+            "match": {
+              "location": "someMethod2()"
+            },
+            "name": "this step has also an attachment",
+            "output": [
+              "Output 1",
+              null,
+              "Output 3"
+            ],
+            "result": {
+              "duration": 3923468231,
+              "status": "passed"
+            },
+            "embeddings": [
+              {
+                "mime_type": "image/png",
+                "data": "Zm9v"
+              },
+              {
+                "mime_type": "image/png",
+                "data": "Zm9v"
+              }
+            ]
+          }
+        ],
+        "tags": [
+          {
+            "name": "@test"
+          }
+        ],
+        "type": "scenario"
+      }
+    ],
+    "id": "",
+    "keyword": "Feature",
+    "line": 1,
+    "name": "Feature 1",
+    "uri": "features/attachments.feature"
+  }
+]
diff --git a/example-project/json/skip.json b/example-project/json/skip.json
@@ -8,6 +8,10 @@
             "match": {
               "location": "Steps.java:6"
             },
+            "output": [
+              "Output 1",
+              "Output 2"
+            ],
             "result": {
               "duration": 1452264732,
               "error_message": "java.lang.RuntimeException: failing before hook\n\tat Steps.lambda$new$0(Steps.java:7)\n\tat cucumber.runtime.java8.Java8HookDefinition.lambda$execute$0(Java8HookDefinition.java:51)",
@@ -31,7 +35,27 @@
             "result": {
               "duration": 2552264732,
               "status": "skipped"
-            }
+            },
+            "output": [
+              "Output 5",
+              "Output 6"
+            ]
+          }
+        ],
+        "after": [
+          {
+            "match": {
+              "location": "After.java:6"
+            },
+            "result": {
+              "duration": 1452264732,
+              "error_message": "Some errors",
+              "status": "failed"
+            },
+            "output": [
+              "Output 3",
+              "Output 4"
+            ]
           }
         ],
         "tags": [

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>0.7.1</version>
+    <version>0.8.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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>0.7.1</version>
+    <version>0.8.0</version>
     <url>https://github.com/trivago/cluecumber-report-plugin</url>
 
     <name>Cluecumber Maven Plugin for Cucumber Reports</name>
@@ -78,14 +78,16 @@
         <plexus.component.annotations.version>1.7.1</plexus.component.annotations.version>
         <maven.plugin.annotations.version>3.5</maven.plugin.annotations.version>
         <maven.source.plugin.version>2.4</maven.source.plugin.version>
-
+        <plexus.utilities.version>3.1.0</plexus.utilities.version>
         <mockito.version>2.9.0</mockito.version>
         <junit.version>4.12</junit.version>
+        <openpojo.version>0.8.6</openpojo.version>
 
         <gson.version>2.8.2</gson.version>
         <gsonfire.version>1.8.3</gsonfire.version>
         <chart.version>2.3.1</chart.version>
         <freemarker.version>2.3.28</freemarker.version>
+        <jsoup.version>1.11.3</jsoup.version>
     </properties>
 
     <profiles>
@@ -247,7 +249,13 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>3.1.0</version>
+            <version>${plexus.utilities.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>${jsoup.version}</version>
         </dependency>
 
         <dependency>
@@ -267,7 +275,7 @@
         <dependency>
             <groupId>com.openpojo</groupId>
             <artifactId>openpojo</artifactId>
-            <version>0.8.6</version>
+            <version>${openpojo.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/plugin-code/src/main/java/com/trivago/rta/json/pojo/After.java b/plugin-code/src/main/java/com/trivago/rta/json/pojo/After.java
@@ -16,18 +16,5 @@
 
 package com.trivago.rta.json.pojo;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class After extends ResultMatch {
-    // Cucumber 2
-    private List<Embedding> embeddings = new ArrayList<>();
-
-    public List<Embedding> getEmbeddings() {
-        return embeddings;
-    }
-
-    public void setEmbeddings(final List<Embedding> embeddings) {
-        this.embeddings = embeddings;
-    }
 }
diff --git a/plugin-code/src/main/java/com/trivago/rta/json/pojo/ResultMatch.java b/plugin-code/src/main/java/com/trivago/rta/json/pojo/ResultMatch.java
@@ -18,10 +18,16 @@
 
 import com.trivago.rta.constants.Status;
 
+import java.util.ArrayList;
+import java.util.List;
+
 class ResultMatch {
     private Result result;
     private Match match;
 
+    private List<String> output = new ArrayList<>();
+    private List<Embedding> embeddings = new ArrayList<>();
+
     public Result getResult() {
         return result != null ? result : new Result();
     }
@@ -38,6 +44,22 @@ public void setMatch(final Match match) {
         this.match = match;
     }
 
+    public List<Embedding> getEmbeddings() {
+        return embeddings;
+    }
+
+    public void setEmbeddings(final List<Embedding> embeddings) {
+        this.embeddings = embeddings;
+    }
+
+    public List<String> getOutput() {
+        return output;
+    }
+
+    public void setOutput(final List<String> output) {
+        this.output = output;
+    }
+
     public String getGlueMethodName() {
         return getMatch().getLocation();
     }
@@ -66,6 +88,8 @@ public String toString() {
         return "ResultMatch{" +
                 "result=" + result +
                 ", match=" + match +
+                ", output=" + output +
+                ", embeddings=" + embeddings +
                 '}';
     }
 }