Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2018-12-21 11:37:53 +0300
committerJulius Härtl <jus@bitgrid.net>2019-01-09 17:02:00 +0300
commit01a6181d9f9fe3bcc931d6d231eace0cc11a9521 (patch)
treec3708fe44305200160b5cfe34287887350a9cd52 /tests/karma.config.js
parentb3b41413f83b0e7a020a209036ff20dd2222cb0d (diff)
Don't load old vendor files during jsunit tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'tests/karma.config.js')
-rw-r--r--tests/karma.config.js8
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js
index fc49056e177..fe60de3bdbb 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -148,7 +148,6 @@ module.exports = function(config) {
// note that the loading order is important that's why they
// are specified in a separate file
var corePath = 'core/js/';
- var vendorPath = 'core/vendor/';
var coreModule = require('../' + corePath + 'core.json');
var testCore = false;
var files = [];
@@ -162,16 +161,11 @@ module.exports = function(config) {
testCore = true;
}
+ files.push('core/js/dist/main.js');
// core mocks
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];