diff options
| -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 | ||||
| -rw-r--r-- | core/js/tests/specs/contactsmenuSpec.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/jquery.contactsmenuSpec.js | 15 |
5 files changed, 21 insertions, 9 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 4a56e836ecd..769978c23ff 100644 --- a/apps/files/src/main-personal-settings.js +++ b/apps/files/src/main-personal-settings.js @@ -58,5 +58,7 @@ __webpack_public_path__ = generateFilePath('files', '', 'js/') 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(); + } }); diff --git a/core/js/tests/specs/contactsmenuSpec.js b/core/js/tests/specs/contactsmenuSpec.js index 54e3152b27a..7eaf2660799 100644 --- a/core/js/tests/specs/contactsmenuSpec.js +++ b/core/js/tests/specs/contactsmenuSpec.js @@ -73,7 +73,7 @@ describe('Contacts menu', function() { opening.then(function() { expect($menuEl.html()).toContain('Could not load your contacts'); - expect(console.error).toHaveBeenCalledTimes(1); + expect(console.error).toHaveBeenCalled(); done(); }, function(e) { done.fail(e); diff --git a/core/js/tests/specs/jquery.contactsmenuSpec.js b/core/js/tests/specs/jquery.contactsmenuSpec.js index c6807c850a9..d0bd9c8dde4 100644 --- a/core/js/tests/specs/jquery.contactsmenuSpec.js +++ b/core/js/tests/specs/jquery.contactsmenuSpec.js @@ -123,7 +123,8 @@ describe('jquery.contactsMenu tests', function() { ); $selector1.on('load', function() { - expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="mailto:bar%40baz.wtf"><img src="foo.svg"><span>bar@baz.wtf</span></a></li></ul></div>'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="mailto:bar%40baz.wtf"><img src="foo.svg"><span>bar@baz.wtf</span></a></li></ul></div>'); done(); }); @@ -154,7 +155,8 @@ describe('jquery.contactsMenu tests', function() { expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); $selector1.on('load', function() { - expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="mailto:bar%40baz.wtf"><img src="foo.svg"><span>bar@baz.wtf</span></a></li><li><a href="http://localhost/index.php/apps/contacts"><img src="details.svg"><span>Details</span></a></li></ul></div>'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="mailto:bar%40baz.wtf"><img src="foo.svg"><span>bar@baz.wtf</span></a></li><li><a href="http://localhost/index.php/apps/contacts"><img src="details.svg"><span>Details</span></a></li></ul></div>'); done(); }); @@ -178,7 +180,8 @@ describe('jquery.contactsMenu tests', function() { expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); $selector1.on('load', function() { - expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="#"><span>No action available</span></a></li></ul></div>'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="#"><span>No action available</span></a></li></ul></div>'); done(); }); @@ -197,7 +200,8 @@ describe('jquery.contactsMenu tests', function() { expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); $selector1.on('loaderror', function() { - expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="#"><span>Error fetching contact actions</span></a></li></ul></div>'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="#"><span>Error fetching contact actions</span></a></li></ul></div>'); done(); }); @@ -216,7 +220,8 @@ describe('jquery.contactsMenu tests', function() { expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/contactsmenu/findOne'); $selector1.on('loaderror', function() { - expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded" style="display: block;"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="#"><span>No action available</span></a></li></ul></div>'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('<div class="menu popovermenu menu-left contactsmenu-popover loaded"><ul><li class="hidden"><a><span class="icon-loading-small"></span></a></li><li><a href="#"><span>No action available</span></a></li></ul></div>'); done(); }); |