upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Fix tests

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-03-28 23:13:59 +02:00
parent 54f9b35f71
commit a40405531c
No known key found for this signature in database
GPG key ID: F941078878347C0C
3 changed files with 117 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Template/SCSSCacher.php
View file

@ -197,7 +197,7 @@ class SCSSCacher {
$data = $this->rebaseUrls($compiledScss, $webDir);
$cachedfile->putContent($data);
$depFile->putContent(json_encode($scss->getParsedFiles()));
$gzipFile->putContent(gzencode($data), 9);
$gzipFile->putContent(gzencode($data, 9));
$this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
return true;
} catch(NotPermittedException $e) {

83
tests/lib/Template/JSCombinerTest.php
View file

@ -22,6 +22,7 @@
*/
namespace Test\Template;
use function foo\func;
use OC\SystemConfig;
use OC\Template\JSCombiner;
use OCP\Files\IAppData;
@ -100,17 +101,18 @@ class JSCombinerTest extends \Test\TestCase {
$this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willThrowException(new NotFoundException());
$this->appData->expects($this->once())->method('newFolder')->with('awesomeapp')->willReturn($folder);
$file = $this->createMock(ISimpleFile::class);
$gzfile = $this->createMock(ISimpleFile::class);
$fileDeps = $this->createMock(ISimpleFile::class);
$folder->method('getFile')
->will($this->returnCallback(function($path) use ($file) {
->will($this->returnCallback(function($path) use ($file, $gzfile) {
if ($path === 'combine.js') {
return $file;
}
if ($path === 'combine.js.deps') {
} else if ($path === 'combine.js.deps') {
throw new NotFoundException();
} else if ($path === 'combine.js.gz') {
return $gzfile;
}
$this->fail();
}));
@ -137,17 +139,17 @@ class JSCombinerTest extends \Test\TestCase {
$folder = $this->createMock(ISimpleFolder::class);
$this->appData->expects($this->once())->method('getFolder')->with('awesomeapp')->willReturn($folder);
$file = $this->createMock(ISimpleFile::class);
$fileDeps = $this->createMock(ISimpleFile::class);
$gzfile = $this->createMock(ISimpleFile::class);
$folder->method('getFile')
->will($this->returnCallback(function($path) use ($file) {
->will($this->returnCallback(function($path) use ($file, $gzfile) {
if ($path === 'combine.js') {
return $file;
}
if ($path === 'combine.js.deps') {
} else if ($path === 'combine.js.deps') {
throw new NotFoundException();
} else if ($path === 'combine.js.gz') {
return $gzfile;
}
$this->fail();
}));
@ -288,16 +290,28 @@ class JSCombinerTest extends \Test\TestCase {
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
$depsFile = $this->createMock(ISimpleFile::class);
$gzFile = $this->createMock(ISimpleFile::class);
$path = __DIR__ . '/data/';
$folder->expects($this->at(0))->method('getFile')->with($fileName)->willThrowException(new NotFoundException());
$folder->expects($this->at(1))->method('newFile')->with($fileName)->willReturn($file);
$folder->expects($this->at(2))->method('getFile')->with($fileName . '.deps')->willThrowException(new NotFoundException());
$folder->expects($this->at(3))->method('newFile')->with($fileName . '.deps')->willReturn($depsFile);
$folder->method('getFile')->willThrowException(new NotFoundException());
$folder->method('newFile')->will($this->returnCallback(
function ($filename) use ($file, $depsFile, $gzFile) {
if ($filename === 'combine.js') {
return $file;
} else if ($filename === 'combine.js.deps') {
return $depsFile;
} else if ($filename === 'combine.js.gz') {
return $gzFile;
}
$this->fail();
}
));
$file->expects($this->once())->method('putContent');
$depsFile->expects($this->once())->method('putContent');
$gzFile->expects($this->once())->method('putContent');
$actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
$this->assertTrue($actual);
@ -309,14 +323,26 @@ class JSCombinerTest extends \Test\TestCase {
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
$depsFile = $this->createMock(ISimpleFile::class);
$gzFile = $this->createMock(ISimpleFile::class);
$path = __DIR__ . '/data/';
$folder->expects($this->at(0))->method('getFile')->with($fileName)->willReturn($file);
$folder->expects($this->at(1))->method('getFile')->with($fileName . '.deps')->willReturn($depsFile);
$folder->method('getFile')->will($this->returnCallback(
function ($filename) use ($file, $depsFile, $gzFile) {
if ($filename === 'combine.js') {
return $file;
} else if ($filename === 'combine.js.deps') {
return $depsFile;
} else if ($filename === 'combine.js.gz') {
return $gzFile;
}
$this->fail();
}
));
$file->expects($this->once())->method('putContent');
$depsFile->expects($this->once())->method('putContent');
$gzFile->expects($this->once())->method('putContent');
$actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
$this->assertTrue($actual);
@ -364,11 +390,23 @@ var b = \'world\';
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
$depsFile = $this->createMock(ISimpleFile::class);
$gzFile = $this->createMock(ISimpleFile::class);
$path = __DIR__ . '/data/';
$folder->expects($this->at(0))->method('getFile')->with($fileName)->willReturn($file);
$folder->expects($this->at(1))->method('getFile')->with($fileName . '.deps')->willReturn($depsFile);
$folder->method('getFile')->will($this->returnCallback(
function ($filename) use ($file, $depsFile, $gzFile) {
if ($filename === 'combine.js') {
return $file;
} else if ($filename === 'combine.js.deps') {
return $depsFile;
} else if ($filename === 'combine.js.gz') {
return $gzFile;
}
$this->fail();
}
));
$file->expects($this->at(0))
->method('putContent')
@ -385,6 +423,17 @@ var b = \'world\';
return array_key_exists(__DIR__ . '/data//1.js', $deps)
&& array_key_exists(__DIR__ . '/data//2.js', $deps);
}));
$gzFile->expects($this->at(0))->method('putContent')->with($this->callback(
function ($content) {
return gzdecode($content) === 'var a = \'hello\';
var b = \'world\';
';
}
));
$actual = self::invokePrivate($this->jsCombiner, 'cache', [$path, 'combine.json', $folder]);
$this->assertTrue($actual);

61
tests/lib/Template/SCSSCacherTest.php
View file

@ -73,13 +73,16 @@ class SCSSCacherTest extends \Test\TestCase {
$file = $this->createMock(ISimpleFile::class);
$file->expects($this->any())->method('getSize')->willReturn(1);
$fileDeps = $this->createMock(ISimpleFile::class);
$gzfile = $this->createMock(ISimpleFile::class);
$folder->method('getFile')
->will($this->returnCallback(function($path) use ($file) {
->will($this->returnCallback(function($path) use ($file, $gzfile) {
if ($path === 'styles.css') {
return $file;
} else if ($path === 'styles.css.deps') {
throw new NotFoundException();
} else if ($path === 'styles.css.gz') {
return $gzfile;
} else {
$this->fail();
}
@ -99,14 +102,17 @@ class SCSSCacherTest extends \Test\TestCase {
$file = $this->createMock(ISimpleFile::class);
$file->expects($this->any())->method('getSize')->willReturn(1);
$fileDeps = $this->createMock(ISimpleFile::class);
$gzfile = $this->createMock(ISimpleFile::class);
$folder->method('getFile')
->will($this->returnCallback(function($path) use ($file) {
->will($this->returnCallback(function($path) use ($file, $gzfile) {
if ($path === 'styles.css') {
return $file;
} else if ($path === 'styles.css.deps') {
throw new NotFoundException();
} else {
} else if ($path === 'styles.css.gz') {
return $gzfile;
}else {
$this->fail();
}
}));
@ -211,17 +217,26 @@ class SCSSCacherTest extends \Test\TestCase {
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
$depsFile = $this->createMock(ISimpleFile::class);
$gzipFile = $this->createMock(ISimpleFile::class);
$webDir = "core/css";
$path = \OC::$SERVERROOT . '/core/css/';
$folder->expects($this->at(0))->method('getFile')->with($fileNameCSS)->willThrowException(new NotFoundException());
$folder->expects($this->at(1))->method('newFile')->with($fileNameCSS)->willReturn($file);
$folder->expects($this->at(2))->method('getFile')->with($fileNameCSS . '.deps')->willThrowException(new NotFoundException());
$folder->expects($this->at(3))->method('newFile')->with($fileNameCSS . '.deps')->willReturn($depsFile);
$folder->method('getFile')->willThrowException(new NotFoundException());
$folder->method('newFile')->will($this->returnCallback(function($fileName) use ($file, $depsFile, $gzipFile) {
if ($fileName === 'styles.css') {
return $file;
} else if ($fileName === 'styles.css.deps') {
return $depsFile;
} else if ($fileName === 'styles.css.gz') {
return $gzipFile;
}
throw new \Exception();
}));
$file->expects($this->once())->method('putContent');
$depsFile->expects($this->once())->method('putContent');
$gzipFile->expects($this->once())->method('putContent');
$actual = self::invokePrivate($this->scssCacher, 'cache', [$path, $fileNameCSS, $fileNameSCSS, $folder, $webDir]);
$this->assertTrue($actual);
@ -233,15 +248,25 @@ class SCSSCacherTest extends \Test\TestCase {
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
$depsFile = $this->createMock(ISimpleFile::class);
$gzipFile = $this->createMock(ISimpleFile::class);
$webDir = "core/css";
$path = \OC::$SERVERROOT;
$folder->expects($this->at(0))->method('getFile')->with($fileNameCSS)->willReturn($file);
$folder->expects($this->at(1))->method('getFile')->with($fileNameCSS . '.deps')->willReturn($depsFile);
$folder->method('getFile')->will($this->returnCallback(function($fileName) use ($file, $depsFile, $gzipFile) {
if ($fileName === 'styles.css') {
return $file;
} else if ($fileName === 'styles.css.deps') {
return $depsFile;
} else if ($fileName === 'styles.css.gz') {
return $gzipFile;
}
throw new \Exception();
}));
$file->expects($this->once())->method('putContent');
$depsFile->expects($this->once())->method('putContent');
$gzipFile->expects($this->once())->method('putContent');
$actual = self::invokePrivate($this->scssCacher, 'cache', [$path, $fileNameCSS, $fileNameSCSS, $folder, $webDir]);
$this->assertTrue($actual);
@ -253,12 +278,21 @@ class SCSSCacherTest extends \Test\TestCase {
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
$depsFile = $this->createMock(ISimpleFile::class);
$gzipFile = $this->createMock(ISimpleFile::class);
$webDir = "tests/data/scss";
$path = \OC::$SERVERROOT . $webDir;
$folder->expects($this->at(0))->method('getFile')->with($fileNameCSS)->willReturn($file);
$folder->expects($this->at(1))->method('getFile')->with($fileNameCSS . '.deps')->willReturn($depsFile);
$folder->method('getFile')->will($this->returnCallback(function($fileName) use ($file, $depsFile, $gzipFile) {
if ($fileName === 'styles-success.css') {
return $file;
} else if ($fileName === 'styles-success.css.deps') {
return $depsFile;
} else if ($fileName === 'styles-success.css.gz') {
return $gzipFile;
}
throw new \Exception();
}));
$file->expects($this->at(0))->method('putContent')->with($this->callback(
function ($content){
@ -270,6 +304,11 @@ class SCSSCacherTest extends \Test\TestCase {
return array_key_exists(\OC::$SERVERROOT . '/core/css/variables.scss', $deps)
&& array_key_exists(\OC::$SERVERROOT . '/tests/data/scss/styles-success.scss', $deps);
}));
$gzipFile->expects($this->at(0))->method('putContent')->with($this->callback(
function ($content) {
return gzdecode($content) === 'body{background-color:#0082c9}';
}
));
$actual = self::invokePrivate($this->scssCacher, 'cache', [$path, $fileNameCSS, $fileNameSCSS, $folder, $webDir]);
$this->assertTrue($actual);