adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-06-04 22:03:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' into 2.1

Browse source 
Conflicts:
	lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
	lib/Cake/Test/Case/Error/ExceptionRendererTest.php
	lib/Cake/Test/Case/Utility/DebuggerTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
This commit is contained in:
mark_story 2011-11-16 21:31:16 -05:00
commit fa0ec44dfd
114 changed files with 6789 additions and 6418 deletions
lib/Cake/Test/Case/Error
ExceptionRendererTest.php

26
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
View file

@ -203,7 +203,7 @@ class ExceptionRendererTest extends CakeTestCase {
$ExceptionRenderer->render();
$result = ob_get_clean();
$this->assertEqual($result, 'widget thing is missing');
$this->assertEquals($result, 'widget thing is missing');
}
/**
@ -216,13 +216,13 @@ class ExceptionRendererTest extends CakeTestCase {
$exception = new MissingWidgetThingException('Widget not found');
$ExceptionRenderer = $this->_mockResponse(new MyCustomExceptionRenderer($exception));
$this->assertEqual('missingWidgetThing', $ExceptionRenderer->method);
$this->assertEquals('missingWidgetThing', $ExceptionRenderer->method);
ob_start();
$ExceptionRenderer->render();
$result = ob_get_clean();
$this->assertEqual($result, 'widget thing is missing', 'Method declared in subclass converted to error400');
$this->assertEquals($result, 'widget thing is missing', 'Method declared in subclass converted to error400');
}
/**
@ -236,13 +236,13 @@ class ExceptionRendererTest extends CakeTestCase {
$exception = new MissingControllerException('PostsController');
$ExceptionRenderer = $this->_mockResponse(new MyCustomExceptionRenderer($exception));
$this->assertEqual('error400', $ExceptionRenderer->method);
$this->assertEquals('error400', $ExceptionRenderer->method);
ob_start();
$ExceptionRenderer->render();
$result = ob_get_clean();
$this->assertPattern('/Not Found/', $result, 'Method declared in error handler not converted to error400. %s');
$this->assertRegExp('/Not Found/', $result, 'Method declared in error handler not converted to error400. %s');
}
/**
@ -378,8 +378,8 @@ class ExceptionRendererTest extends CakeTestCase {
$ExceptionRenderer->render();
$result = ob_get_clean();
$this->assertPattern('/<h2>Custom message<\/h2>/', $result);
$this->assertPattern("/<strong>'.*?\/posts\/view\/1000'<\/strong>/", $result);
$this->assertRegExp('/<h2>Custom message<\/h2>/', $result);
$this->assertRegExp("/<strong>'.*?\/posts\/view\/1000'<\/strong>/", $result);
}
/**
@ -424,8 +424,8 @@ class ExceptionRendererTest extends CakeTestCase {
$ExceptionRenderer->render();
$result = ob_get_clean();
$this->assertNoPattern('#<script>document#', $result);
$this->assertNoPattern('#alert\(t\);</script>#', $result);
$this->assertNotRegExp('#<script>document#', $result);
$this->assertNotRegExp('#alert\(t\);</script>#', $result);
}
/**
@ -443,7 +443,7 @@ class ExceptionRendererTest extends CakeTestCase {
$ExceptionRenderer->render();
$result = ob_get_clean();
$this->assertPattern('/<h2>An Internal Error Has Occurred<\/h2>/', $result);
$this->assertRegExp('/<h2>An Internal Error Has Occurred<\/h2>/', $result);
}
/**
@ -459,8 +459,8 @@ class ExceptionRendererTest extends CakeTestCase {
$ExceptionRenderer->render();
$result = ob_get_clean();
$this->assertPattern('/<h2>Missing Controller<\/h2>/', $result);
$this->assertPattern('/<em>PostsController<\/em>/', $result);
$this->assertRegExp('/<h2>Missing Controller<\/h2>/', $result);
$this->assertRegExp('/<em>PostsController<\/em>/', $result);
}
/**
@ -614,7 +614,7 @@ class ExceptionRendererTest extends CakeTestCase {
$result = ob_get_clean();
foreach ($patterns as $pattern) {
$this->assertPattern($pattern, $result);
$this->assertRegExp($pattern, $result);
}
}