Add functionality which is compatible with new template

Author: Hilscher, Robert

lib/html_formatter.js

@@ -75,15 +75,18 @@ module.exports = (function() {
    * @param feature - object which contains feature data
    * @returns {*}
    */
-  function getFeature(feature) {
+  function getFeature(feature, scenariosNumberInFeature, passedScenariosNumberInFeature, stepsNumberInFeature, passedStepsInFeature) {
 
     var template = grunt.file.read(templates.featureTemplate),
       featureTemplate;
 
     featureTemplate = grunt.template.process(template, {
       data:{
-        name: feature.keyword + ": " +feature.name,
-        description: feature.description
+        name: feature.name,
+        scenariosNumberInFeature: scenariosNumberInFeature,
+        passedScenariosNumberInFeature: passedScenariosNumberInFeature,
+        stepsNumberInFeature: stepsNumberInFeature,
+        passedStepsInFeature: passedStepsInFeature
       }
     });
     return featureTemplate;
@@ -132,38 +135,52 @@ module.exports = (function() {
       passedSteps = 0,
       stepsNumber = 0,
       scenariosNumber = 0,
+      scenariosNumberInFeature = 0,
+      passedScenariosNumberInFeature = 0,
+      stepsNumberInFeature = 0,
+      passedStepsInFeature = 0,
+      scenariosHtml = '',
       element,
       step;
 
     for (var i = 0; i < testResults.length; i++) {
 
       html = '';
-      html += getFeature(testResults[i]);
+      scenariosNumberInFeature = 0;
+      passedScenariosNumberInFeature = 0;
+      stepsNumberInFeature = 0;
+      passedStepsInFeature = 0;
 
       for (var j = 0; j < testResults[i].elements.length; j++) {
         element = testResults[i].elements[j];
         if (element.type === 'scenario') {
           scenariosNumber++;
+          scenariosNumberInFeature++;
           stepsHtml = '';
           isPassed = true;
           for (var k = 0; k < testResults[i].elements[j].steps.length; k++) {
             step = testResults[i].elements[j].steps[k];
             stepsHtml += getStep(step);
             stepsNumber++;
+            stepsNumberInFeature++;
             if (step.result.status !== statuses.PASSED) {
               isPassed = false;
             } else if (step.result.status === statuses.PASSED) {
               passedSteps++;
+              passedStepsInFeature++;
             }
           }
 
           if (isPassed) {
             passedScenarios++;
+            passedScenariosNumberInFeature++;
           }
-          html += '<div class="scenario-container">' + getScenario(element, isPassed);
-          html += stepsHtml + '</div>';
+          scenariosHtml += '<div class="scenario-container">' + getScenario(element, isPassed);
+          scenariosHtml += stepsHtml + '</div>';
         }
       }
+      html += getFeature(testResults[i],scenariosNumberInFeature, passedScenariosNumberInFeature, stepsNumberInFeature, passedStepsInFeature);
+      html += scenariosHtml;
     }
     header = getHeader(scenariosNumber, passedScenarios, stepsNumber, passedSteps);
     return header + html;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-protractor-cucumber-html-report",
   "description": "Generate html report from JSON file returned by cucumber-js json formatter",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "homepage": "https://github.com/robhil/grunt-protractor-cucumber-html-report",
   "author": {
     "name": "Hilscher, Robert",

tasks/protractor-cucumber-html-report.js

@@ -39,6 +39,14 @@ module.exports = function(grunt) {
     if (grunt.file.exists(jsonPath)) {
       testResults = grunt.file.readJSON(jsonPath);
       grunt.file.write(options.dest + '/' + options.output, formatter.generateReport(testResults, options.templates));
+
+      grunt.file.recurse('./templates/assets', function (abspath, rootdir, subdir, filename) {
+
+        grunt.file.copy(abspath, options.dest + '/assets/' + subdir + '/'+ filename);
+
+      });
+
+
       grunt.log.writeln('File ' + options.output + ' has been created in \'' + options.dest + '\' directory');
     } else {
       grunt.log.error('File ' + jsonPath + ' doesn\'t exists');

templates/feature_template.html

@@ -1,16 +1,18 @@
-<div class="col-md-9 col-sm-8">
-    <div class="feature">
-        <h2><i class="fa fa-magic"></i> Feature:</h2>
+<div class="row">
+    <div class="col-md-9 col-sm-8">
+        <div class="feature">
+            <h2><i class="fa fa-magic"></i> Feature:</h2>
 
-        <div class="feature-description">
-            <%= name %>
+            <div class="feature-description">
+                <%= name %>
+            </div>
         </div>
     </div>
-</div>
-<div class="col-md-3 col-sm-4 feature-statistics">
-    <div class="scenario-label">Scenarios</div>
-    <div class="scenario-amount-passed"> 2/3 <br/><span>passed</span></div>
-    <div class="clear"></div>
-    <div class="steps-label">Steps</div>
-    <div class="steps-amount-passed">5/7 <br/><span>passed</span></div>
+    <div class="col-md-3 col-sm-4 feature-statistics">
+        <div class="scenario-label">Scenarios</div>
+        <div class="scenario-amount-passed"> <%= passedScenariosNumberInFeature %>/<%= scenariosNumberInFeature %> <br/><span>passed</span></div>
+        <div class="clear"></div>
+        <div class="steps-label">Steps</div>
+        <div class="steps-amount-passed"> <%= passedStepsInFeature %>/<%= stepsNumberInFeature %> <br/><span>passed</span></div>
+    </div>
 </div>