diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-20 04:59:39 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-20 04:59:39 +0400 |
| commit | 20c7801cf3ba4db2a4b9728e6043488a7d147b5d (patch) | |
| tree | 6fc3527e298887e42da02b019fcfcc241843e5af /tests | |
| parent | a3063de9f47ac76df1804354cf08791846bddefb (diff) | |
refs #6469 some initial work for using bower
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php | 4 | ||||
| -rwxr-xr-x | tests/angularjs/karma.conf.js | 12 | ||||
| -rw-r--r-- | tests/javascript/index.php | 2 | ||||
| -rwxr-xr-x | tests/travis/upload_artifacts.sh | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php b/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php index 1ece0ca556..c7c0bdc01c 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/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/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..c2e5b29b03 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 echo "[NOTE] uploading following diffs:" ls screenshot-diffs |