Allow dist install tests

.travis.yml

@@ -27,7 +27,7 @@ matrix:
 
 before_script:
   - composer self-update
-  - composer install --no-interaction --dev
+  - composer install --no-interaction --prefer-dist
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"
   - sh -c "if [ '$RUN_COVERAGE' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"

composer.json

@@ -33,7 +33,9 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "BakeTest\\": "tests/test_app/Plugin/BakeTest/src",
             "Bake\\Test\\": "tests",
+            "Bake\\Test\\App\\": "tests/test_app/App",
             "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
         }
     }

src/Shell/BakeShell.php

@@ -104,7 +104,6 @@ public function main()
     public function loadTasks()
     {
         $tasks = [];
-        $tasks = $this->_findTasks($tasks, CAKE, 'Cake');
 
         $tasks = $this->_findTasks($tasks, APP, Configure::read('App.namespace'));
         foreach (Plugin::loaded() as $plugin) {

src/Shell/Task/FixtureTask.php

@@ -45,7 +45,7 @@ class FixtureTask extends BakeTask
     public function getPath()
     {
         $dir = 'Fixture/';
-        $path = TESTS . $dir;
+        $path = ROOT . DS . 'tests' . DS . $dir;
         if (isset($this->plugin)) {
             $path = $this->_pluginPath($this->plugin) . 'tests/' . $dir;
         }

src/Shell/Task/TestTask.php

@@ -126,7 +126,7 @@ public function outputTypeChoices()
      * Output a list of possible classnames you might want to generate a test for.
      *
      * @param string $type The typename to get classes for.
-     * @return void
+     * @return array
      */
     public function outputClassChoices($type)
     {
@@ -142,6 +142,8 @@ public function outputClassChoices($type)
         }
         $this->out('');
         $this->out('Re-run your command as `cake bake ' . $type . ' <classname>`');
+
+        return $options;
     }
 
     /**
@@ -196,7 +198,12 @@ public function bake($type, $className)
 
         $subject = $className;
         list($namespace, $className) = namespaceSplit($fullClassName);
-        list($baseNamespace, $subNamespace) = explode('\\', $namespace, 2);
+
+        $baseNamespace = Configure::read('App.namespace');
+        if ($this->plugin) {
+            $baseNamespace = str_replace('/', '\\', $this->plugin);
+        }
+        $subNamespace = substr($namespace, strlen($baseNamespace) + 1);
 
         $this->out("\n" . sprintf('Baking test case for %s ...', $fullClassName), 1, Shell::QUIET);
 
@@ -510,7 +517,7 @@ public function generateUses($type, $fullClassName)
     public function getPath()
     {
         $dir = 'TestCase/';
-        $path = TESTS . $dir;
+        $path = ROOT . DS . 'tests' . DS . $dir;
         if (isset($this->plugin)) {
             $path = $this->_pluginPath($this->plugin) . 'tests/' . $dir;
         }

tests/TestCase/Shell/BakeShellTest.php

@@ -43,7 +43,7 @@ public function setUp()
             ['in', 'out', 'hr', 'err', 'createFile', '_stop'],
             [$this->io]
         );
-        Configure::write('App.namespace', 'TestApp');
+        Configure::write('App.namespace', 'Bake\Test\App');
     }
 
     /**

tests/TestCase/Shell/Task/FixtureTaskTest.php

@@ -89,7 +89,7 @@ public function testInitializeCopyConnection()
      */
     public function testGetPath()
     {
-        $this->assertPathEquals(TESTS . 'Fixture/', $this->Task->getPath());
+        $this->assertPathEquals(ROOT . DS . 'tests' . DS . 'Fixture/', $this->Task->getPath());
     }
 
     /**
@@ -152,7 +152,7 @@ public function testMainWithTableOption()
     {
         $this->Task->connection = 'test';
         $this->Task->params = ['table' => 'comments'];
-        $filename = $this->_normalizePath(TESTS . 'Fixture/ArticlesFixture.php');
+        $filename = $this->_normalizePath(ROOT . DS . 'tests' . DS . 'Fixture/ArticlesFixture.php');
 
         $this->Task->expects($this->at(0))
             ->method('createFile')
@@ -192,12 +192,12 @@ public function testMainIntoAll()
             ->method('listAll')
             ->will($this->returnValue(['articles', 'comments']));
 
-        $filename = $this->_normalizePath(TESTS . 'Fixture/ArticlesFixture.php');
+        $filename = $this->_normalizePath(ROOT . DS . 'tests' . DS . 'Fixture/ArticlesFixture.php');
         $this->Task->expects($this->at(0))
             ->method('createFile')
             ->with($filename, $this->stringContains('class ArticlesFixture'));
 
-        $filename = $this->_normalizePath(TESTS . 'Fixture/CommentsFixture.php');
+        $filename = $this->_normalizePath(ROOT . DS . 'tests' . DS . 'Fixture/CommentsFixture.php');
         $this->Task->expects($this->at(1))
             ->method('createFile')
             ->with($filename, $this->stringContains('class CommentsFixture'));
@@ -218,12 +218,12 @@ public function testAllWithCountAndRecordsFlags()
         $this->Task->Model->expects($this->any())->method('listAll')
             ->will($this->returnValue(['Articles', 'comments']));
 
-        $filename = $this->_normalizePath(TESTS . 'Fixture/ArticlesFixture.php');
+        $filename = $this->_normalizePath(ROOT . DS . 'tests' . DS . 'Fixture/ArticlesFixture.php');
         $this->Task->expects($this->at(0))
             ->method('createFile')
             ->with($filename, $this->stringContains("'title' => 'Third Article'"));
 
-        $filename = $this->_normalizePath(TESTS . 'Fixture/CommentsFixture.php');
+        $filename = $this->_normalizePath(ROOT . DS . 'tests' . DS . 'Fixture/CommentsFixture.php');
         $this->Task->expects($this->at(1))
             ->method('createFile')
             ->with($filename, $this->stringContains("'comment' => 'First Comment for First Article'"));
@@ -246,11 +246,11 @@ public function testAllWithSchemaImport()
         $this->Task->Model->expects($this->any())->method('listAll')
             ->will($this->returnValue(['Articles', 'comments']));
 
-        $filename = $this->_normalizePath(TESTS . 'Fixture/ArticlesFixture.php');
+        $filename = $this->_normalizePath(ROOT . DS . 'tests' . DS . 'Fixture/ArticlesFixture.php');
         $this->Task->expects($this->at(0))->method('createFile')
             ->with($filename, $this->stringContains("public \$import = ['model' => 'Articles'"));
 
-        $filename = $this->_normalizePath(TESTS . 'Fixture/CommentsFixture.php');
+        $filename = $this->_normalizePath(ROOT . DS . 'tests' . DS . 'Fixture/CommentsFixture.php');
         $this->Task->expects($this->at(1))->method('createFile')
             ->with($filename, $this->stringContains("public \$import = ['model' => 'Comments'"));
         $this->Task->expects($this->exactly(2))->method('createFile');
@@ -367,7 +367,7 @@ public function testRecordGenerationForBinaryAndFloat()
     public function testGenerateFixtureFile()
     {
         $this->Task->connection = 'test';
-        $filename = $this->_normalizePath(TESTS . 'Fixture/ArticlesFixture.php');
+        $filename = $this->_normalizePath(ROOT . DS . 'tests' . DS . 'Fixture/ArticlesFixture.php');
 
         $this->Task->expects($this->at(0))
             ->method('createFile')

tests/TestCase/Shell/Task/ModelTaskTest.php

@@ -220,7 +220,7 @@ public function testApplyAssociations()
      */
     public function testApplyAssociationsConcreteClass()
     {
-        Configure::write('App.namespace', 'TestApp');
+        Configure::write('App.namespace', 'Bake\Test\App');
         $articles = TableRegistry::get('Articles');
         $assocs = [
             'belongsTo' => [

tests/TestCase/Shell/Task/ProjectTaskTest.php

@@ -85,19 +85,4 @@ public function testExecuteWithAbsolutePath()
         $contents = $File->read();
         $this->assertRegExp('/define\(\'CAKE_CORE_INCLUDE_PATH\', .*?DS/', $contents);
     }
-
-    /**
-     * Copy the TestApp route file so it can be modified.
-     *
-     * @return void
-     */
-    protected function _cloneRoutes()
-    {
-        $File = new File(TEST_APP . 'TestApp/Config/routes.php');
-        $contents = $File->read();
-
-        mkdir(TMP . 'BakeTestApp/Config/', 0777, true);
-        $File = new File(TMP . 'BakeTestApp/Config/routes.php');
-        $File->write($contents);
-    }
 }

tests/TestCase/Shell/Task/SimpleBakeTaskTest.php

@@ -113,7 +113,7 @@ public function testMainWithPlugin()
      */
     public function testBake()
     {
-        Configure::write('App.namespace', 'TestApp');
+        Configure::write('App.namespace', 'Bake\Test\App');
 
         $this->Task->expects($this->once())
             ->method('createFile')

tests/TestCase/Shell/Task/TemplateTaskTest.php

@@ -61,7 +61,7 @@ public function testGenerate()
     {
         $this->Task->expects($this->any())->method('in')->will($this->returnValue(1));
 
-        $result = $this->Task->generate('classes/test_object', ['test' => 'foo']);
+        $result = $this->Task->generate('example', ['test' => 'foo']);
         $this->assertSameAsFile(__FUNCTION__ . '.ctp', $result);
     }
 

tests/TestCase/Shell/Task/TestTaskTest.php

@@ -16,6 +16,9 @@
 
 use Bake\Shell\Task\TemplateTask;
 use Bake\Shell\Task\TestTask;
+use Bake\Test\App\Controller\PostsController;
+use Bake\Test\App\Model\Table\ArticlesTable;
+use Bake\Test\App\Model\Table\CategoryThreadsTable;
 use Bake\Test\TestCase\TestCase;
 use Cake\Controller\Controller;
 use Cake\Core\App;
@@ -25,9 +28,6 @@
 use Cake\Network\Response;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
-use TestApp\Controller\PostsController;
-use TestApp\Model\Table\ArticlesTable;
-use TestApp\Model\Table\CategoryThreadsTable;
 
 /**
  * TestTaskTest class
@@ -162,23 +162,13 @@ public function testExecuteWithTwoArgs()
      */
     public function testOutputClassOptionsForTable()
     {
-        $this->io->expects($this->at(0))
-            ->method('out')
-            ->with($this->stringContains('You must provide'));
-        $this->io->expects($this->at(1))
-            ->method('out')
-            ->with($this->stringContains('1. ArticlesTable'));
-        $this->io->expects($this->at(2))
-            ->method('out')
-            ->with($this->stringContains('2. ArticlesTagsTable'));
-        $this->io->expects($this->at(3))
-            ->method('out')
-            ->with($this->stringContains('3. AuthUsersTable'));
-        $this->io->expects($this->at(4))
-            ->method('out')
-            ->with($this->stringContains('4. AuthorsTable'));
+        $expected = [
+            'ArticlesTable',
+            'CategoryThreadsTable'
+        ];
 
-        $this->Task->outputClassChoices('Table');
+        $choices = $this->Task->outputClassChoices('Table');
+        $this->assertSame($expected, $choices);
     }
 
     /**
@@ -188,23 +178,17 @@ public function testOutputClassOptionsForTable()
      */
     public function testOutputClassOptionsForTablePlugin()
     {
-        Plugin::load('TestPlugin');
+        Plugin::load('BakeTest');
+        $this->Task->plugin = 'BakeTest';
 
-        $this->Task->plugin = 'TestPlugin';
-        $this->io->expects($this->at(0))
-            ->method('out')
-            ->with($this->stringContains('You must provide'));
-        $this->io->expects($this->at(1))
-            ->method('out')
-            ->with($this->stringContains('1. AuthorsTable'));
-        $this->io->expects($this->at(2))
-            ->method('out')
-            ->with($this->stringContains('2. CommentsTable'));
-        $this->io->expects($this->at(3))
-            ->method('out')
-            ->with($this->stringContains('3. TestPluginCommentsTable'));
+        $expected = [
+            'AuthorsTable',
+            'BakeTestCommentsTable',
+            'CommentsTable'
+        ];
 
-        $this->Task->outputClassChoices('Table');
+        $choices = $this->Task->outputClassChoices('Table');
+        $this->assertSame($expected, $choices);
     }
 
     /**
@@ -215,7 +199,7 @@ public function testOutputClassOptionsForTablePlugin()
      */
     public function testMethodIntrospection()
     {
-        $result = $this->Task->getTestableMethods('TestApp\Model\Table\ArticlesTable');
+        $result = $this->Task->getTestableMethods('Bake\Test\App\Model\Table\ArticlesTable');
         $expected = ['initialize', 'findpublished', 'dosomething', 'dosomethingelse'];
         $this->assertEquals($expected, array_map('strtolower', $result));
     }
@@ -375,7 +359,7 @@ public function testBakeModelTest()
      */
     public function testBakeControllerTest()
     {
-        Configure::write('App.namespace', 'TestApp');
+        Configure::write('App.namespace', 'Bake\Test\App');
 
         $this->Task->expects($this->once())
             ->method('createFile')
@@ -392,7 +376,7 @@ public function testBakeControllerTest()
      */
     public function testBakePrefixControllerTest()
     {
-        Configure::write('App.namespace', 'TestApp');
+        Configure::write('App.namespace', 'Bake\Test\App');
 
         $this->Task->expects($this->once())
             ->method('createFile')
@@ -410,7 +394,7 @@ public function testBakePrefixControllerTest()
      */
     public function testBakeComponentTest()
     {
-        Configure::write('App.namespace', 'TestApp');
+        Configure::write('App.namespace', 'Bake\Test\App');
 
         $this->Task->expects($this->once())
             ->method('createFile')
@@ -600,7 +584,7 @@ public static function caseFileNameProvider()
     public function testTestCaseFileName($type, $class, $expected)
     {
         $result = $this->Task->testCaseFileName($type, $class);
-        $this->assertPathEquals(TESTS . $expected, $result);
+        $this->assertPathEquals(ROOT . DS . 'tests' . DS . $expected, $result);
     }
 
     /**