Merge pull request #120 from trivago/release/1.6.4

Release/1.6.4
trivago · Jan 16, 2019 · 8c3fc40 · 8c3fc40
2 parents 3816c55 + ed9f3aa
commit 8c3fc40
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 4 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).
 
+## [1.6.4] - 2019-01-16
+
+### Fixed
+
+* Long scenario names break the layout (#119)
+
 ## [1.6.3] - 2019-01-08
 
 ### Fixed
@@ -317,6 +323,7 @@ Back to [Readme](README.md).
 
 Initial project version on GitHub and Maven Central.
 
+[1.6.4]: https://github.com/trivago/cluecumber-report-plugin/tree/1.6.4
 [1.6.3]: https://github.com/trivago/cluecumber-report-plugin/tree/1.6.3
 [1.6.2]: https://github.com/trivago/cluecumber-report-plugin/tree/1.6.2
 [1.6.1]: https://github.com/trivago/cluecumber-report-plugin/tree/1.6.1

diff --git a/example-project/json/scenario_with_long_name.json b/example-project/json/scenario_with_long_name.json
@@ -0,0 +1,61 @@
+[
+  {
+    "description": "This is a feature description 1",
+    "elements": [
+      {
+        "description": "Long Description: ThisScenarioHasASuperLongDescriptionAsWellThatShouldNotBreakTheLayoutInsteadThisShouldBeFormattedCorrectly",
+        "id": ";",
+        "keyword": "Scenario",
+        "line": 2,
+        "name": "Long name - ThisScenarioHasASuperLongNameThatShouldNotBreakTheLayoutInsteadThisShouldBeFormattedCorrectly",
+        "steps": [
+          {
+            "keyword": "Given ",
+            "line": 3,
+            "match": {
+              "location": "NativeConstructorAccessorImpl.java:-2"
+            },
+            "name": "this step passes",
+            "result": {
+              "duration": 244280571,
+              "status": "passed"
+            }
+          },
+          {
+            "keyword": "And ",
+            "line": 4,
+            "match": {
+              "arguments": [
+                {
+                  "val": "argument1",
+                  "offset": 23
+                },
+                {
+                  "val": "argument2",
+                  "offset": 38
+                }
+              ],
+              "location": "NativeConstructorAccessorImpl.java:-2"
+            },
+            "name": "this step passes with argument1 and argument2 as arguments",
+            "result": {
+              "duration": 255261782,
+              "status": "passed"
+            }
+          }
+        ],
+        "tags": [
+          {
+            "name": "@test"
+          }
+        ],
+        "type": "scenario"
+      }
+    ],
+    "id": "",
+    "keyword": "Feature",
+    "line": 1,
+    "name": "Feature 1",
+    "uri": "features/feature1.feature"
+  }
+]
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>1.6.3</version>
+    <version>1.6.4</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>1.6.3</version>
+    <version>1.6.4</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/resources/template/css/cluecumber.css b/plugin-code/src/main/resources/template/css/cluecumber.css
@@ -19,6 +19,10 @@ html {
     min-height: 100%;
 }
 
+h2, h3 {
+    word-break: break-all;
+}
+
 body {
     padding-top: 3rem;
     background-color: #fdfdfe;

diff --git a/plugin-code/src/main/resources/template/macros/scenario.ftl b/plugin-code/src/main/resources/template/macros/scenario.ftl
@@ -81,7 +81,8 @@ limitations under the License.
                                                         href="pages/feature-scenarios/feature_${report.featureIndex?c}.html">${report.name?html}</a></span>
                                                 </td>
                                                 <td class="text-left">
-                                                    <a href="pages/scenario-detail/scenario_${element.scenarioIndex?c}.html">${element.name?html}</a>
+                                                    <a href="pages/scenario-detail/scenario_${element.scenarioIndex?c}.html"
+                                                       style="word-break: break-all">${element.name?html}</a>
                                                 </td>
                                                 <td class="text-right small"
                                                     data-order="${element.totalDuration}">

diff --git a/...ivago/cluecumber/rendering/pages/pojos/pagecollections/AllFeaturesPageCollectionTest.java b/...ivago/cluecumber/rendering/pages/pojos/pagecollections/AllFeaturesPageCollectionTest.java
@@ -9,8 +9,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.hamcrest.core.Is.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 
 public class AllFeaturesPageCollectionTest {
 
@@ -21,4 +21,13 @@ public void getEmptyTagStatsTest() {
         Map<Feature, ResultCount> featureStats = allFeaturesPageCollection.getFeatureResultCounts();
         assertThat(featureStats.size(), is(0));
     }
+
+    @Test
+    public void testGetNumberOfPassedFeatures() {
+        List<Report> reports = new ArrayList<>();
+        AllFeaturesPageCollection allFeaturesPageCollection = new AllFeaturesPageCollection(reports);
+        assertThat(allFeaturesPageCollection.getTotalNumberOfPassedFeatures(), is(0));
+        assertThat(allFeaturesPageCollection.getTotalNumberOfSkippedFeatures(), is(0));
+        assertThat(allFeaturesPageCollection.getTotalNumberOfFailedFeatures(), is(0));
+    }
 }