Fixed failing test for CakeResponse::sharable + spacing

This commit is contained in:
Costa Caruso 2014-07-03 15:03:48 -04:00
parent 1164c0bcad
commit 4f559f5cc9
2 changed files with 2 additions and 1 deletions

View file

@ -838,6 +838,7 @@ class CakeResponse {
$this->_cacheDirectives['private'] = true; $this->_cacheDirectives['private'] = true;
unset($this->_cacheDirectives['public']); unset($this->_cacheDirectives['public']);
} }
$this->maxAge($time); $this->maxAge($time);
if (!$time) { if (!$time) {
$this->_setCacheControl(); $this->_setCacheControl();

View file

@ -751,7 +751,7 @@ class CakeResponseTest extends CakeTestCase {
$response = new CakeResponse; $response = new CakeResponse;
$response->sharable(true, 3600); $response->sharable(true, 3600);
$headers = $response->header(); $headers = $response->header();
$this->assertEquals('public, s-maxage=3600', $headers['Cache-Control']); $this->assertEquals('public, max-age=3600', $headers['Cache-Control']);
$response = new CakeResponse; $response = new CakeResponse;
$response->sharable(false, 3600); $response->sharable(false, 3600);