diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-03-29 00:11:51 -0600 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2017-03-29 00:11:51 -0600 |
commit | 9813023aabfb37256dac4d2eea5574f91f8897e2 (patch) | |
tree | 5a8fc5c3113df74b566ccc1878d5e243d8e49233 /tests | |
parent | 05f25963117f4829f5eae3c23d0e4c40cdbc0abf (diff) | |
download | nextcloud-server-9813023aabfb37256dac4d2eea5574f91f8897e2.tar.gz nextcloud-server-9813023aabfb37256dac4d2eea5574f91f8897e2.zip |
Fix gzip files for Safari
* Safari support gzip only if the filename does not
end on .gz - so this renames them to .gzip
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Core/Controller/CssControllerTest.php | 2 | ||||
-rw-r--r-- | tests/Core/Controller/JsControllerTest.php | 2 | ||||
-rw-r--r-- | tests/lib/Template/JSCombinerTest.php | 10 | ||||
-rw-r--r-- | tests/lib/Template/SCSSCacherTest.php | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php index 7fa358e056e..30bbc12809e 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -121,7 +121,7 @@ class CssControllerTest extends TestCase { ->willReturn($folder); $folder->method('getFile') - ->with('file.css.gz') + ->with('file.css.gzip') ->willReturn($gzipFile); $this->request->method('getHeader') diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 8f48a7c3390..8456ba8b6e3 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -120,7 +120,7 @@ class JsControllerTest extends TestCase { ->willReturn($folder); $folder->method('getFile') - ->with('file.js.gz') + ->with('file.js.gzip') ->willReturn($gzipFile); $this->request->method('getHeader') diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php index 1e6234a062c..89bb13338c8 100644 --- a/tests/lib/Template/JSCombinerTest.php +++ b/tests/lib/Template/JSCombinerTest.php @@ -111,7 +111,7 @@ class JSCombinerTest extends \Test\TestCase { return $file; } else if ($path === 'combine.js.deps') { throw new NotFoundException(); - } else if ($path === 'combine.js.gz') { + } else if ($path === 'combine.js.gzip') { return $gzfile; } $this->fail(); @@ -148,7 +148,7 @@ class JSCombinerTest extends \Test\TestCase { return $file; } else if ($path === 'combine.js.deps') { throw new NotFoundException(); - } else if ($path === 'combine.js.gz') { + } else if ($path === 'combine.js.gzip') { return $gzfile; } $this->fail(); @@ -302,7 +302,7 @@ class JSCombinerTest extends \Test\TestCase { return $file; } else if ($filename === 'combine.js.deps') { return $depsFile; - } else if ($filename === 'combine.js.gz') { + } else if ($filename === 'combine.js.gzip') { return $gzFile; } $this->fail(); @@ -333,7 +333,7 @@ class JSCombinerTest extends \Test\TestCase { return $file; } else if ($filename === 'combine.js.deps') { return $depsFile; - } else if ($filename === 'combine.js.gz') { + } else if ($filename === 'combine.js.gzip') { return $gzFile; } $this->fail(); @@ -401,7 +401,7 @@ var b = \'world\'; return $file; } else if ($filename === 'combine.js.deps') { return $depsFile; - } else if ($filename === 'combine.js.gz') { + } else if ($filename === 'combine.js.gzip') { return $gzFile; } $this->fail(); diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php index 887fa1ed605..24865b9ae45 100644 --- a/tests/lib/Template/SCSSCacherTest.php +++ b/tests/lib/Template/SCSSCacherTest.php @@ -81,7 +81,7 @@ class SCSSCacherTest extends \Test\TestCase { return $file; } else if ($path === 'styles.css.deps') { throw new NotFoundException(); - } else if ($path === 'styles.css.gz') { + } else if ($path === 'styles.css.gzip') { return $gzfile; } else { $this->fail(); @@ -110,7 +110,7 @@ class SCSSCacherTest extends \Test\TestCase { return $file; } else if ($path === 'styles.css.deps') { throw new NotFoundException(); - } else if ($path === 'styles.css.gz') { + } else if ($path === 'styles.css.gzip') { return $gzfile; }else { $this->fail(); @@ -228,7 +228,7 @@ class SCSSCacherTest extends \Test\TestCase { return $file; } else if ($fileName === 'styles.css.deps') { return $depsFile; - } else if ($fileName === 'styles.css.gz') { + } else if ($fileName === 'styles.css.gzip') { return $gzipFile; } throw new \Exception(); @@ -258,7 +258,7 @@ class SCSSCacherTest extends \Test\TestCase { return $file; } else if ($fileName === 'styles.css.deps') { return $depsFile; - } else if ($fileName === 'styles.css.gz') { + } else if ($fileName === 'styles.css.gzip') { return $gzipFile; } throw new \Exception(); @@ -288,7 +288,7 @@ class SCSSCacherTest extends \Test\TestCase { return $file; } else if ($fileName === 'styles-success.css.deps') { return $depsFile; - } else if ($fileName === 'styles-success.css.gz') { + } else if ($fileName === 'styles-success.css.gzip') { return $gzipFile; } throw new \Exception(); |