Fixing tests, removed a return; where it should not be and corrected …

…an assert.
CakeDC · Feb 5, 2014 · 2095306 · 2095306
1 parent 940bfa5
commit 2095306
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Lib/CakeMigration.php b/Lib/CakeMigration.php
@@ -188,6 +188,7 @@ public function __construct($options = array()) {
 		}
 
 		$allowed = array('connection', 'callback');
+
 		foreach ($allowed as $variable) {
 			if (!empty($options[$variable])) {
 				$this->{$variable} = $options[$variable];

diff --git a/Test/Case/Console/Command/MigrationShellTest.php b/Test/Case/Console/Command/MigrationShellTest.php
@@ -240,7 +240,6 @@ public function testRun() {
 			'callback' => $this->Shell,
 			'version' => 0,
 			'direction' => 'down',
-			'reset' => true,
 			'dry' => false,
 			'precheck' => null)));
 		$this->Shell->args = array('reset');

diff --git a/Test/Case/Lib/MigrationVersionTest.php b/Test/Case/Lib/MigrationVersionTest.php
@@ -243,7 +243,7 @@ public function testRun() {
 		$Version->expects($this->at(3))->method('setVersion')->with(4, 'mocks', true);
 
 		$this->assertTrue($Version->run(array('direction' => 'up', 'type' => 'mocks')));
-		return;
+
 		// direction => down
 		$Version->expects($this->at(0))->method('getVersion')->will($this->returnValue(4));
 		$Version->expects($this->at(1))->method('getMapping')->will($this->returnValue($this->_mapping(1, 4)));