Merge remote-tracking branch 'upstream/master'

ezsystems · Sep 22, 2015 · a52833c · a52833c
2 parents 215a689 + 1c80952
commit a52833c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -18,6 +18,10 @@ default:
                 env: behat
                 debug: false
 
+        jarnaiz\JUnitFormatter\JUnitFormatterExtension:
+            filename: report.xml
+            outputDir: %paths.base%/build/tests
+
     # default profile: no suites
     suites: ~
 

diff --git a/composer.json b/composer.json
@@ -52,6 +52,7 @@
         "behat/mink-extension": "*",
         "behat/mink-goutte-driver": "*",
         "behat/mink-selenium2-driver": "*",
+        "jarnaiz/behat-junit-formatter": "^1.3",
         "ezsystems/behatbundle": "@dev"
     },
     "suggest": {