Merge pull request #45 from trivago/chart-rendering-bug

added feature description to tool tip
trivago · May 8, 2018 · 3f7905c · 3f7905c
2 parents e64ac96 + ced59d0
commit 3f7905c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Back to [Readme](README.md).
 
+## [0.7.1] - 2018-05-08
+
+# Added
+
+* Feature description is now shown in the feature tool tip on hover
+
+# Fixed
+
+* Chart was not rendered when a scenario contained step data tables
+
 ## [0.7.0] - 2018-04-18
 
 # Changed

diff --git a/example-project/json/fail.json b/example-project/json/fail.json
@@ -1,6 +1,6 @@
 [
   {
-    "description": "",
+    "description": "This is a feature description 2",
     "elements": [
       {
         "description": "",

diff --git a/example-project/json/pass.json b/example-project/json/pass.json
@@ -1,6 +1,6 @@
 [
   {
-    "description": "",
+    "description": "This is a feature description 1",
     "elements": [
       {
         "description": "",

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.0</version>
+    <version>0.7.1</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.0</version>
+    <version>0.7.1</version>
     <url>https://github.com/trivago/cluecumber-report-plugin</url>
 
     <name>Cluecumber Maven Plugin for Cucumber Reports</name>
@@ -132,6 +132,7 @@
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/plugin-code/src/main/resources/template/macros/scenario.ftl b/plugin-code/src/main/resources/template/macros/scenario.ftl
@@ -21,7 +21,7 @@
                     </#switch>
 
                     <div class="card-body">
-                        <table id="results_skipped" class="table table-hover">
+                        <table id="results_${status}" class="table table-hover renderAsDataTable">
                             <thead>
                             <tr>
                                 <th class="text-left">Feature</th>
@@ -31,11 +31,18 @@
                             </thead>
                             <tbody>
                                 <#list reports as report>
+
+                                    <#assign tooltipText = "">
+                                    <#if report.description?has_content>
+                                        <#assign tooltipText = "${report.description} | ">
+                                    </#if>
+                                    <#assign tooltipText = "${tooltipText}${report.uri}">
+
                                     <#list report.elements as element>
                                         <#if (skippedRequested && element.skipped) || (failedRequested && element.failed) || (passedRequested && element.passed)>
                                             <tr>
                                                 <td class="text-left text-capitalize"><span data-toggle="tooltip"
-                                                                                            title="${report.uri}">${report.name?html}</span>
+                                                                                            title="${tooltipText}">${report.name?html}</span>
                                                 </td>
                                                 <td class="text-left text-capitalize">
                                                     <a href="pages/scenario-detail/scenario_${element.scenarioIndex}.html">${element.name?html}</a>

diff --git a/plugin-code/src/main/resources/template/snippets/js.ftl b/plugin-code/src/main/resources/template/snippets/js.ftl
@@ -8,7 +8,7 @@
 <script>
     $(document).ready(function () {
         // Data tables
-        $('table').on('draw.dt', function () {
+        $('.renderAsDataTable').on('draw.dt', function () {
             $('[data-toggle="tooltip"]').tooltip();
         }).DataTable();
 

diff --git a/plugin-code/src/main/resources/template/tag-summary.ftl b/plugin-code/src/main/resources/template/tag-summary.ftl
@@ -13,7 +13,7 @@
 
     <div class="row">
         <@page.card width="12" title="Tag Summary" subtitle="">
-            <table id="tag_summary" class="table table-hover">
+            <table id="tag_summary" class="table table-hover renderAsDataTable">
                 <thead>
                 <tr>
                     <th>Tag</th>