diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-01-10 16:41:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 16:41:11 +0100 |
| commit | 8954e512072f9c7246485994072f1361e8211fd1 (patch) | |
| tree | 29bbff86d34250a3df1acaf6d48a25b3e15399d0 /apps | |
| parent | 6572f801023f3b6bed33c32aee4edc5c8e840ece (diff) | |
| parent | 6aba3964d32e8e5589590a60b3d88ce36fd6f4a7 (diff) | |
| download | nextcloud-server-8954e512072f9c7246485994072f1361e8211fd1.tar.gz nextcloud-server-8954e512072f9c7246485994072f1361e8211fd1.zip | |
Merge pull request #30567 from nextcloud/bugfix/noid/npm-ci-for-karma
Use npm ci when running JS tests
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/src/files-app-settings.js | 3 | ||||
| -rw-r--r-- | apps/files/src/main-personal-settings.js | 6 | ||||
| -rw-r--r-- | apps/systemtags/js/admin.js | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/apps/files/src/files-app-settings.js b/apps/files/src/files-app-settings.js index daaafbcd6c3..0d8f84cb7a8 100644 --- a/apps/files/src/files-app-settings.js +++ b/apps/files/src/files-app-settings.js @@ -37,6 +37,9 @@ Object.assign(window.OCA.Files, { Settings: new Settings() }) Object.assign(window.OCA.Files.Settings, { Setting }) window.addEventListener('DOMContentLoaded', function() { + if (window.TESTING) { + return + } // Init Vue app // eslint-disable-next-line new Vue({ diff --git a/apps/files/src/main-personal-settings.js b/apps/files/src/main-personal-settings.js index af98d3bea49..b0176d5c30d 100644 --- a/apps/files/src/main-personal-settings.js +++ b/apps/files/src/main-personal-settings.js @@ -32,5 +32,7 @@ __webpack_nonce__ = btoa(getRequestToken()) Vue.prototype.t = t -const View = Vue.extend(PersonalSettings) -new View().$mount('#files-personal-settings') +if (!window.TESTING) { + const View = Vue.extend(PersonalSettings) + new View().$mount('#files-personal-settings') +} diff --git a/apps/systemtags/js/admin.js b/apps/systemtags/js/admin.js index 22d17343228..2409cb488de 100644 --- a/apps/systemtags/js/admin.js +++ b/apps/systemtags/js/admin.js @@ -179,6 +179,8 @@ })(); window.addEventListener('DOMContentLoaded', function() { - OCA.SystemTags.Admin.init(); + if (!window.TESTING) { + OCA.SystemTags.Admin.init(); + } }); |