Merge pull request #43 from magagan/handleMultipleFeatureTags_magagan_10162017

Handle multiple tags in Features

Author: pproenca

src/Event/Subscriber/BddSubscriber.php

@@ -181,6 +181,7 @@ public function afterStep(AfterStepTested $event)
         $resultCode          = $event->getTestResult()->getResultCode();
         $stepText            = sprintf("%s %s", $event->getStep()->getKeyword(), $event->getStep()->getText());
         $valuesTables        = [];
+        $screenshotOnFailed  = Athena::settings()->get('bddScreenshotOnlyOnFailed')->orDefaultTo(true);
 
         // not the most pretty implementation
         if ($event->getStep()->hasArguments()) {
@@ -203,10 +204,22 @@ public function afterStep(AfterStepTested $event)
             }
         }
 
-        $imageFileName = $this->takeScreenshot();
-        $httpTransactions = $this->getHttpTransactionEvents();
+        if (($resultCode == TestResult::FAILED) && ($screenshotOnFailed == true)){
+            $imageFileName = $this->takeScreenshot();
+            $httpTransactions = $this->getHttpTransactionEvents();
 
-        $this->report->finishStep($stepText, $valuesTables, $resultCode, $imageFileName, $exceptionMessage, $exceptionTrace, $exceptionType, $httpTransactions);
+            $this->report->finishStep($stepText, $valuesTables, $resultCode, $imageFileName, $exceptionMessage, $exceptionTrace, $exceptionType, $httpTransactions);
+        } elseif ($screenshotOnFailed == false) {
+            $imageFileName = $this->takeScreenshot();
+            $httpTransactions = $this->getHttpTransactionEvents();
+
+            $this->report->finishStep($stepText, $valuesTables, $resultCode, $imageFileName, $exceptionMessage, $exceptionTrace, $exceptionType, $httpTransactions);
+        } elseif (($resultCode == TestResult::PASSED) && ($screenshotOnFailed == true)) {
+            $imageFileName = null;
+            $httpTransactions = null;
+
+            $this->report->finishStep($stepText, $valuesTables, $resultCode, $imageFileName, $exceptionMessage, $exceptionTrace, $exceptionType, $httpTransactions);
+        }
     }
 
     /**

src/Logger/Template/cucumber_report.twig

@@ -46,8 +46,12 @@
     "description": "",
     "type" : "scenario",
     "tags":[
-    {% for tag in test.tags %}
-        {"name": "{{ tag }}"}
+    {% for key in test.tags|keys %}
+        {% if loop.last == true %}
+            {"name": "{{ test.tags[key] }}"}
+        {% else %}
+            {"name": "{{ test.tags[key] }}"},
+        {% endif %}
     {% endfor %}
     ],
     "steps" : [
@@ -64,7 +68,6 @@
             "error_message" : "{{ "#{errorMessage}" | raw }}",
             {% endif %}
 
-
         "status" : "{{ step.status }}"
 
         },