diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-02-03 19:56:44 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-02-13 22:20:07 +0100 |
| commit | 7f886541473fb73591a8930e322250cdc6496bfc (patch) | |
| tree | c0025ae7b41bece3a8c6897a093f5ceb6d5d57f7 /tests/karma.config.js | |
| parent | 53e8957a556af086ce66b8eba45f0013391d7f0d (diff) | |
| download | nextcloud-server-7f886541473fb73591a8930e322250cdc6496bfc.tar.gz nextcloud-server-7f886541473fb73591a8930e322250cdc6496bfc.zip | |
Move of files_versions to webpack
* Move CSS into bundle
* Old merged.json no longer needed!
* No need to load the style still
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests/karma.config.js')
| -rw-r--r-- | tests/karma.config.js | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js index fe60de3bdbb..7ffd5ad4e62 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -45,6 +45,7 @@ module.exports = function(config) { return [ 'files', 'files_trashbin', + 'files_versions', { name: 'files_sharing', srcFiles: [ @@ -75,17 +76,6 @@ module.exports = function(config) { testFiles: ['apps/files_external/tests/js/*.js'] }, { - name: 'files_versions', - srcFiles: [ - // need to enforce loading order... - 'apps/files_versions/js/versionmodel.js', - 'apps/files_versions/js/templates.js', - 'apps/files_versions/js/versioncollection.js', - 'apps/files_versions/js/versionstabview.js' - ], - testFiles: ['apps/files_versions/tests/js/**/*.js'] - }, - { name: 'comments', srcFiles: [ // need to enforce loading order... @@ -117,8 +107,7 @@ module.exports = function(config) { { name: 'settings', srcFiles: [ - 'settings/js/apps.js', - 'core/vendor/marked/marked.min.js' + 'settings/js/apps.js' ] } ]; |