Updating tests to reflect changes in bake templates.

cakephp · Nov 13, 2010 · faa23e8 · faa23e8
1 parent 01894b3
commit faa23e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cake/tests/cases/console/shells/tasks/controller.test.php b/cake/tests/cases/console/shells/tasks/controller.test.php
@@ -344,8 +344,8 @@ public function testBakeActionsUsingSessions() {
 		$this->assertContains("\$this->set('bakeArticle', \$this->BakeArticle->read(null, \$id)", $result);
 
 		$this->assertContains('function add()', $result);
-		$this->assertContains('if (!empty($this->data))', $result);
-		$this->assertContains('if ($this->BakeArticle->save($this->data))', $result);
+		$this->assertContains("if (\$this->request->is('post'))", $result);
+		$this->assertContains('if ($this->BakeArticle->save($this->request->data))', $result);
 		$this->assertContains("\$this->Session->setFlash(__('The bake article has been saved'));", $result);
 
 		$this->assertContains('function edit($id = null)', $result);
@@ -386,8 +386,8 @@ public function testBakeActionsWithNoSessions() {
 		$this->assertContains("\$this->set('bakeArticle', \$this->BakeArticle->read(null, \$id)", $result);
 
 		$this->assertContains('function add()', $result);
-		$this->assertContains('if (!empty($this->data))', $result);
-		$this->assertContains('if ($this->BakeArticle->save($this->data))', $result);
+		$this->assertContains("if (\$this->request->is('post'))", $result);
+		$this->assertContains('if ($this->BakeArticle->save($this->request->data))', $result);
 
 		$this->assertContains("\$this->flash(__('The bake article has been saved.'), array('action' => 'index'))", $result);
 

diff --git a/cake/tests/cases/console/shells/tasks/test.test.php b/cake/tests/cases/console/shells/tasks/test.test.php
@@ -363,7 +363,7 @@ public function testRegistryClearWhenBuildingTestObjects() {
 		));
 		$keys = ClassRegistry::keys();
 		$this->assertTrue(in_array('test_task_comment', $keys));
-		$object =& $this->Task->buildTestSubject('Model', 'TestTaskComment');
+		$object = $this->Task->buildTestSubject('Model', 'TestTaskComment');
 
 		$keys = ClassRegistry::keys();
 		$this->assertFalse(in_array('random', $keys));
@@ -444,7 +444,7 @@ public function testBakeModelTest() {
 		$this->assertContains('class TestTaskArticleTestCase extends CakeTestCase', $result);
 
 		$this->assertContains('function startTest()', $result);
-		$this->assertContains("\$this->TestTaskArticle =& ClassRegistry::init('TestTaskArticle')", $result);
+		$this->assertContains("\$this->TestTaskArticle = ClassRegistry::init('TestTaskArticle')", $result);
 
 		$this->assertContains('function endTest()', $result);
 		$this->assertContains('unset($this->TestTaskArticle)', $result);