Added Evidence section to the home page Test Results

serenity-bdd · Oct 13, 2018 · c4361e5 · c4361e5
1 parent 283382e
commit c4361e5
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 6 deletions.
diff --git a/serenity-report-resources/src/main/resources/freemarker/home.ftl b/serenity-report-resources/src/main/resources/freemarker/home.ftl
@@ -37,7 +37,7 @@
         $('.scenario-result-table').DataTable({
 
             "order": [[0, "asc",], [3, "asc",]],
-            "pageLength": 25,
+            "pageLength": 10,
             "language": {
                 searchPlaceholder: "Filter",
                 search: ""
@@ -47,10 +47,19 @@
         // Results table
         $('#test-results-table').DataTable({
             "order": [[0, "asc",], [3, "asc",]],
-            "pageLength": 100,
-            "lengthMenu": [[25, 50, 100, 200, -1], [25, 50, 100, 200, "All"]]
+            "pageLength": 10,
+            "lengthMenu": [[10, 25, 50, 100, 200, -1], [10, 25, 50, 100, 200, "All"]]
         });
 
+        $('#evidence-table').DataTable(
+                <#if evidence?size <= 10 >
+                    {
+                        searching: false,
+                        paging: false,
+                        info: false
+                    }
+                </#if>
+        );
     })
     ;
     </script>
@@ -603,6 +612,34 @@
 
                                                     </div>
                                                 </div>
+
+
+
+                                                <#if evidence?has_content>
+                                                    <div class="row">
+                                                        <div class="col-sm-12">
+                                                            <h3><i class="far fa-file"></i> Evidence</h3>
+                                                            <table id="evidence-table" class="table table-bordered">
+                                                                <thead>
+                                                                <tr>
+                                                                    <th>Scenario</th>
+                                                                    <th>Title</th>
+                                                                    <th>Details</th>
+                                                                </tr>
+                                                                </thead>
+                                                                <tbody>
+                                                                 <#list evidence as evidenceRecord>
+                                                                 <tr>
+                                                                     <td>${evidenceRecord.scenario}</td>
+                                                                     <td>${evidenceRecord.title}</td>
+                                                                     <td>${evidenceRecord.detailsLink}</td>
+                                                                 </tr>
+                                                                 </#list>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                </#if>
                                             </div>
                                         </div>
                         </td>

diff --git a/serenity-report-resources/src/main/resources/freemarker/requirements.ftl b/serenity-report-resources/src/main/resources/freemarker/requirements.ftl
@@ -53,6 +53,18 @@
                 info: false
             });
 
+            $('#evidence-table').DataTable(
+                <#if evidence?size <= 10 >
+                    {
+                        searching: false,
+                        ordering: false,
+                        paging: false,
+                        info: false
+                    }
+                </#if>
+            );
+
+
             $(".scenario-docs .card-body table").wrap("<div class='table-responsive'></div>");
 
             $("#requirements-tabs").tabs();
@@ -703,7 +715,7 @@
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <h3><i class="far fa-file"></i> Evidence</h3>
-                                                <table class="table table-bordered">
+                                                <table id="evidence-table" class="table table-bordered">
                                                     <thead>
                                                     <tr>
                                                         <th>Scenario</th>

diff --git a/serenity-reports/src/main/java/net/thucydides/core/reports/html/EvidenceData.java b/serenity-reports/src/main/java/net/thucydides/core/reports/html/EvidenceData.java
@@ -56,9 +56,9 @@ private static String detailsLinkFor(TestOutcome testOutcome, ReportData reportD
                     + "'><i class='fas fa-download'></i>&nbsp;Download Evidence</a>";
         } else {
             String report = ReportNamer.forReportType(ReportType.HTML).getNormalizedTestNameFor(testOutcome);
-            return "<a role='button' target='_blank' class='btn btn-success btn-sm' href='"
+            return "<a role='button' class='btn btn-success btn-sm' href='"
                     + report
-                    + "'><i class='fas fa-download'></i>&nbsp;Details</a>";
+                    + "'><i class=\"fas fa-external-link-alt\"></i>&nbsp;Details</a>";
         }
     }
 

diff --git a/serenity-reports/src/main/java/net/thucydides/core/reports/html/FreemarkerContext.java b/serenity-reports/src/main/java/net/thucydides/core/reports/html/FreemarkerContext.java
@@ -105,6 +105,7 @@ public Map<String, Object> getBuildContext(TestOutcomes testOutcomes,
         context.put("testCases", executedScenariosIn(testOutcomes));
         context.put("automatedTestCases", automated(executedScenariosIn(testOutcomes)));
         context.put("manualTestCases", manual(executedScenariosIn(testOutcomes)));
+        context.put("evidence", EvidenceData.from(testOutcomes));
 
         context.put("frequentFailures", FrequentFailures.from(testOutcomes).withMaxOf(5));
         context.put("unstableFeatures", UnstableFeatures.from(testOutcomes)