more tests

Model/MyModel.php

@@ -854,7 +854,8 @@ class MyModel extends Model {
 	 * 2011-06-21 ms
 	 */
 	public function validateKey($data = array(), $options = array()) {
-		$key = array_shift(array_keys($data));
+		$keys = array_keys($data);
+		$key = array_shift($keys);
 		$value = array_shift($data);
 
 		$schema = $this->schema($key);
@@ -885,9 +886,10 @@ class MyModel extends Model {
 	 * @return bool Success
 	 * 2010-02-09 ms
 	 */
-	public function validateEnum($field = array(), $enum = null, $additionalKeys = array()) {
-		$valueKey = array_shift(array_keys($field)); # auto-retrieve
-		$value = $field[$valueKey];
+	public function validateEnum(array $data, $enum = null, $additionalKeys = array()) {
+		$keys = array_keys($data);
+		$valueKey = array_shift($keys);
+		$value = $data[$valueKey];
 		$keys = array();
 		if ($enum === true) {
 			$enum = $valueKey;

Test/Case/Model/MyModelTest.php

@@ -44,16 +44,16 @@ class MyModelTest extends MyCakeTestCase {
 			2 => 'bar',
 		);
 
-		$res = User::enum(null, $array, false);
+		$res = AppTestModel::enum(null, $array, false);
 		$this->assertEquals($array, $res);
 
-		$res = User::enum(2, $array, false);
+		$res = AppTestModel::enum(2, $array, false);
 		$this->assertEquals('bar', $res);
 
-		$res = User::enum('2', $array, false);
+		$res = AppTestModel::enum('2', $array, false);
 		$this->assertEquals('bar', $res);
 
-		$res = User::enum(3, $array, false);
+		$res = AppTestModel::enum(3, $array, false);
 		$this->assertFalse($res);
 	}
 
@@ -537,11 +537,11 @@ class MyModelTest extends MyCakeTestCase {
 
 		$data = array('field' => '/some/link');
 		$res = $this->App->validateUrl($data, array('deep'=>false, 'autoComplete'=>true));
-		$this->assertTrue($res);
+		$this->assertTrue($_SERVER['HTTP_HOST'] === 'localhost' ? !$res : $res);
 
 		$data = array('field' => 'http://'.$_SERVER['HTTP_HOST'].'/some/link');
 		$res = $this->App->validateUrl($data, array('deep'=>false));
-		$this->assertTrue($res);
+		$this->assertTrue($_SERVER['HTTP_HOST'] === 'localhost' ? !$res : $res);
 
 		$data = array('field' => '/some/link');
 		$res = $this->App->validateUrl($data, array('deep'=>false, 'autoComplete'=>false));
@@ -551,7 +551,7 @@ class MyModelTest extends MyCakeTestCase {
 
 		$data = array('field' => '/some/link');
 		$res = $this->App->validateUrl($data, array('deep'=>false, 'sameDomain'=>true));
-		$this->assertTrue($res);
+		$this->assertTrue($_SERVER['HTTP_HOST'] === 'localhost' ? !$res : $res);
 
 		$data = array('field' => 'https://github.com/');
 		$res = $this->App->validateUrl($data, array('deep'=>false));
@@ -570,6 +570,10 @@ class Post extends MyModel {
 
 }
 
+class User extends MyModel {
+
+}
+
 class AppTestModel extends MyModel {
 
 	public $useTable = false;