Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Grabbing the first available config defined in connection manager as …

…a default for baking. Fixing a couple of failing test cases
  • Loading branch information...
commit d08f916179096e7fe2840741a4b34b2e26d93fa0 1 parent 84f8054
@lorenzo lorenzo authored
View
4 lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -355,14 +355,14 @@ public function getConfig() {
App::uses('ConnectionManager', 'Model');
$configs = ConnectionManager::enumConnectionObjects();
- $useDbConfig = 'default';
+ $useDbConfig = current($configs);
if (!is_array($configs) || empty($configs)) {
return $this->execute();
}
$connections = array_keys($configs);
if (count($connections) > 1) {
- $useDbConfig = $this->in(__d('cake_console', 'Use Database Config') .':', $connections, 'default');
+ $useDbConfig = $this->in(__d('cake_console', 'Use Database Config') .':', $connections, $useDbConfig);
}
return $useDbConfig;
}
View
16 lib/Cake/Console/Command/Task/TestTask.php
@@ -190,15 +190,10 @@ public function getObjectType() {
* @return string Class name the user chose.
*/
public function getClassName($objectType) {
- $type = strtolower($objectType);
+ $type = ucfirst(strtolower($objectType));
+ $typeLength = strlen($type);
+ $type = $this->classTypes[$type];
if ($this->plugin) {
- if ($type === 'helper') {
- $type = 'View/Helper';
- } elseif ($type === 'component') {
- $type = 'Controller/Component';
- } elseif ($type === 'behavior') {
- $type = 'Model/Behavior';
- }
$plugin = $this->plugin . '.';
$options = App::objects($plugin . $type);
} else {
@@ -212,7 +207,10 @@ public function getClassName($objectType) {
}
$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
if (isset($options[$selection - 1])) {
- return $options[$selection - 1];
+ $selection = $options[$selection - 1];
+ }
+ if ($type !== 'Model') {
+ $selection = substr($selection, 0, $typeLength * - 1);
}
return $selection;
}
View
2  lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
@@ -543,7 +543,7 @@ public function testInteractiveWithPlugin() {
CakePlugin::load('TestPlugin');
$this->Task->plugin = 'TestPlugin';
- $path = $testApp . 'TestPlugin' . DS . 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperHelperTest.php';
+ $path = $testApp . 'TestPlugin' . DS . 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperTest.php';
$this->Task->expects($this->any())
->method('in')
->will($this->onConsecutiveCalls(
Please sign in to comment.
Something went wrong with that request. Please try again.