adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-02 15:49:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing failing tests.

Browse source
This commit is contained in:
mark_story 2011-11-28 21:36:44 -05:00
parent 168c6f14c2
commit a56ad0ccac
2 changed files with 6 additions and 6 deletions
lib/Cake/Test/Case
Controller/Component
RequestHandlerComponentTest.php
TestSuite
ControllerTestCaseTest.php

10
lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
View file

@ -468,13 +468,13 @@ class RequestHandlerComponentTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testRenderAsCalledTwice() { public function testRenderAsCalledTwice() {
$this->RequestHandler->renderAs($this->Controller, 'xml'); $this->RequestHandler->renderAs($this->Controller, 'print');
$this->assertEquals($this->Controller->viewPath, 'RequestHandlerTest' . DS . 'xml'); $this->assertEquals('RequestHandlerTest' . DS . 'print', $this->Controller->viewPath);
$this->assertEquals($this->Controller->layoutPath, 'xml'); $this->assertEquals('print', $this->Controller->layoutPath);
$this->RequestHandler->renderAs($this->Controller, 'js'); $this->RequestHandler->renderAs($this->Controller, 'js');
$this->assertEquals($this->Controller->viewPath, 'RequestHandlerTest' . DS . 'js'); $this->assertEquals('RequestHandlerTest' . DS . 'js', $this->Controller->viewPath);
$this->assertEquals($this->Controller->layoutPath, 'js'); $this->assertEquals('js', $this->Controller->layoutPath);
$this->assertTrue(in_array('Js', $this->Controller->helpers)); $this->assertTrue(in_array('Js', $this->Controller->helpers));
} }

2
lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
View file

@ -290,7 +290,7 @@ class ControllerTestCaseTest extends CakeTestCase {
$controller = $this->Case->generate('TestsApps'); $controller = $this->Case->generate('TestsApps');
$controller->Components->load('RequestHandler'); $controller->Components->load('RequestHandler');
$result = $this->Case->testAction('/tests_apps/index.json', array('return' => 'view')); $result = $this->Case->testAction('/tests_apps/index.json', array('return' => 'contents'));
$result = json_decode($result, true); $result = json_decode($result, true);
$expected = array('cakephp' => 'cool'); $expected = array('cakephp' => 'cool');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);