mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't load old vendor files during jsunit tests 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2018-12-21 09:37:53 +01:00 committed by Julius Härtl
parent b3b41413f8
commit 01a6181d9f
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
5 changed files with 1 additions and 65531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

345
core/js/dist/main_BACKUP_17410.js vendored
View File

File diff suppressed because one or more lines are too long

499
core/js/dist/main_BASE_17410.js vendored
View File

File diff suppressed because one or more lines are too long

345
core/js/dist/main_LOCAL_17410.js vendored
View File

File diff suppressed because one or more lines are too long

64335
core/js/dist/main_REMOTE_17410.js vendored
View File

File diff suppressed because one or more lines are too long

8
tests/karma.config.js
View File

@ -148,7 +148,6 @@ module.exports = function(config) {
// note that the loading order is important that's why they // note that the loading order is important that's why they
// are specified in a separate file // are specified in a separate file
var corePath = 'core/js/'; var corePath = 'core/js/';
var vendorPath = 'core/vendor/';
var coreModule = require('../' + corePath + 'core.json'); var coreModule = require('../' + corePath + 'core.json');
var testCore = false; var testCore = false;
var files = []; var files = [];
@ -162,16 +161,11 @@ module.exports = function(config) {
testCore = true; testCore = true;
} }
files.push('core/js/dist/main.js');
// core mocks // core mocks
files.push(corePath + 'tests/specHelper.js'); files.push(corePath + 'tests/specHelper.js');
var srcFile, i; 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 // add core library files
for (i = 0; i < coreModule.libraries.length; i++) { for (i = 0; i < coreModule.libraries.length; i++) {
srcFile = corePath + coreModule.libraries[i]; srcFile = corePath + coreModule.libraries[i];