diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2018-01-16 22:45:31 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-03-19 14:21:53 +0100 |
| commit | 796b4f19f8f8f8a989e122fd603ce8db9daa0fc7 (patch) | |
| tree | eee62aa6418723d1547040862f71accbac20f615 /tests/Core/Controller | |
| parent | 9834f33d56f64f63b0f05c149418b2c83d5fa37d (diff) | |
| download | nextcloud-server-796b4f19f8f8f8a989e122fd603ce8db9daa0fc7.tar.gz nextcloud-server-796b4f19f8f8f8a989e122fd603ce8db9daa0fc7.zip | |
Add Cache-control: immutable
Cache generated CSS forever!
Also cache combined JS forever
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests/Core/Controller')
| -rw-r--r-- | tests/Core/Controller/CssControllerTest.php | 12 | ||||
| -rw-r--r-- | tests/Core/Controller/JsControllerTest.php | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php index c78233d8917..8ec15f449a0 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -109,10 +109,10 @@ class CssControllerTest extends TestCase { ->willReturn($file); $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']); - $expected->cacheFor(86400); + $expected->addHeader('Cache-Control', 'max-age=31536000, immutable'); $expires = new \DateTime(); $expires->setTimestamp(1337); - $expires->add(new \DateInterval('PT24H')); + $expires->add(new \DateInterval('PT31536000S')); $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123)); $expected->addHeader('Pragma', 'cache'); @@ -137,10 +137,10 @@ class CssControllerTest extends TestCase { $expected = new FileDisplayResponse($gzipFile, Http::STATUS_OK, ['Content-Type' => 'text/css']); $expected->addHeader('Content-Encoding', 'gzip'); - $expected->cacheFor(86400); + $expected->addHeader('Cache-Control', 'max-age=31536000, immutable'); $expires = new \DateTime(); $expires->setTimestamp(1337); - $expires->add(new \DateInterval('PT24H')); + $expires->add(new \DateInterval('PT31536000S')); $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123)); $expected->addHeader('Pragma', 'cache'); @@ -170,10 +170,10 @@ class CssControllerTest extends TestCase { ->willReturn('gzip, deflate'); $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']); - $expected->cacheFor(86400); + $expected->addHeader('Cache-Control', 'max-age=31536000, immutable'); $expires = new \DateTime(); $expires->setTimestamp(1337); - $expires->add(new \DateInterval('PT24H')); + $expires->add(new \DateInterval('PT31536000S')); $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123)); $expected->addHeader('Pragma', 'cache'); diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 571318c89d0..3910045276b 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -109,10 +109,10 @@ class JsControllerTest extends TestCase { ->willReturn($file); $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']); - $expected->cacheFor(86400); + $expected->addHeader('Cache-Control', 'max-age=31536000, immutable'); $expires = new \DateTime(); $expires->setTimestamp(1337); - $expires->add(new \DateInterval('PT24H')); + $expires->add(new \DateInterval('PT31536000S')); $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123)); $expected->addHeader('Pragma', 'cache'); @@ -137,10 +137,10 @@ class JsControllerTest extends TestCase { $expected = new FileDisplayResponse($gzipFile, Http::STATUS_OK, ['Content-Type' => 'application/javascript']); $expected->addHeader('Content-Encoding', 'gzip'); - $expected->cacheFor(86400); + $expected->addHeader('Cache-Control', 'max-age=31536000, immutable'); $expires = new \DateTime(); $expires->setTimestamp(1337); - $expires->add(new \DateInterval('PT24H')); + $expires->add(new \DateInterval('PT31536000S')); $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123)); $expected->addHeader('Pragma', 'cache'); @@ -170,10 +170,10 @@ class JsControllerTest extends TestCase { ->willReturn('gzip, deflate'); $expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'application/javascript']); - $expected->cacheFor(86400); + $expected->addHeader('Cache-Control', 'max-age=31536000, immutable'); $expires = new \DateTime(); $expires->setTimestamp(1337); - $expires->add(new \DateInterval('PT24H')); + $expires->add(new \DateInterval('PT31536000S')); $expected->addHeader('Expires', $expires->format(\DateTime::RFC1123)); $expected->addHeader('Pragma', 'cache'); |