Merge pull request #109 from trivago/1.6.2

1.6.2
trivago · Dec 17, 2018 · 6b1001c · 6b1001c
2 parents 451ac18 + 152dc58
commit 6b1001c
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Back to [Readme](README.md).
 
+## [1.6.2] - 2018-12-13
+
+### Fixed
+
+* Links to scenario details did not work for scenario indices over 1000
+* Long custom parameters (URLs) broke the layout
+
 ## [1.6.1] - 2018-12-13
 
 ### Fixed
@@ -293,6 +300,7 @@ Back to [Readme](README.md).
 
 Initial project version on GitHub and Maven Central.
 
+[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
 [1.6.0]: https://github.com/trivago/cluecumber-report-plugin/tree/1.6.0
 [1.5.0]: https://github.com/trivago/cluecumber-report-plugin/tree/1.5.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>1.6.1</version>
+    <version>1.6.2</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.1</version>
+    <version>1.6.2</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/rendering/pages/pojos/ReportDetails.java b/plugin-code/src/main/java/com/trivago/cluecumber/rendering/pages/pojos/ReportDetails.java
@@ -48,7 +48,7 @@ public String getDate() {
     }
 
     public String getGeneratorName() {
-        return String.format("%s [%s]",
+        return String.format("%s version %s",
                 PluginSettings.NAME, RenderingUtils.getPluginVersion());
     }
 

diff --git a/plugin-code/src/main/resources/template/css/cluecumber.css b/plugin-code/src/main/resources/template/css/cluecumber.css
@@ -87,14 +87,19 @@ table {
     -webkit-border-horizontal-spacing: 0;
 }
 
-table.table-fit, table.table-fit td {
-    width: 1px;
+table.table-fit {
+    width: 100%;
     margin-bottom: 0;
 }
 
-table.table-fit td {
-    width: 1px;
-    padding: 0.3rem;
+table.table-fit td:nth-child(1) {
+    width: auto;
+    white-space: nowrap;
+}
+
+table.table-fit td:nth-child(2) {
+    width: 100%;
+    word-break: break-all;
 }
 
 .list-group-item, *[role=row], .table th, .table td {

diff --git a/plugin-code/src/main/resources/template/feature-summary.ftl b/plugin-code/src/main/resources/template/feature-summary.ftl
@@ -52,7 +52,7 @@ limitations under the License.
                     <#list featureResultCounts as feature, featureResultCount>
                     <tr>
                         <td class="text-left"><a
-                                href="pages/feature-scenarios/feature_${feature.index}.html">${feature.name}</a>
+                                href="pages/feature-scenarios/feature_${feature.index?c}.html">${feature.name}</a>
                         </td>
                         <td class="text-right"><strong>${featureResultCount.total}</strong></td>
                         <td class="text-right">${featureResultCount.passed}</td>

diff --git a/plugin-code/src/main/resources/template/macros/scenario.ftl b/plugin-code/src/main/resources/template/macros/scenario.ftl
@@ -78,10 +78,10 @@ limitations under the License.
                                                 </#if>
                                                 <td class="text-left"><span data-toggle="tooltip"
                                                                             title="${tooltipText}"><a
-                                                        href="pages/feature-scenarios/feature_${report.featureIndex}.html">${report.name?html}</a></span>
+                                                        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}.html">${element.name?html}</a>
+                                                    <a href="pages/scenario-detail/scenario_${element.scenarioIndex?c}.html">${element.name?html}</a>
                                                 </td>
                                                 <td class="text-right small"
                                                     data-order="${element.totalDuration}">

diff --git a/plugin-code/src/main/resources/template/scenario-summary.ftl b/plugin-code/src/main/resources/template/scenario-summary.ftl
@@ -46,7 +46,7 @@ limitations under the License.
                         <#list customParameters as customParameter>
                         <tr>
                             <td class="text-left text-nowrap"><strong>${customParameter.key}:</strong></td>
-                            <td class="text-left">
+                            <td class="text-left wrap">
                                 <#if customParameter.url>
                                     <a href="${customParameter.value}"
                                        target="_blank">${customParameter.value}</a>

diff --git a/plugin-code/src/main/resources/template/snippets/footer.ftl b/plugin-code/src/main/resources/template/snippets/footer.ftl
@@ -16,6 +16,6 @@ limitations under the License.
 
 <footer class="footer navbar-dark bg-dark">
     <div class="container-fluid">
-        <span>Generated by ${reportDetails.generatorName}, ${reportDetails.date}.</span>
+        <span>${reportDetails.generatorName} - ${reportDetails.date}.</span>
     </div>
 </footer>
diff --git a/...in-code/src/test/java/com/trivago/cluecumber/rendering/pages/pojos/ReportDetailsTest.java b/...in-code/src/test/java/com/trivago/cluecumber/rendering/pages/pojos/ReportDetailsTest.java
@@ -1,13 +1,12 @@
 package com.trivago.cluecumber.rendering.pages.pojos;
 
-import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.core.Is.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 
 public class ReportDetailsTest {
     private ReportDetails reportDetails;
@@ -19,12 +18,12 @@ public void setup() {
 
     @Test
     public void getGeneratorNameTest() {
-        MatcherAssert.assertThat(reportDetails.getGeneratorName(), CoreMatchers.is("Cluecumber Report Plugin [unknown]"));
+        MatcherAssert.assertThat(reportDetails.getGeneratorName(), is("Cluecumber Report Plugin version unknown"));
     }
 
     @Test
     public void getPageNameTest() {
-        MatcherAssert.assertThat(reportDetails.getPageName(), CoreMatchers.is("Page Name"));
+        MatcherAssert.assertThat(reportDetails.getPageName(), is("Page Name"));
     }
 
     @Test