tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix unit tests

Browse Source
This commit is contained in:
Damian Mooyman 2018-06-13 14:09:31 +12:00
parent aa1ba0ef90
commit 6f32762268
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Control/Middleware/HTTPCacheControlMiddleware.php
View File

@ -92,7 +92,7 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
* *
* @var string * @var string
*/ */
protected $state = self::STATE_ENABLED; protected $state = self::STATE_DISABLED;
/** /**
* Forcing level of previous setting; higher number wins * Forcing level of previous setting; higher number wins

1
tests/php/Control/HTTPCacheControlIntegrationTest.php
View File

@ -4,7 +4,6 @@ namespace SilverStripe\Control\Tests;
use SilverStripe\Control\HTTP; use SilverStripe\Control\HTTP;
use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware; use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware;
use SilverStripe\Control\Session;
use SilverStripe\Control\Tests\HTTPCacheControlIntegrationTest\RuleController; use SilverStripe\Control\Tests\HTTPCacheControlIntegrationTest\RuleController;
use SilverStripe\Control\Tests\HTTPCacheControlIntegrationTest\SessionController; use SilverStripe\Control\Tests\HTTPCacheControlIntegrationTest\SessionController;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;

2
tests/php/Control/HTTPTest.php
View File

@ -75,7 +75,7 @@ class HTTPTest extends FunctionalTest
$this->expectException(PHPUnit_Framework_Error_Warning::class); $this->expectException(PHPUnit_Framework_Error_Warning::class);
$this->expectExceptionMessage( $this->expectExceptionMessage(
'Cache-Control header has already been set. ' 'Cache-Control header has already been set. '
. 'Please use HTTPCacheControl API to set caching options instead.' . 'Please use HTTPCacheControlMiddleware API to set caching options instead.'
); );
HTTP::add_cache_headers($response); HTTP::add_cache_headers($response);