fixes #4373, #1640

tests/PHPUnit/Core/AssetManager/scripts/ExpectedMergeResultCore.js

+/* Piwik Javascript - cb={{{CACHE-BUSTER-JS}}}*/
+
+if(typeof SimpleObject!=='object'){SimpleObject=(function(){var privateVar;function privateMethod(param){privateVar=param;}
+return{publicMethod:function(){privateMethod('val');}}}());}
+var simpleArray=['el1','el2'];
+//This is a simple comment// customization via event
\ No newline at end of file

tests/PHPUnit/Core/AssetManager/scripts/ExpectedMergeResultNonCore.js

+/* Piwik Javascript - cb={{{CACHE-BUSTER-JS}}}*/
+
+alert('test');
\ No newline at end of file

tests/PHPUnit/Core/AssetManager/scripts/SimpleAlert.js

+alert('test');
\ No newline at end of file

tests/PHPUnit/Core/AssetManager/scripts/SimpleArray.js

+var simpleArray = ['el1', 'el2'];

tests/PHPUnit/Core/AssetManager/scripts/SimpleComments.js

+//This is a simple comment
\ No newline at end of file

tests/PHPUnit/Core/AssetManager/scripts/SimpleObject.js

+if (typeof SimpleObject !== 'object') {
+
+    SimpleObject = (function () {
+
+        var privateVar;
+
+        function privateMethod(param) {
+            privateVar = param;
+        }
+
+        return {
+
+            publicMethod: function () {
+                privateMethod('val');
+            }
+        }
+    }());
+}

tests/PHPUnit/Core/AssetManager/stylesheets/CssWithURLs.css

+h1 {
+    color: orange;
+    text-align: center;
+    /* url relative to root: must not be rewritten*/
+    background: url(tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png);
+}
+
+p {
+    font-size: 20px;
+    /* url relative to file: must be rewritten*/
+    background: url(images/test-image.png);
+}
\ No newline at end of file

tests/PHPUnit/Core/AssetManager/stylesheets/ExpectedMergeResult.css

+/* compile_me_once={{{CACHE-BUSTER-JS}}} */
+/* Piwik CSS file is compiled with Less. You may be interested in writing a custom Theme for Piwik! */
+#page #header {
+  color: white;
+}
+#footer {
+  color: red;
+}
+.box {
+  color: #fe33ac;
+  border-color: #fdcdea;
+}
+.box div {
+  -webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+  -moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+  box-shadow: 0 0 5px rgba(0,0,0,0.3);
+}
+h1 {
+  color: orange;
+  text-align: center;
+  background: url(tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png);
+}
+p {
+  font-size: 20px;
+  background: url(tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png);
+}
+body {
+  background-color: #b0c4de;
+}
+/* customization via event */
\ No newline at end of file

tests/PHPUnit/Core/AssetManager/stylesheets/ImportedLess.less

+@var: red;
+
+#page {
+  @var: white;
+  #header {
+    color: @var;
+  }
+}
+
+#footer {
+  color: @var;
+}
\ No newline at end of file

tests/PHPUnit/Core/AssetManager/stylesheets/SimpleBody.css

+body {
+    background-color:#b0c4de;
+}
\ No newline at end of file

tests/PHPUnit/Core/AssetManager/stylesheets/SimpleLess.less

+@import "ImportedLess";
+
+@base: #f938ab;
+
+.box-shadow(@style, @c) when (iscolor(@c)) {
+  -webkit-box-shadow: @style @c;
+  -moz-box-shadow:    @style @c;
+  box-shadow:         @style @c;
+}
+.box-shadow(@style, @alpha: 50%) when (isnumber(@alpha)) {
+  .box-shadow(@style, rgba(0, 0, 0, @alpha));
+}
+.box {
+  color: saturate(@base, 5%);
+  border-color: lighten(@base, 30%);
+  div { .box-shadow(0 0 5px, 30%) }
+}

tests/PHPUnit/Core/ServeStaticFileTest.php

@@ -477,8 +477,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase
 
     private function getCompressedFileLocation()
     {
-        $path = PIWIK_PATH_TEST_TO_ROOT . \Piwik\AssetManager::COMPRESSED_FILE_LOCATION . basename(TEST_FILE_LOCATION);
-        return \Piwik\SettingsPiwik::rewriteTmpPathWithHostname($path);
+        return \Piwik\AssetManager::getInstance()->getAssetDirectory() . '/' . basename(TEST_FILE_LOCATION);
     }
 
     private function removeCompressedFiles()

UI @ 673d21c6

-Subproject commit cbf0922b352e6592076908ee1fab095cd8e0642c
+Subproject commit 673d21c6a750d8280f4e9ab9d203072dd8d844d2

tests/PHPUnit/UITest.php

@@ -49,7 +49,7 @@ abstract class UITest extends IntegrationTestCase
 
         DbHelper::createAnonymousUser();
         
-        AssetManager::removeMergedAssets();
+        AssetManager::getInstance()->removeMergedAssets();
         
         // launch archiving so tests don't run out of time
         Rules::$purgeDisabledByTests = true;