diff --git a/test/e2e/onFCP-test.js b/test/e2e/onFCP-test.js index b844eb97..09b5586c 100644 --- a/test/e2e/onFCP-test.js +++ b/test/e2e/onFCP-test.js @@ -134,23 +134,7 @@ describe('onFCP()', async function () { it.only('does not report if the document was hidden at page load time', async function () { if (!browserSupportsFCP) this.skip(); - console.log(await navigateTo('/test/fcp?hidden=1', {readyState: 'complete'})); - - // await browser.pause(1000); - - const foo = await browser.execute(() => self.foo); - console.log({foo}); - - const foo2 = await browser.execute(() => self.foo2); - console.log({foo2}); - - const wv = await browser.execute(() => self.wv); - - console.log({wv}); - assert.equal(wv, true); - - const vs = await browser.execute(() => self.document.visibilityState); - console.log({vs}); + console.log(await navigateTo('/test/fcp?hidden=1', {readyState: 'interactive'})); await stubVisibilityChange('visible'); diff --git a/test/utils/domReadyState.js b/test/utils/domReadyState.js index 9dc9e5b4..30fcfdc5 100644 --- a/test/utils/domReadyState.js +++ b/test/utils/domReadyState.js @@ -23,11 +23,10 @@ export function domReadyState(state) { return browser.executeAsync(async (state, done) => { const logs = []; - self.foo = document.readyState; - logs.push(['foo', document.readyState]); + logs.push(['foo', self.wv, document.readyState]); await new Promise((resolve) => { - logs.push(['foo:promise', document.readyState]); + logs.push(['foo:promise', self.wv, document.readyState]); if (document.readyState === 'complete' || document.readyState === state) { resolve(); } else { @@ -41,15 +40,14 @@ export function domReadyState(state) { }); } }); - // logs.push(self.__toSafeObject(self.__readyPromises)); if (state !== 'loading') { - self.foo2 = document.readyState; - logs.push(['foo2', document.readyState]); + logs.push(['foo2', self.wv, document.readyState]); await Promise.all(self.__readyPromises); } - self.foo3 = document.readyState; - logs.push(['foo3', document.readyState]); - // Queue a task so this resolves after any event callback run. + logs.push(['foo3', self.wv, document.readyState]); + logs.push(['vs', document.visibilityState]); + + // Queue a task so this resolves after any event callbacks run. setTimeout(() => done(logs), 0); }, state); } diff --git a/test/utils/navigateTo.js b/test/utils/navigateTo.js index d410bbe8..52073744 100644 --- a/test/utils/navigateTo.js +++ b/test/utils/navigateTo.js @@ -35,7 +35,6 @@ export async function navigateTo(urlPath, opts) { }); } - console.log('navigateTo', opts); if (opts?.readyState) { return await domReadyState(opts.readyState); } diff --git a/test/views/fcp.njk b/test/views/fcp.njk index d765e3c9..56338ea3 100644 --- a/test/views/fcp.njk +++ b/test/views/fcp.njk @@ -27,51 +27,8 @@

Navigate away

- - {% endblock %} diff --git a/test/views/layout.njk b/test/views/layout.njk index 1226db7e..65e71033 100644 --- a/test/views/layout.njk +++ b/test/views/layout.njk @@ -227,7 +227,6 @@ const importPromise = import(modulePath); self.__readyPromises.push(importPromise); - console.log('self.__readyPromises.push(importPromise)', self.__readyPromises.length); return await importPromise; };