Remove dead options from fixture task.

The `import-records` option doesn't actually do anything anymore, so we don't need it. The generated import property is now correct as well. Refs #192
cakephp · Dec 4, 2015 · b72659a · b72659a
1 parent 20c48a8
commit b72659a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 35 deletions.
diff --git a/src/Shell/Task/FixtureTask.php b/src/Shell/Task/FixtureTask.php
@@ -82,9 +82,6 @@ public function getOptionParser()
             ' Used with --count and --conditions to limit which records are added to the fixture.',
             'short' => 'r',
             'boolean' => true
-        ])->addOption('import-records', [
-            'help' => 'Set to true to import records from the live table when the generated fixture is used.',
-            'boolean' => true
         ])->addOption('conditions', [
             'help' => 'The SQL snippet to use when importing records.',
             'default' => '1=1',
@@ -158,10 +155,7 @@ public function bake($model, $useTable = null)
         $importBits = [];
         if (!empty($this->params['schema'])) {
             $modelImport = true;
-            $importBits[] = "'model' => '{$model}'";
-        }
-        if (!empty($this->params['import-records'])) {
-            $importBits[] = "'records' => true";
+            $importBits[] = "'table' => '{$useTable}'";
         }
         if (!empty($importBits) && $this->connection !== 'default') {
             $importBits[] = "'connection' => '{$this->connection}'";
@@ -189,14 +183,14 @@ public function bake($model, $useTable = null)
             $schema = $this->_generateSchema($data);
         }
 
-        if (empty($this->params['records']) && empty($this->params['import-records'])) {
+        if (empty($this->params['records'])) {
             $recordCount = 1;
             if (isset($this->params['count'])) {
                 $recordCount = $this->params['count'];
             }
             $records = $this->_makeRecordString($this->_generateRecords($data, $recordCount));
         }
-        if (!empty($this->params['records']) && empty($this->params['import-records'])) {
+        if (!empty($this->params['records'])) {
             $records = $this->_makeRecordString($this->_getRecordsFromTable($model, $useTable));
         }
         return $this->generateFixtureFile($model, compact('records', 'table', 'schema', 'import'));

diff --git a/tests/TestCase/Shell/Task/FixtureTaskTest.php b/tests/TestCase/Shell/Task/FixtureTaskTest.php
@@ -266,11 +266,11 @@ public function testAllWithSchemaImport()
 
         $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'"));
+            ->with($filename, $this->stringContains("public \$import = ['table' => 'articles'"));
 
         $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'"));
+            ->with($filename, $this->stringContains("public \$import = ['table' => 'comments'"));
         $this->Task->expects($this->exactly(2))->method('createFile');
 
         $this->Task->all();
@@ -316,26 +316,6 @@ public function testBake()
         $result = $this->Task->main('Articles');
     }
 
-    /**
-     * test main() with importing records
-     *
-     * @return void
-     */
-    public function testMainImportRecords()
-    {
-        $this->Task->connection = 'test';
-        $this->Task->params = ['import-records' => true];
-
-        $this->Task->expects($this->at(0))
-            ->method('createFile')
-            ->with($this->anything(), $this->logicalAnd(
-                $this->stringContains("public \$import = ['records' => true, 'connection' => 'test'];"),
-                $this->logicalNot($this->stringContains('public $records'))
-            ));
-
-        $this->Task->main('Article');
-    }
-
     /**
      * test main() with importing schema.
      *
@@ -344,15 +324,15 @@ public function testMainImportRecords()
     public function testMainImportSchema()
     {
         $this->Task->connection = 'test';
-        $this->Task->params = ['schema' => true, 'import-records' => true];
+        $this->Task->params = ['schema' => true];
 
-        $importString = "public \$import = ['model' => 'Article', 'records' => true, 'connection' => 'test'];";
+        $importString = "public \$import = ['table' => 'comments', 'connection' => 'test'];";
         $this->Task->expects($this->once())
             ->method('createFile')
             ->with($this->anything(), $this->logicalAnd(
                 $this->stringContains($importString),
                 $this->logicalNot($this->stringContains('public $fields')),
-                $this->logicalNot($this->stringContains('public $records'))
+                $this->stringContains('public $records')
             ));
         $this->Task->bake('Article', 'comments');
     }

diff --git a/tests/comparisons/Fixture/testImportRecordsFromDatabase.php b/tests/comparisons/Fixture/testImportRecordsFromDatabase.php
@@ -15,7 +15,7 @@ class UsersFixture extends TestFixture
      *
      * @var array
      */
-    public $import = ['model' => 'Users', 'connection' => 'test'];
+    public $import = ['table' => 'users', 'connection' => 'test'];
 
     /**
      * Records