mirror of https://github.com/nextcloud/server
Fix JS tests after test lib updates
Prevent XHR during load by checking window.TESTING. Adjust some expected values. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
This commit is contained in:
parent
82ded36358
commit
6aba3964d3
|
@ -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({
|
||||
|
|
|
@ -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')
|
||||
}
|
||||
|
|
|
@ -179,6 +179,8 @@
|
|||
})();
|
||||
|
||||
window.addEventListener('DOMContentLoaded', function() {
|
||||
OCA.SystemTags.Admin.init();
|
||||
if (!window.TESTING) {
|
||||
OCA.SystemTags.Admin.init();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
});
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue