Merge pull request #68 from BogdanLivadariu/master-me

added support to render table arguments for steps

bootstraped-multi-test-results-report/pom.xml

@@ -11,10 +11,10 @@
   </parent>
   <groupId>com.github.bogdanlivadariu</groupId>
   <artifactId>bootstraped-multi-test-results-report</artifactId>
-  <version>1.4.23</version>
+  <version>1.4.24</version>
   <packaging>hpi</packaging>
   <properties>
-    <cucumber-reporting-handlebars.version>1.1.6</cucumber-reporting-handlebars.version>
+    <cucumber-reporting-handlebars.version>1.1.7</cucumber-reporting-handlebars.version>
     <junit-reporting-handlebars.version>1.0.10</junit-reporting-handlebars.version>
     <testng-reporting-handlebars.version>1.0.9</testng-reporting-handlebars.version>
     <rspec-reporting-handlebars.version>1.0.6</rspec-reporting-handlebars.version>

cucumber-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/cucumber/helpers/Helpers.java

@@ -13,6 +13,7 @@
 import org.joda.time.format.PeriodFormatterBuilder;
 
 import com.github.bogdanlivadariu.reporting.cucumber.json.models.Row;
+import com.github.bogdanlivadariu.reporting.cucumber.json.models.StepRow;
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
@@ -32,6 +33,7 @@ public Handlebars registerHelpers() {
         handlebar.registerHelper("is-collapsed", isCollapsedHelper());
         handlebar.registerHelper("now", nowHelper());
         handlebar.registerHelper("do_table", doTableHelper());
+        handlebar.registerHelper("do_table_step", doTableHelperForStep());
         return handlebar;
     }
 
@@ -151,6 +153,41 @@ public CharSequence apply(Object context, Options options) throws IOException {
         };
     }
 
+    private Helper<List<StepRow>> doTableHelperForStep() {
+        return new Helper<List<StepRow>>() {
+            @Override
+            public CharSequence apply(List<StepRow> rows, Options arg1) throws IOException {
+                String tableContent = "<table  class='table table-condensed table-hover'>";
+                int indexRow = 0;
+                for (StepRow row : rows) {
+                    indexRow++;
+                    if (indexRow == 1) {
+                        tableContent += "<thead><tr>";
+                    } else if (indexRow == 2) {
+                        tableContent += "<tbody><tr>";
+                    } else {
+                        tableContent += "<tr>";
+                    }
+                    for (String cell : row.getCells()) {
+                        if (indexRow == 1) {
+                            tableContent += "<th>" + cell + "</th>";
+                        } else {
+                            tableContent += "<td>" + cell + "</td>";
+                        }
+                    }
+                    if (indexRow == 1) {
+                        tableContent += "</tr></thead>";
+                    } else {
+                        tableContent += "</tr>";
+                    }
+                }
+                tableContent += "</tbody></table>";
+                return tableContent;
+            }
+        };
+    }
+
+
     private Helper<List<Row>> doTableHelper() {
         return new Helper<List<Row>>() {
             @Override

cucumber-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/cucumber/json/models/Step.java

@@ -22,6 +22,8 @@ public class Step {
     private Integer[] matchedColumns;
 
     private Row[] rows;
+
+    private StepArgument[] arguments;
 
     private Embedding[] embeddings;
 
@@ -71,5 +73,9 @@ public Boolean getHidden() {
     public DocString getDocString() {
         return docString;
     }
+
+    public StepArgument[] getArguments() {
+    	return arguments;
+    }
 
 }

cucumber-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/cucumber/json/models/StepArgument.java

@@ -0,0 +1,9 @@
+package com.github.bogdanlivadariu.reporting.cucumber.json.models;
+
+public class StepArgument {
+    private StepRow[] rows;
+
+    public StepRow[] getRows() {
+        return rows;
+    }
+}

cucumber-reporting-handlebars/src/main/java/com/github/bogdanlivadariu/reporting/cucumber/json/models/StepRow.java

@@ -0,0 +1,9 @@
+package com.github.bogdanlivadariu.reporting.cucumber.json.models;
+
+public class StepRow {
+    private String[] cells;
+
+    public String[] getCells() {
+        return cells;
+    }
+}

cucumber-reporting-handlebars/src/main/resources/cucumber-reporting/featureSummaryReport.hbs

@@ -93,6 +93,9 @@
                             #{{match.location}}
                           </span>
                         </p>
+                        {{#if arguments}}
+                          <pre>{{#do_table_step arguments.0.rows}}{{/do_table_step}}</pre>
+                        {{/if}}
                         {{#if rows}}
                           <pre>{{#do_table rows}}{{/do_table}}</pre>
                         {{/if}}

pom.xml

@@ -32,8 +32,8 @@
     </developer>
   </developers>
   <properties>
-    <parent.version>1.4.23</parent.version>
-    <cucumber-reporting-handlebars.version>1.1.6</cucumber-reporting-handlebars.version>
+    <parent.version>1.4.24</parent.version>
+    <cucumber-reporting-handlebars.version>1.1.7</cucumber-reporting-handlebars.version>
     <junit-reporting-handlebars.version>1.0.10</junit-reporting-handlebars.version>
     <testng-reporting-handlebars.version>1.0.9</testng-reporting-handlebars.version>
     <rspec-reporting-handlebars.version>1.0.6</rspec-reporting-handlebars.version>