diff --git a/__tests__/integration/mirador/companion_windows.test.js b/__tests__/integration/mirador/companion_windows.test.js index 97e6ca6fe473e490157b1c1dcd68843f5c175ca5..848a5f167c4cf9937f9de86707a2289193ba3e08 100644 --- a/__tests__/integration/mirador/companion_windows.test.js +++ b/__tests__/integration/mirador/companion_windows.test.js @@ -6,7 +6,7 @@ describe('Companion Windows', () => { await expect(page).toFill('#manifestURL', 'http://127.0.0.1:4488/__tests__/fixtures/version-2/001.json'); await expect(page).toClick('#fetchBtn'); await expect(page).toClick('[data-manifestid="http://127.0.0.1:4488/__tests__/fixtures/version-2/001.json"] button'); - await page.waitFor(300); + await page.waitForTimeout(300); await expect(page).toMatchElement('.mirador-window'); }); diff --git a/__tests__/integration/mirador/invalid-api-response.test.js b/__tests__/integration/mirador/invalid-api-response.test.js index 5495d99a8facc38bd7826f6314c4e4aced2f8522..3bc9a2d414fbedc9be8d3ac18c4a56c1f41f1f5c 100644 --- a/__tests__/integration/mirador/invalid-api-response.test.js +++ b/__tests__/integration/mirador/invalid-api-response.test.js @@ -8,7 +8,7 @@ describe('Mirador Invalid API Response Handler Test', () => { await page.evaluate(() => { document.querySelector('.mirador-add-resource-button').click(); }); - await page.waitFor(50); + await page.waitForTimeout(50); await expect(page).toFill('#manifestURL', uri); await expect(page).toClick('#fetchBtn'); @@ -34,7 +34,7 @@ describe('Mirador Invalid API Response Handler Test', () => { await expect(page).toClick('button', { text: 'Dismiss' }); - await page.waitFor(() => !document.querySelector('li[data-manifestid="http://127.0.0.1:4488/__tests__/fixtures/version-2/broken"]')); + await page.waitForFunction(() => !document.querySelector('li[data-manifestid="http://127.0.0.1:4488/__tests__/fixtures/version-2/broken"]')); await expect(page).not.toMatchElement( 'p', diff --git a/__tests__/integration/mirador/language_switching.test.js b/__tests__/integration/mirador/language_switching.test.js index e5f4b25f602bf2be43f9729ff7b9fe838fb7e705..58ceb88f9a60a753de1ad5837c4a29e32dff9e81 100644 --- a/__tests__/integration/mirador/language_switching.test.js +++ b/__tests__/integration/mirador/language_switching.test.js @@ -16,7 +16,7 @@ describe('Language Switching', () => { await expect(page).toMatchElement('[aria-label="Start Here"]'); await expect(page).not.toMatchElement('[aria-label="Hier starten"]'); await expect(page).toClick('li', { text: 'Deutsch' }); - await page.waitFor(1000); + await page.waitForTimeout(1000); await expect(page).not.toMatchElement('[aria-label="Start Here"]'); await expect(page).toMatchElement('[aria-label="Hier starten"]'); }); diff --git a/__tests__/integration/mirador/plugins/add.test.js b/__tests__/integration/mirador/plugins/add.test.js index 5e867d89e0c1592419952e60f85939014b7ccabe..878f81403c2f08704d4cdd2c40cf0da4deb35c01 100644 --- a/__tests__/integration/mirador/plugins/add.test.js +++ b/__tests__/integration/mirador/plugins/add.test.js @@ -2,7 +2,7 @@ describe('add two plugins to <WorkspaceControlPanelButtons>', () => { beforeAll(async () => { await page.goto('http://127.0.0.1:4488/__tests__/integration/mirador/plugins/add.html'); await expect(page).toMatchElement('.mirador-viewer'); - await page.waitFor(1000); + await page.waitForTimeout(1000); }); it('all add plugins will be added to <WorkspaceControlPanelButtons>', async () => { diff --git a/__tests__/integration/mirador/plugins/companionWindow.test.js b/__tests__/integration/mirador/plugins/companionWindow.test.js index d93f36e3abdf8c2bdd9645abd0ae94734b7f936d..71ad618bc9e7c3a981faab57aeda65a4885a7e70 100644 --- a/__tests__/integration/mirador/plugins/companionWindow.test.js +++ b/__tests__/integration/mirador/plugins/companionWindow.test.js @@ -2,13 +2,13 @@ describe('add plugins for companion windows', () => { beforeAll(async () => { await page.goto('http://127.0.0.1:4488/__tests__/integration/mirador/plugins/companionWindow.html'); await expect(page).toMatchElement('.mirador-viewer'); - await page.waitFor(1000); + await page.waitForTimeout(1000); }); it('added a plugin to the window sidebar and companion window', async () => { await expect(page).toClick('button[aria-label="Toggle sidebar"]'); - await page.waitFor(1000); + await page.waitForTimeout(1000); await expect(page).toMatchElement('.mirador-companion-window-left.mirador-window-sidebar-info-panel'); await expect(page).toMatchElement('#add-plugin-companion-window-button'); diff --git a/__tests__/integration/mirador/plugins/priority.test.js b/__tests__/integration/mirador/plugins/priority.test.js index 3ed451fb86ca96bc9af0fb14c9bd3c791e376991..6dfece29f863934b059ec503eb4c175340040e23 100644 --- a/__tests__/integration/mirador/plugins/priority.test.js +++ b/__tests__/integration/mirador/plugins/priority.test.js @@ -2,7 +2,7 @@ describe('try to apply 2 add plugins and 2 wrap plugins to <WorkspaceControlPane beforeAll(async () => { await page.goto('http://127.0.0.1:4488/__tests__/integration/mirador/plugins/priority.html'); await expect(page).toMatchElement('.mirador-viewer'); - await page.waitFor(1000); + await page.waitForTimeout(1000); }); it('only apply the first wrap plugin', async () => { diff --git a/__tests__/integration/mirador/plugins/state.test.js b/__tests__/integration/mirador/plugins/state.test.js index eafa59e8c29da51640d59e379458cf62d3264ee9..15e821ce441fbc9fc9cb3e5b1638ba894c326858 100644 --- a/__tests__/integration/mirador/plugins/state.test.js +++ b/__tests__/integration/mirador/plugins/state.test.js @@ -4,7 +4,7 @@ describe('how plugins relate to state', () => { beforeAll(async () => { await page.goto('http://127.0.0.1:4488/__tests__/integration/mirador/plugins/state.html'); await expect(page).toMatchElement('.mirador-viewer'); - await page.waitFor(1000); + await page.waitForTimeout(1000); }); it('plugin can read from state', async () => { diff --git a/__tests__/integration/mirador/plugins/validate.test.js b/__tests__/integration/mirador/plugins/validate.test.js index 311d2ec741f854d2a8d7f69f7bad3c805be604cf..d62a7c261cd39d43709a45aca81f4910ace16499 100644 --- a/__tests__/integration/mirador/plugins/validate.test.js +++ b/__tests__/integration/mirador/plugins/validate.test.js @@ -2,7 +2,7 @@ describe('pass valid and invalid plugins to <WorkspaceControlPanelButtons>', () beforeAll(async () => { await page.goto('http://127.0.0.1:4488/__tests__/integration/mirador/plugins/validate.html'); await expect(page).toMatchElement('.mirador-viewer'); - await page.waitFor(1000); + await page.waitForTimeout(1000); }); it('valid plugins will be applied <WorkspaceControlPanelButtons>', async () => { diff --git a/__tests__/integration/mirador/plugins/wrap.test.js b/__tests__/integration/mirador/plugins/wrap.test.js index 77865efa64a3aa67c3ead55313c4dc96a4982344..2e77a1842b5b1b270fd3c11fb9031ecca6b5e7d5 100644 --- a/__tests__/integration/mirador/plugins/wrap.test.js +++ b/__tests__/integration/mirador/plugins/wrap.test.js @@ -2,7 +2,7 @@ describe('wrap <WorkspaceControlPanelButtons> by a plugin', () => { beforeAll(async () => { await page.goto('http://127.0.0.1:4488/__tests__/integration/mirador/plugins/wrap.html'); await expect(page).toMatchElement('.mirador-viewer'); - await page.waitFor(1000); + await page.waitForTimeout(1000); }); it('wraps <WorkspaceControlPanelButtons>', async () => { diff --git a/__tests__/integration/mirador/thumbnail-navigation.test.js b/__tests__/integration/mirador/thumbnail-navigation.test.js index 6b2cf8051f93b17a8989a7ab2a34a1270d7dd9f0..35de953ccaa3b13e04ec8ab4fb17bc7a9faf381e 100644 --- a/__tests__/integration/mirador/thumbnail-navigation.test.js +++ b/__tests__/integration/mirador/thumbnail-navigation.test.js @@ -12,7 +12,7 @@ describe('Thumbnail navigation', () => { miradorInstance.store.getState().windows )); expect(Object.values(windows)[0].canvasId).toBe('https://iiif.harvardartmuseums.org/manifests/object/299843/canvas/canvas-47174892'); // test harness in index.html starts at 2 - await page.waitFor(1000); + await page.waitForTimeout(1000); await expect(page).toClick('.mirador-thumbnail-nav-canvas-1 img'); await expect(page).toMatchElement('.mirador-thumbnail-nav-canvas-1.mirador-current-canvas-grouping', { timeout: 1500 }); windows = await page.evaluate(() => ( diff --git a/__tests__/integration/mirador/window_actions.test.js b/__tests__/integration/mirador/window_actions.test.js index cc35d96dee1076da19efc6d340d1ff8e8795177b..8dd54ffba986ed101cc89dba80cb75823c64c40e 100644 --- a/__tests__/integration/mirador/window_actions.test.js +++ b/__tests__/integration/mirador/window_actions.test.js @@ -12,12 +12,12 @@ describe('Window actions', () => { await expect(page).toClick('[data-manifestid="http://127.0.0.1:4488/__tests__/fixtures/version-2/sn904cj3429.json"] button'); await expect(page).toMatchElement('.mirador-window'); - await page.waitFor(1000); + await page.waitForTimeout(1000); await expect(page).toClick('.mirador-window-close'); const numWindows = await page.evaluate(page => ( document.querySelectorAll('.mirador-window').length )); // only default configed windows found - await page.waitFor(1000); + await page.waitForTimeout(1000); await expect(numWindows).toBe(0); }); });