diff --git a/lib/Cake/Console/Command/Task/FixtureTask.php b/lib/Cake/Console/Command/Task/FixtureTask.php index 600efc04559..d0329e944af 100644 --- a/lib/Cake/Console/Command/Task/FixtureTask.php +++ b/lib/Cake/Console/Command/Task/FixtureTask.php @@ -178,9 +178,13 @@ protected function _interactive() { */ public function importOptions($modelName) { $options = array(); + $plugin = ''; + if (isset($this->params['plugin'])) { + $plugin = $this->params['plugin'] . '.'; + } if (!empty($this->params['schema'])) { - $options['schema'] = $modelName; + $options['schema'] = $plugin . $modelName; } elseif ($this->interactive) { $doSchema = $this->in(__d('cake_console', 'Would you like to import schema for this fixture?'), array('y', 'n'), 'n'); if ($doSchema === 'y') { diff --git a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php index d10df07862d..01a7b2b275d 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php @@ -136,6 +136,19 @@ public function testImportOptionsWithCommandLineOptions() { $this->assertEquals($expected, $result); } +/** + * test importOptions with overwriting CLI options + * + * @return void + */ + public function testImportOptionsWithCommandLineOptionsPlugin() { + $this->Task->params = array('schema' => true, 'records' => true, 'plugin' => 'TestPlugin'); + + $result = $this->Task->importOptions('Article'); + $expected = array('schema' => 'TestPlugin.Article', 'fromTable' => true); + $this->assertEquals($expected, $result); + } + /** * test importOptions with schema. *