Merge pull request #92 from ciaranmcnulty/master

Pin deps to phpspec 2.1.1 and fix test suite

Author: shanethehat

composer.json

@@ -5,7 +5,7 @@
     "type": "library",
     "license": "MIT",
     "require": {
-        "phpspec/phpspec": "~2.1.0",
+        "phpspec/phpspec": "~2.1.1",
         "symfony/dependency-injection": "*",
         "symfony/config": "*",
         "shanethehat/pretty-xml": "~1.0.1"

composer.lock

@@ -0,0 +1,16 @@
+<?php
+
+namespace Fake;
+
+use PhpSpec\Console\Prompter;
+use Symfony\Component\Console\Helper\DialogHelper;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class YesDialogHelper extends DialogHelper
+{
+    public function askConfirmation(OutputInterface $output, $question, $default = true)
+    {
+        return 'Y';
+    }
+
+}

features/bootstrap/Fake/YesDialogHelper.php

@@ -2,11 +2,12 @@
 
 use Behat\Behat\Tester\Exception\PendingException;
 use Behat\Behat\Context\SnippetAcceptingContext;
-use Console\ApplicationTester;
+use Fake\YesDialogHelper;
 use OutputSpecification\ClassSpecification;
 use OutputSpecification\ObjectSpecification;
 use OutputSpecification\SpecSpecification;
 use PhpSpec\Console\Application;
+use Symfony\Component\Console\Tester\ApplicationTester;
 use Symfony\Component\Filesystem\Filesystem;
 
 
@@ -118,11 +119,11 @@ public function iDescribeA($objectType)
     {
 
         $this->applicationTester->run(
-            sprintf(
-                'describe:%s --no-interaction --config %s %s',
-                $objectType,
-                $this->configFile,
-                strtolower($this->namespace) . '/test'
+            array(
+                'command' => sprintf('describe:%s', $objectType),
+                '--no-interaction' => true,
+                '--config' => $this->configFile,
+                'alias' => strtolower($this->namespace) . '/test'
             ),
             array('decorated' => false)
         );
@@ -233,10 +234,17 @@ public function thatThereIsASpec($objectType)
      */
     public function magespecRunsTheSpec()
     {
-        $this->applicationTester->putToInputStream("y\n");
         $this->applicationTester->run(
-            sprintf('run --config %s --no-rerun %s', $this->configFile, $this->currentSpec),
-            array('interactive' => true, 'decorated' => false)
+            array(
+                'command' =>'run',
+                '--config' =>  $this->configFile,
+                '--no-rerun' => true,
+                $this->currentSpec
+            ),
+            array(
+                'interactive' => true,
+                'decorated' => false
+            )
         );
     }
 
@@ -371,10 +379,11 @@ public function theConfigXmlFileShouldContainAnElement($objectType)
     public function iDescribeANonMagentoObject()
     {
         $this->applicationTester->run(
-            sprintf(
-                'describe --no-interaction --config %s %s',
-                $this->configFile,
-                'Behat/Test'
+            array(
+                'command' => 'describe',
+                '--no-interaction' => true,
+                '--config' =>  $this->configFile,
+                'class' => 'Behat/Test'
             ),
             array('decorated' => false)
         );
@@ -422,6 +431,7 @@ private function createApplicationTester()
     {
         $application = new Application('version');
         $application->setAutoExit(false);
+        $application->getHelperSet()->set(new YesDialogHelper());
 
         return new ApplicationTester($application);
     }