Added support for new CommandRunner

cakephp · Jun 23, 2017 · 477a800 · 477a800
1 parent 2e3ca9c
commit 477a800
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/TestSuite/ConsoleIntegrationTestCase.php b/src/TestSuite/ConsoleIntegrationTestCase.php
@@ -16,6 +16,7 @@
 use Cake\Console\CommandRunner;
 use Cake\Console\ConsoleInput;
 use Cake\Console\ConsoleIo;
+use Cake\Core\Configure;
 use Cake\TestSuite\Stub\ConsoleOutput;
 
 /**
@@ -85,7 +86,7 @@ public function exec($command, array $input = [])
                 ->will($this->returnValue($in));
         }
 
-        $args = $this->_commandStringToArgs("bin/cake $command");
+        $args = $this->_commandStringToArgs("cake $command");
 
         $io = new ConsoleIo($this->_out, $this->_err, $this->_in);
 
@@ -163,8 +164,8 @@ public function assertErrorContains($expected)
     protected function _makeRunner()
     {
         if ($this->_useCommandRunner) {
-            // not implemented yet
-            return;
+            $applicationClassName = Configure::read('App.namespace') . '\Application';
+            return new CommandRunner(new $applicationClassName([CONFIG]));
         }
 
         return new LegacyCommandRunner();

diff --git a/tests/TestCase/TestSuite/ConsoleIntegrationTestCaseTest.php b/tests/TestCase/TestSuite/ConsoleIntegrationTestCaseTest.php
@@ -20,6 +20,21 @@ public function setUp()
         Configure::write('App.namespace', 'TestApp');
     }
 
+    /**
+     * tests exec when using the command runner
+     *
+     * @return void
+     */
+    public function testExecWithCommandRunner()
+    {
+        $this->enableCommandRunner();
+
+        $this->exec('routes');
+
+        $this->assertOutputContains('Welcome to CakePHP');
+        $this->assertExitCode(Shell::CODE_SUCCESS);
+    }
+
     /**
      * tests exec
      *