Re-enable initValidation() tests.

cakephp · Mar 18, 2014 · dbf26ae · dbf26ae
1 parent de5ca36
commit dbf26ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Console/Command/Task/ModelTask.php b/src/Console/Command/Task/ModelTask.php
@@ -528,8 +528,8 @@ public function doValidation($model) {
  */
 	public function initValidations() {
 		$options = $choices = [];
-		if (class_exists('Validation')) {
-			$options = get_class_methods('Validation');
+		if (class_exists('Cake\Validation\Validation')) {
+			$options = get_class_methods('Cake\Validation\Validation');
 		}
 		sort($options);
 		$default = 1;

diff --git a/tests/TestCase/Console/Command/Task/ModelTaskTest.php b/tests/TestCase/Console/Command/Task/ModelTaskTest.php
@@ -296,7 +296,6 @@ public function testHasAndBelongsToManyGeneration() {
  * @return void
  */
 	public function testInitValidations() {
-		$this->markTestIncomplete('Not done here yet');
 		$result = $this->Task->initValidations();
 		$this->assertTrue(in_array('notEmpty', $result));
 	}