Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix failing tests.

* New properties on view caused fails in Debugger.
* Element cache keys have changed with the new refactoring.
  • Loading branch information...
commit 369bbcc964741a26139290683dc075e8b9d357f8 1 parent 2967a4d
@markstory markstory authored
View
1  lib/Cake/Test/Case/Utility/DebuggerTest.php
@@ -327,6 +327,7 @@ public function testExportVar() {
request => object(CakeRequest) {}
response => object(CakeResponse) {}
elementCache => 'default'
+ elementCacheSettings => array()
int => (int) 2
float => (float) 1.333
}
View
8 lib/Cake/Test/Case/View/ViewTest.php
@@ -661,7 +661,7 @@ public function testElement() {
*
*/
public function testElementCallbacks() {
- $this->getMock('HtmlHelper', array(), array($this->View), 'ElementCallbackMockHtmlHelper');
+ $this->getMock('Helper', array(), array($this->View), 'ElementCallbackMockHtmlHelper');
$this->View->helpers = array('ElementCallbackMockHtml');
$this->View->loadHelpers();
@@ -725,13 +725,13 @@ public function testElementCache() {
$expected = 'this is the test element';
$this->assertEquals($expected, $result);
- $result = Cache::read('element__test_element_cache', 'test_view');
+ $result = Cache::read('element__test_element_cache_callbacks', 'test_view');
$this->assertEquals($expected, $result);
$result = $View->element('test_element', array('param' => 'one', 'foo' => 'two'), array('cache' => true));
$this->assertEquals($expected, $result);
- $result = Cache::read('element__test_element_cache_param_foo', 'test_view');
+ $result = Cache::read('element__test_element_cache_callbacks_param_foo', 'test_view');
$this->assertEquals($expected, $result);
$result = $View->element('test_element', array(
@@ -750,7 +750,7 @@ public function testElementCache() {
), array(
'cache' => array('config' => 'test_view'),
));
- $result = Cache::read('element__test_element_cache_param_foo', 'test_view');
+ $result = Cache::read('element__test_element_cache_callbacks_param_foo', 'test_view');
$this->assertEquals($expected, $result);
Cache::clear(true, 'test_view');
Please sign in to comment.
Something went wrong with that request. Please try again.