Updating model tests to reflect deprecation of Model::bind() and Model::delete() aliases.

Author: markstory

cake/tests/cases/libs/model/behaviors/containable.test.php

@@ -57,17 +57,15 @@ function startTest() {
 		$this->Article =& ClassRegistry::init('Article');
 		$this->Tag =& ClassRegistry::init('Tag');
 
-		$this->User->bind(array(
-			'Article' => array('type' => 'hasMany'),
-			'ArticleFeatured' => array('type' => 'hasMany'),
-			'Comment' => array('type' => 'hasMany')
-		));
+		$this->User->bindModel(array(
+			'hasMany' => array('Article', 'ArticleFeatured', 'Comment')
+		), false);
 		$this->User->ArticleFeatured->unbindModel(array('belongsTo' => array('Category')), false);
 		$this->User->ArticleFeatured->hasMany['Comment']['foreignKey'] = 'article_id';
 
-		$this->Tag->bind(array(
-			'Article' => array('type' => 'hasAndBelongsToMany')
-		));
+		$this->Tag->bindModel(array(
+			'hasAndBelongsToMany' => array('Article')
+		), false);
 
 		$this->User->Behaviors->attach('Containable');
 		$this->Article->Behaviors->attach('Containable');

cake/tests/cases/libs/model/model_read.test.php

@@ -4519,25 +4519,39 @@ function testBindUnbind() {
 		);
 		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
 
-		$TestModel2->bind('FeatureSet', array(
-			'conditions' => array('active' => true)
+		$TestModel2->bindModel(array(
+			'belongsTo' => array(
+				'FeatureSet' => array(
+					'className' => 'FeatureSet',
+					'conditions' => array('active' => true)
+				)
+			)
 		));
 		$expected['conditions'] = array('active' => true);
 		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
 
-		$TestModel2->bind('FeatureSet', array(
-			'foreignKey' => false,
-			'conditions' => array('Feature.name' => 'DeviceType.name')
+		$TestModel2->bindModel(array(
+			'belongsTo' => array(
+				'FeatureSet' => array(
+					'className' => 'FeatureSet',
+					'foreignKey' => false,
+					'conditions' => array('Feature.name' => 'DeviceType.name')
+				)
+			)
 		));
 		$expected['conditions'] = array('Feature.name' => 'DeviceType.name');
 		$expected['foreignKey'] = false;
 		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
 
-		$TestModel2->bind('NewFeatureSet', array(
-			'type' => 'hasMany',
-			'className' => 'FeatureSet',
-			'conditions' => array('active' => true)
+		$TestModel2->bindModel(array(
+			'hasMany' => array(
+				'NewFeatureSet' => array(
+					'className' => 'FeatureSet',
+					'conditions' => array('active' => true)
+				)
+			)
 		));
+
 		$expected = array(
 			'className' => 'FeatureSet',
 			'conditions' => array('active' => true),

cake/tests/cases/libs/model/model_write.test.php

@@ -200,7 +200,9 @@ function testZeroDefaultFieldValue() {
 	function testNonNumericHabtmJoinKey() {
 		$this->loadFixtures('Post', 'Tag', 'PostsTag');
 		$Post =& new Post();
-		$Post->bind('Tag', array('type' => 'hasAndBelongsToMany'));
+		$Post->bindModel(array(
+			'hasAndBelongsToMany' => array('Tag')
+		));
 		$Post->Tag->primaryKey = 'tag';
 
 		$result = $Post->find('all');
@@ -423,7 +425,7 @@ function testCounterCacheDecrease() {
 		$User = new CounterCacheUser();
 		$Post = new CounterCachePost();
 
-		$Post->del(2);
+		$Post->delete(2);
 		$user = $User->find('first', array(
 			'conditions' => array('id' => 66),
 			'recursive' => -1
@@ -3086,7 +3088,7 @@ function testSaveAllHasOneValidation() {
 
 		$model->validate = array('comment' => 'notEmpty');
 		$model->Attachment->validate = array('attachment' => 'notEmpty');
-		$model->Attachment->bind('Comment');
+		$model->Attachment->bindModel(array('belongsTo' => array('Comment')));
 
 		$this->assertFalse($model->saveAll(
 			array(