summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-05 16:43:24 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-05 16:43:24 +0100
commit4659b0e6a0ed69238d684b5dff4a745dc02781e2 (patch)
tree9fca52cc48124243e749735e47277a551cf73713 /tests
parent9dc769c37a3a95830ad7a8d9534e8b05e8efb6f3 (diff)
parent2c941729eea47529fe687cea391240186b0f83c0 (diff)
downloadnextcloud-server-4659b0e6a0ed69238d684b5dff4a745dc02781e2.tar.gz
nextcloud-server-4659b0e6a0ed69238d684b5dff4a745dc02781e2.zip
Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
Diffstat (limited to 'tests')
-rw-r--r--tests/karma.config.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js
index f67fa9977c2..414f1552584 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -120,6 +120,12 @@ module.exports = function(config) {
files.push(corePath + 'tests/specHelper.js');
var srcFile, i;
+ // add vendor library files
+ for ( i = 0; i < coreModule.vendor.length; i++ ) {
+ srcFile = vendorPath + coreModule.vendor[i];
+ files.push(srcFile);
+ }
+
// add core library files
for ( i = 0; i < coreModule.libraries.length; i++ ) {
srcFile = corePath + coreModule.libraries[i];
@@ -135,12 +141,6 @@ module.exports = function(config) {
}
}
- // add vendor library files
- for ( i = 0; i < coreModule.vendor.length; i++ ) {
- srcFile = vendorPath + coreModule.vendor[i];
- files.push(srcFile);
- }
-
// TODO: settings pages
// need to test the core app as well ?