Add tests for SCSSCacher

Signed-off-by: Julius Härtl <jus@bitgrid.net>

lib/private/Template/SCSSCacher.php

@@ -29,6 +29,7 @@ use OC\SystemConfig;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFolder;
+use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IURLGenerator;
 
@@ -43,8 +44,8 @@ class SCSSCacher {
 	/** @var IURLGenerator */
 	protected $urlGenerator;
 
-	/** @var SystemConfig */
-	protected $systemConfig;
+	/** @var IConfig */
+	protected $config;
 
 	/** @var string */
 	protected $serverRoot;
@@ -59,12 +60,12 @@ class SCSSCacher {
 	public function __construct(ILogger $logger,
 								IAppData $appData,
 								IURLGenerator $urlGenerator,
-								SystemConfig $systemConfig,
+								IConfig $config,
 								$serverRoot) {
 		$this->logger = $logger;
 		$this->appData = $appData;
 		$this->urlGenerator = $urlGenerator;
-		$this->systemConfig = $systemConfig;
+		$this->config = $config;
 		$this->serverRoot = $serverRoot;
 	}
 
@@ -162,7 +163,7 @@ class SCSSCacher {
 			$path,
 			\OC::$SERVERROOT . '/core/css/',
 		]);
-		if($this->systemConfig->getValue('debug')) {
+		if($this->config->getSystemValue('debug')) {
 			// Debug mode
 			$scss->setFormatter(Expanded::class);
 			$scss->setLineNumberStyle(Compiler::LINE_COMMENTS);
@@ -213,7 +214,7 @@ class SCSSCacher {
 	private function rebaseUrls($css, $webDir) {
 		$re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x';
 		// OC\Route\Router:75
-		if(($this->systemConfig->getValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
+		if(($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
 			$subst = 'url(\'../../'.$webDir.'/$1\')';	
 		} else {
 			$subst = 'url(\'../../../'.$webDir.'/$1\')';

lib/private/TemplateLayout.php

@@ -218,7 +218,7 @@ class TemplateLayout extends \OC_Template {
 				\OC::$server->getLogger(),
 				\OC::$server->getAppDataDir('css'),
 				\OC::$server->getURLGenerator(),
-				\OC::$server->getSystemConfig(),
+				\OC::$server->getConfig(),
 				\OC::$SERVERROOT
 			);
 		} else {

tests/lib/Template/SCSSCacherTest.php

@@ -0,0 +1,108 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\Template;
+
+use OC\Template\SCSSCacher;
+use OCP\Files\IAppData;
+use OCP\Files\NotFoundException;
+use OCP\Files\SimpleFS\ISimpleFile;
+use OCP\Files\SimpleFS\ISimpleFolder;
+use OCP\IConfig;
+use OCP\ILogger;
+use OCP\IURLGenerator;
+
+class SCSSCacherTest extends \Test\TestCase {
+	/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
+	protected $logger;
+	/** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */
+	protected $appData;
+	/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+	protected $urlGenerator;
+	/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
+	/** @var \OC_Defaults|\PHPUnit_Framework_MockObject_MockObject */
+	protected $defaults;
+	/** @var SCSSCacher */
+	protected $scssCacher;
+
+	protected function setUp() {
+		parent::setUp();
+		$this->logger = $this->createMock(ILogger::class);
+		$this->appData = $this->createMock(IAppData::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+		$this->config = $this->createMock(IConfig::class);
+		$this->defaults = $this->createMock(\OC_Defaults::class);
+		$this->scssCacher = new SCSSCacher(
+			$this->logger,
+			$this->appData,
+			$this->urlGenerator,
+			$this->config,
+			$this->defaults
+		);
+	}
+
+	public function testProcess() {
+
+	}
+
+	public function testVariablesChangedNotFound() {
+		$mtime = filemtime(\OC::$SERVERROOT . '/core/css/variables.scss');
+		$file = $this->createMock(ISimpleFile::class);
+		$folder = $this->createMock(ISimpleFolder::class);
+		$folder->expects($this->once())
+			->method('getFile')
+			->with('styles.scss')
+			->willThrowException(new NotFoundException());
+		$this->assertTrue($this->invokePrivate($this->scssCacher, 'variablesChanged', ['styles.scss', $folder]));
+	}
+
+	public function testVariablesChangedOlder() {
+		$mtime = filemtime(\OC::$SERVERROOT . '/core/css/variables.scss');
+		$file = $this->createMock(ISimpleFile::class);
+		$folder = $this->createMock(ISimpleFolder::class);
+		$folder->expects($this->once())
+			->method('getFile')
+			->with('styles.scss')
+			->willReturn($file);
+		$file->expects($this->once())
+			->method('getMTime')
+			->willReturn($mtime-100);
+		$this->assertTrue($this->invokePrivate($this->scssCacher, 'variablesChanged', ['styles.scss', $folder]));
+	}
+
+	public function testVariablesChangedNewer() {
+		$mtime = filemtime(\OC::$SERVERROOT . '/core/css/variables.scss');
+		$file = $this->createMock(ISimpleFile::class);
+		$folder = $this->createMock(ISimpleFolder::class);
+		$folder->expects($this->once())
+			->method('getFile')
+			->with('styles.scss')
+			->willReturn($file);
+		$file->expects($this->once())
+			->method('getMTime')
+			->willReturn($mtime+100);
+		$this->assertFalse($this->invokePrivate($this->scssCacher, 'variablesChanged', ['styles.scss', $folder]));
+	}
+
+}