fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 20:44:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Disable CSS/JS concatenation during legacy unit tests

Browse source
This commit is contained in:
Kijin Sung 2016-05-04 21:57:48 +09:00
parent ad86e03c5e
commit 9a30c10ce8
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -8,9 +8,10 @@
class FrontEndFileHandler extends Handler class FrontEndFileHandler extends Handler
{ {
/** /**
* Minification configuration. * Minification and concatenation configuration.
*/ */
public static $minify = null; public static $minify = null;
public static $concat = null;
/** /**
* Map for css * Map for css
@ -353,7 +354,7 @@ class FrontEndFileHandler extends Handler
$map = &$this->cssMap; $map = &$this->cssMap;
$mapIndex = &$this->cssMapIndex; $mapIndex = &$this->cssMapIndex;
$minify = self::$minify !== null ? self::$minify : (config('view.minify_scripts') ?: 'common'); $minify = self::$minify !== null ? self::$minify : (config('view.minify_scripts') ?: 'common');
$concat = strpos(config('view.concat_scripts'), 'css') !== false; $concat = strpos(self::$concat !== null ? self::$concat : config('view.concat_scripts'), 'css') !== false;
$this->_sortMap($map, $mapIndex); $this->_sortMap($map, $mapIndex);
// Minify all scripts, and compile LESS/SCSS into CSS. // Minify all scripts, and compile LESS/SCSS into CSS.
@ -446,7 +447,7 @@ class FrontEndFileHandler extends Handler
} }
$minify = self::$minify !== null ? self::$minify : (config('view.minify_scripts') ?: 'common'); $minify = self::$minify !== null ? self::$minify : (config('view.minify_scripts') ?: 'common');
$concat = strpos(config('view.concat_scripts'), 'js') !== false; $concat = strpos(self::$concat !== null ? self::$concat : config('view.concat_scripts'), 'js') !== false;
$this->_sortMap($map, $mapIndex); $this->_sortMap($map, $mapIndex);
// Minify all scripts. // Minify all scripts.

1
tests/unit/classes/FrontEndFileHandlerTest.php
View file

@ -15,6 +15,7 @@ class FrontEndFileHandlerTest extends \Codeception\TestCase\Test
HTMLDisplayHandler::$reservedCSS = '/xxx$/'; HTMLDisplayHandler::$reservedCSS = '/xxx$/';
HTMLDisplayHandler::$reservedJS = '/xxx$/'; HTMLDisplayHandler::$reservedJS = '/xxx$/';
FrontEndFileHandler::$minify = 'none'; FrontEndFileHandler::$minify = 'none';
FrontEndFileHandler::$concat = 'none';
$this->specify("js(head)", function() { $this->specify("js(head)", function() {
$handler = new FrontEndFileHandler(); $handler = new FrontEndFileHandler();