diff options
| -rw-r--r-- | main_background.js | 21 | ||||
| -rw-r--r-- | test/spec/LibreJSSpec.js | 59 |
2 files changed, 41 insertions, 39 deletions
diff --git a/main_background.js b/main_background.js index c983f2f..76cc8c4 100644 --- a/main_background.js +++ b/main_background.js @@ -322,6 +322,16 @@ async function connected(p) { } /** +* Loads the contact finder on the given tab ID. +*/ +async function injectContactFinder(tabId) { + await Promise.all([ + browser.tabs.insertCSS(tabId, { file: '/content/overlay.css', cssOrigin: 'user' }), + browser.tabs.executeScript(tabId, { file: '/content/contactFinder.js' }), + ]); +} + +/** * The callback for tab closings. * * Delete the info we are storing about this tab if there is any. @@ -890,15 +900,4 @@ async function init_addon() { } } - -/** -* Loads the contact finder on the given tab ID. -*/ -async function injectContactFinder(tabId) { - await Promise.all([ - browser.tabs.insertCSS(tabId, { file: '/content/overlay.css', cssOrigin: 'user' }), - browser.tabs.executeScript(tabId, { file: '/content/contactFinder.js' }), - ]); -} - init_addon(); diff --git a/test/spec/LibreJSSpec.js b/test/spec/LibreJSSpec.js index 62a44a0..77563d2 100644 --- a/test/spec/LibreJSSpec.js +++ b/test/spec/LibreJSSpec.js @@ -44,6 +44,7 @@ describe('LibreJS\' components', () => { let unknownLicensed = `// @license ${unknownLicense.magnet} ${unknownLicense.id}\n${nontrivial}\n// @license-end`; let malformedLicensed = `// @license\n${nontrivial}`; let tab, documentUrl; + const enableContactFinderTests = false; beforeAll(async () => { let url = browser.extension.getURL('/test/resources/index.html'); @@ -291,35 +292,37 @@ describe('LibreJS\' components', () => { }); }); - describe('The contact finder', () => { - it('should display the contact finder iframe', async (done) => { - await browser.runtime.connect({ name: "port-from-cs" }).postMessage({ invoke_contact_finder: 1 }); - // Direct await / async does not work as executeScript does not wait - // for the listener - setTimeout(async () => { - const frame = await browser.tabs.executeScript(tab.id, { - code: 'document.getElementById("_LibreJS_frame").outerHTML' - }) - expect(frame).toBeTruthy(); - done(); - }, 100); - }); - it('should display the correct contact info in the contact finder iframe', async (done) => { - await browser.runtime.connect({ name: "port-from-cs" }).postMessage({ invoke_contact_finder: 1 }); - // Direct await / async does not work as executeScript does not wait - // for the listener - setTimeout(async () => { - const [frameBody] = await browser.tabs.executeScript(tab.id, { - code: 'document.getElementById("_LibreJS_frame").contentWindow.document.body.innerHTML' - }); - expect(frameBody).not.toContain('About Us'); - expect(frameBody).toContain('Contact Us'); - expect(frameBody).toContain('Website Feedback'); - expect(frameBody).toContain('lib@re.js'); - done(); - }, 200); + if (enableContactFinderTests) { + describe('The contact finder', () => { + it('should display the contact finder iframe', async (done) => { + await browser.runtime.connect({ name: "port-from-cs" }).postMessage({ invoke_contact_finder: 1 }); + // Direct await / async does not work as executeScript does not wait + // for the listener + setTimeout(async () => { + const frame = await browser.tabs.executeScript(tab.id, { + code: 'document.getElementById("_LibreJS_frame").outerHTML' + }) + expect(frame).toBeTruthy(); + done(); + }, 100); + }); + it('should display the correct contact info in the contact finder iframe', async (done) => { + await browser.runtime.connect({ name: "port-from-cs" }).postMessage({ invoke_contact_finder: 1 }); + // Direct await / async does not work as executeScript does not wait + // for the listener + setTimeout(async () => { + const [frameBody] = await browser.tabs.executeScript(tab.id, { + code: 'document.getElementById("_LibreJS_frame").contentWindow.document.body.innerHTML' + }); + expect(frameBody).not.toContain('About Us'); + expect(frameBody).toContain('Contact Us'); + expect(frameBody).toContain('Website Feedback'); + expect(frameBody).toContain('lib@re.js'); + done(); + }, 200); + }); }); - }); + } describe('The prefs', () => { it('should have the defaults', async () => { |