Merge branch 'jakubzapletal-master'

richardmiller-zz · Dec 11, 2015 · 36e8f43 · 36e8f43
2 parents eaeae02 + 1804dcd
commit 36e8f43
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -102,6 +102,7 @@ default:
  extensions:
    RMiller\BehatSpec\BehatExtension:
      path:  bin/phpspec #default value is bin/phpspec
+     config:  path/to/phpspec.yml #optional
 ```     
 
 Activate the PhpSpec extension by specifying its class in your `phpspec.yml`:
@@ -126,6 +127,7 @@ default:
   rerunner:
     path: vendor/bin/phpspec
     commands: [describe, exemplify, your_own_fancy_command]
+    config: path/to/phpspec.yml #optional
 ```
 
 ### Some Details

diff --git a/composer.json b/composer.json
@@ -16,9 +16,9 @@
     "require": {
         "php": ">=5.4",
         "rmiller/error-extension": "~0.1",
-        "rmiller/phpspec-extension": "~0.1",
+        "rmiller/phpspec-extension": "~0.2",
         "rmiller/exemplify-extension": "~0.2",
-        "rmiller/phpspec-run-extension": "~0.1"
+        "rmiller/phpspec-run-extension": "~0.2"
     },
 
     "autoload": {

diff --git a/src/BehatExtension.php b/src/BehatExtension.php
@@ -53,6 +53,7 @@ public function configure(ArrayNodeDefinition $builder)
             ->addDefaultsIfNotSet()
             ->children()
                 ->scalarNode('path')->defaultValue('bin/phpspec')->end()
+                ->scalarNode('config')->defaultNull()->end()
             ->end()
          ->end();
     }