diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-07-13 22:31:07 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2017-07-19 00:10:46 +0200 |
commit | 2ebafb06fdef6aad4bc32316ece14faa60f9e9c4 (patch) | |
tree | d74e544be9826b914de1458a99027cfd52a097a4 /tests | |
parent | 1f1504e071d38dffd274cd9b4123d2093a6beb3e (diff) | |
download | nextcloud-server-2ebafb06fdef6aad4bc32316ece14faa60f9e9c4.tar.gz nextcloud-server-2ebafb06fdef6aad4bc32316ece14faa60f9e9c4.zip |
Properly handle if the deps file if for some reason empty
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/Template/JSCombinerTest.php | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php index 89bb13338c8..d6583d4a450 100644 --- a/tests/lib/Template/JSCombinerTest.php +++ b/tests/lib/Template/JSCombinerTest.php @@ -31,6 +31,7 @@ use OCP\Files\NotPermittedException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\ICache; +use OCP\ILogger; use OCP\IURLGenerator; class JSCombinerTest extends \Test\TestCase { @@ -44,6 +45,8 @@ class JSCombinerTest extends \Test\TestCase { protected $depsCache; /** @var JSCombiner */ protected $jsCombiner; + /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + protected $logger; protected function setUp() { parent::setUp(); @@ -52,11 +55,14 @@ class JSCombinerTest extends \Test\TestCase { $this->urlGenerator = $this->createMock(IURLGenerator::class); $this->config = $this->createMock(SystemConfig::class); $this->depsCache = $this->createMock(ICache::class); + $this->logger = $this->createMock(ILogger::class); $this->jsCombiner = new JSCombiner( $this->appData, $this->urlGenerator, $this->depsCache, - $this->config); + $this->config, + $this->logger + ); } public function testProcessDebugMode() { @@ -284,6 +290,23 @@ class JSCombinerTest extends \Test\TestCase { $this->assertFalse($actual); } + public function testIsCachedWithoutContent() { + $fileName = 'combine.json'; + $folder = $this->createMock(ISimpleFolder::class); + $file = $this->createMock(ISimpleFile::class); + $folder->method('getFile') + ->with('combine.js.deps') + ->willReturn($file); + $file->expects($this->once()) + ->method('getContent') + ->willReturn(''); + $this->logger->expects($this->once()) + ->method('info') + ->with('JSCombiner: deps file empty: combine.js.deps'); + $actual = self::invokePrivate($this->jsCombiner, 'isCached', [$fileName, $folder]); + $this->assertFalse($actual); + } + public function testCacheNoFile() { $fileName = 'combine.js'; |