Merge pull request #6483 from piwik/introducingBower

Introducing bower

5 files changed, 12 insertions, 11 deletions

diff --git a/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php b/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php
index 1ece0ca556..968c68c35f 100644
--- a/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php
+++ b/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php
@@ -26,8 +26,8 @@ class Piwik_Test_UIAssetMinifierTest extends PHPUnit_Framework_TestCase
     public function provider_isMinifiedJs()
     {
         return array(
-            array('libs/jquery/jquery.js', true),
-            array('libs/jquery/jquery-ui.js', true),
+            array('libs/bower_components/jquery/dist/jquery.min.js', true),
+            array('libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js', true),
             array('libs/jquery/jquery.browser.js', true),
             array('libs/jqplot/jqplot-custom.min.js', true),
             array('plugins/TreemapVisualization/libs/Jit/jit-2.0.1-yc.js', true),
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 9fefc14f11..0dadfea429 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -270,13 +270,14 @@ class Test_Piwik_ReleaseCheckListTest extends PHPUnit_Framework_TestCase
                 strpos($file, '/tests/') !== false ||
                 strpos($file, '/lang/') !== false ||
                 strpos($file, 'yuicompressor') !== false ||
+                strpos($file, '/libs/bower_components') !== false ||
                 strpos($file, '/tmp/') !== false
             ) {
                 continue;
             }
 
             // skip files with these file extensions
-            if (preg_match('/\.(bmp|fdf|gif|deb|deflate|exe|gz|ico|jar|jpg|p12|pdf|png|rar|swf|vsd|z|zip|ttf|so|dat|eps|phar|pyc)$/', $file)) {
+            if (preg_match('/\.(bmp|fdf|gif|deb|deflate|exe|gz|ico|jar|jpg|p12|pdf|png|rar|swf|vsd|z|zip|ttf|so|dat|eps|phar|pyc|gzip)$/', $file)) {
                 continue;
             }
 
diff --git a/tests/angularjs/karma.conf.js b/tests/angularjs/karma.conf.js
index 28889ffe94..237d39b57a 100755
--- a/tests/angularjs/karma.conf.js
+++ b/tests/angularjs/karma.conf.js
@@ -15,12 +15,12 @@ module.exports = function(config) {
     files: [
         'tests/angularjs/node_modules/chai/chai.js',
         'tests/angularjs/bootstrap.js',
-        'libs/angularjs/angular.min.js',
-        "libs/angularjs/angular-sanitize.min.js",
-        "libs/angularjs/angular-animate.min.js",
-        'libs/angularjs/angular-mocks.js',
-        'libs/jquery/jquery.js',
-        "libs/jquery/jquery-ui.js",
+        'libs/bower_components/angular/angular.min.js',
+        "libs/bower_components/angular-sanitize/angular-sanitize.js",
+        "libs/bower_components/angular-animate/angular-animate.js",
+        'libs/bower_components/angular-mocks/angular-mocks.js',
+        'libs/bower_components/jquery/dist/jquery.min.js',
+        "libs/bower_components/jquery-ui/jquery-ui.min.js",
         "plugins/CoreHome/javascripts/require.js",
         "plugins/Morpheus/javascripts/piwikHelper.js",
         "plugins/Morpheus/javascripts/ajaxHelper.js",
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index bb9d56d192..802cf492d9 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -72,7 +72,7 @@ testTrackPageViewAsync();
         bottom: 0px;
     }
 </style>
- <script src="../../libs/jquery/jquery.js" type="text/javascript"></script>
+ <script src="../../libs/bower_components/jquery/dist/jquery.min.js" type="text/javascript"></script>
  <script src="assets/qunit.js" type="text/javascript"></script>
  <script src="jslint/jslint.js" type="text/javascript"></script>
  <script type="text/javascript">
diff --git a/tests/travis/upload_artifacts.sh b/tests/travis/upload_artifacts.sh
index 325f0448b5..d083d747fe 100755
--- a/tests/travis/upload_artifacts.sh
+++ b/tests/travis/upload_artifacts.sh
@@ -53,7 +53,7 @@ else
             echo "`pwd`/screenshot-diffs"
 
             cp $base_dir/tests/lib/resemblejs/resemble.js screenshot-diffs
-            cp $base_dir/libs/jquery/jquery.js screenshot-diffs
+            cp $base_dir/libs/bower_components/jquery/dist/jquery.min.js screenshot-diffs/jquery.js
 
             echo "[NOTE] uploading following diffs:"
             ls screenshot-diffs