From 6aba3964d32e8e5589590a60b3d88ce36fd6f4a7 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 10 Jan 2022 15:08:03 +0100 Subject: Fix JS tests after test lib updates Prevent XHR during load by checking window.TESTING. Adjust some expected values. Signed-off-by: Vincent Petry --- core/js/tests/specs/contactsmenuSpec.js | 2 +- core/js/tests/specs/jquery.contactsmenuSpec.js | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'core/js/tests') 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('
'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('
'); 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('
'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('
'); 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('
'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('
'); 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('
'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('
'); 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('
'); + // FIXME: don't compare HTML one to one but check specific text in the output + expect($appendTo.html().replace(/[\r\n\t]?(\ \ +)?/g, '')).toEqual('
'); done(); }); -- cgit v1.2.3