diff --git a/test/data/database-test-cases.json b/test/data/database-test-cases.json index 1595ffc4ae..b683deef81 100644 --- a/test/data/database-test-cases.json +++ b/test/data/database-test-cases.json @@ -28,7 +28,7 @@ "ipa": 1 }, "terms": { - "total": 33 + "total": 34 } } }, @@ -37,7 +37,7 @@ { "kanji": 2, "kanjiMeta": 6, - "terms": 33, + "terms": 34, "termMeta": 39, "tagMeta": 15, "media": 6 @@ -46,7 +46,7 @@ "total": { "kanji": 2, "kanjiMeta": 6, - "terms": 33, + "terms": 34, "termMeta": 39, "tagMeta": 15, "media": 6 diff --git a/test/data/dictionaries/valid-dictionary1/term_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_bank_1.json index 7c3e005a40..e896e11594 100644 --- a/test/data/dictionaries/valid-dictionary1/term_bank_1.json +++ b/test/data/dictionaries/valid-dictionary1/term_bank_1.json @@ -347,5 +347,6 @@ ["ＵＳＢ", "ユーエスビー", "n", "n", 1, ["ＵＳＢ definition"], 21, ""], ["마시다", "", "v", "v", 1, ["masida definition"], 22, ""], ["自重", "じちょう", "n", "n", 1, ["jichou definition"], 23, ""], - ["自重", "じじゅう", "n", "n", 2, ["jijuu definition"], 24, ""] + ["自重", "じじゅう", "n", "n", 2, ["jijuu definition"], 24, ""], + ["ありがとう", "ありがとう", "n", "n", 1, ["arigatou definition"], 25, ""] ] diff --git a/test/data/html/js/popup-tests.js b/test/data/html/js/popup-tests.js index c838cebb66..41efd25d2d 100644 --- a/test/data/html/js/popup-tests.js +++ b/test/data/html/js/popup-tests.js @@ -30,4 +30,16 @@ HtmlTestUtilities.runMain(() => { if (!(iframeWithSrcdoc instanceof HTMLIFrameElement)) { continue; } iframeWithSrcdoc.srcdoc = HtmlTestUtilities.dataUrlToContent(src).content; } + + const testCases = document.querySelectorAll('test-case[data-expected-result="failure"]'); + for (const testCase of testCases) { + const description = testCase.querySelector('test-description'); + if (description) { + const dangerSpan = document.createElement('span'); + dangerSpan.className = 'danger'; + dangerSpan.textContent = 'This element is expected to not work.'; + description.appendChild(document.createElement('br')); + description.appendChild(dangerSpan); + } + } }); diff --git a/test/data/html/popup-tests.html b/test/data/html/popup-tests.html index ef2d36e6ea..a549c380c5 100644 --- a/test/data/html/popup-tests.html +++ b/test/data/html/popup-tests.html @@ -30,6 +30,8 @@ .danger { color: #c83c28; } + + @@ -53,7 +55,7 @@

Popup Tests

- + Content inside of an open shadow DOM.
- + Content inside of a closed shadow DOM.
- + <iframe> element with data URL. - + <iframe> element with blob URL. @@ -134,16 +136,15 @@

Popup Tests

sandbox="allow-same-origin allow-scripts"> - + - <iframe> element with srcdoc and sandbox="allow-scripts".
- This element is expected to not work. + <iframe> element with srcdoc and sandbox="allow-scripts". - + SVG <img>. @@ -153,7 +154,7 @@

Popup Tests

 - + SVG <embed>. @@ -176,5 +177,7 @@

Popup Tests

 + + diff --git a/test/playwright/visual.spec.js b/test/playwright/visual.spec.js index 430dbdf118..3812fc9936 100644 --- a/test/playwright/visual.spec.js +++ b/test/playwright/visual.spec.js @@ -17,6 +17,7 @@ import path from 'path'; import {pathToFileURL} from 'url'; +import {createDictionaryArchiveData} from '../../dev/dictionary-archive-util.js'; import {expect, root, test} from './playwright-util.js'; test.beforeEach(async ({context}) => { @@ -25,15 +26,18 @@ test.beforeEach(async ({context}) => { await welcome.close(); // Close the welcome tab so our main tab becomes the foreground tab -- otherwise, the screenshot can hang }); -test('visual', async ({page, extensionId}) => { +test('welcome', async ({page, extensionId}) => { // Open welcome page + console.log('Open welcome page'); await page.goto(`chrome-extension://${extensionId}/welcome.html`); await expect(page.getByText('Welcome to Yomitan!')).toBeVisible(); // Take a screenshot of the welcome page await expect.soft(page).toHaveScreenshot('welcome-page.png'); - +}); +test('settings', async ({page, extensionId}) => { // Open settings + console.log('Open settings'); await page.goto(`chrome-extension://${extensionId}/settings.html`); await expect(page.locator('id=dictionaries')).toBeVisible(); @@ -45,6 +49,7 @@ test('visual', async ({page, extensionId}) => { await expect.soft(page).toHaveScreenshot('settings-fresh.png', {mask: [storage_locator]}); // Load in jmdict_english.zip + console.log('Load in jmdict_english.zip'); await page.locator('input[id="dictionary-import-file-input"]').setInputFiles(path.join(root, 'dictionaries/jmdict_english.zip')); await expect(page.locator('id=dictionaries')).toHaveText('Dictionaries (1 installed, 1 enabled)', {timeout: 5 * 60 * 1000}); @@ -56,6 +61,7 @@ test('visual', async ({page, extensionId}) => { await page.locator('input#advanced-checkbox').evaluate((/** @type {HTMLInputElement} */ element) => element.click()); // Import jmdict_swedish.zip from a URL + console.log('Load in jmdict_swedish.zip'); await page.locator('.settings-item[data-modal-action="show,dictionaries"]').click(); await page.locator('button[id="dictionary-import-button"]').click(); await page.locator('textarea[id="dictionary-import-url-text"]').fill('https://github.com/yomidevs/yomitan/raw/dictionaries/jmdict_swedish.zip'); @@ -79,6 +85,7 @@ test('visual', async ({page, extensionId}) => { await page.setViewportSize({width: 1280, height: pageHeight}); // Wait for any animations or changes to complete + console.log('Waiting for animations to complete'); await page.waitForTimeout(500); // Take a full page screenshot of the settings page with advanced settings enabled @@ -86,17 +93,35 @@ test('visual', async ({page, extensionId}) => { fullPage: true, mask: [storage_locator], }); +}); + +test('popup', async ({page, extensionId}) => { + // Open settings + console.log('Open settings'); + await page.goto(`chrome-extension://${extensionId}/settings.html`); + + await expect(page.locator('id=dictionaries')).toBeVisible(); + + // Load in test dictionary + const dictionary = await createDictionaryArchiveData(path.join(root, 'test/data/dictionaries/valid-dictionary1'), 'valid-dictionary1'); + await page.locator('input[id="dictionary-import-file-input"]').setInputFiles({ + name: 'valid-dictionary1.zip', + mimeType: 'application/x-zip', + buffer: Buffer.from(dictionary), + }); + await expect(page.locator('id=dictionaries')).toHaveText('Dictionaries (1 installed, 1 enabled)', {timeout: 1 * 60 * 1000}); /** * @param {number} doc_number * @param {number} test_number - * @param {import('@playwright/test').ElementHandle} el + * @param {import('@playwright/test').Locator} hovertarget_locator * @param {{x: number, y: number}} offset */ - const screenshot = async (doc_number, test_number, el, offset) => { + const screenshot = async (doc_number, test_number, hovertarget_locator, offset) => { const test_name = 'doc' + doc_number + '-test' + test_number; + console.log(test_name); - const box = (await el.boundingBox()) || {x: 0, y: 0, width: 0, height: 0}; + const box = (await hovertarget_locator.boundingBox()) || {x: 0, y: 0, width: 0, height: 0}; // Find the popup frame if it exists let popup_frame = page.frames().find((f) => f.url().includes('popup.html')); @@ -110,38 +135,31 @@ test('visual', async ({page, extensionId}) => { if (typeof popup_frame === 'undefined') { popup_frame = await frame_attached; // Wait for popup to be attached } + try { - // Some tests don't have a popup, so don't fail if it's not there - // TODO: check if the popup is expected to be there - await (await /** @type {import('@playwright/test').Frame} */ (popup_frame).frameElement()).waitForElementState('visible', {timeout: 500}); + const expectedState = (await hovertarget_locator.locator('..').getAttribute('data-expected-result')) === 'failure' ? 'hidden' : 'visible'; + await (await /** @type {import('@playwright/test').Frame} */ (popup_frame).frameElement()).waitForElementState(expectedState, {timeout: 500}); } catch (error) { - console.log(test_name + ' has no popup'); + console.warn(test_name, 'unexpected popup state'); } + console.log(test_name, 'taking screenshot'); await page.bringToFront(); // Bring the page to the foreground so the screenshot doesn't hang; for some reason the frames result in page being in the background await expect.soft(page).toHaveScreenshot(test_name + '.png'); + console.log(test_name, 'clicking away and waiting'); await page.mouse.click(0, 0); // Click away so popup disappears await (await /** @type {import('@playwright/test').Frame} */ (popup_frame).frameElement()).waitForElementState('hidden'); // Wait for popup to disappear }; - // Test document 1 - await page.goto(pathToFileURL(path.join(root, 'test/data/html/document-util.html')).toString()); - await page.setViewportSize({width: 1000, height: 1800}); - await page.keyboard.down('Shift'); - let i = 1; - for (const el of await page.locator('div > *:nth-child(1)').elementHandles()) { - await screenshot(1, i, el, {x: 6, y: 6}); - i++; - } - - // Test document 2 + console.log('Open popup-tests.html'); await page.goto(pathToFileURL(path.join(root, 'test/data/html/popup-tests.html')).toString()); await page.setViewportSize({width: 1000, height: 4500}); + await expect(page.locator('id=footer')).toBeVisible(); await page.keyboard.down('Shift'); - i = 1; - for (const el of await page.locator('.hovertarget').elementHandles()) { - await screenshot(2, i, el, {x: 15, y: 15}); + let i = 1; + for (const test_locator of await page.locator('.hovertarget').all()) { + await screenshot(2, i, test_locator, {x: 15, y: 15}); i++; } });