From 378afd798e44997402be366bcf59913911bffff6 Mon Sep 17 00:00:00 2001 From: Kiera Ada <1320156+kierrrrra@users.noreply.github.com> Date: Fri, 22 Sep 2023 16:13:16 +0100 Subject: [PATCH 1/2] Updating and cleaning up e2e tests --- test/e2e/ajax1/index.spec.ts | 4 ++-- test/e2e/ajax2/index.spec.ts | 4 ++-- test/e2e/ajax3/index.spec.ts | 4 ++-- test/e2e/ajax4/index.spec.ts | 4 ++-- test/e2e/ajax5/index.spec.ts | 4 ++-- test/e2e/bfcache/index.spec.ts | 8 ++++---- test/e2e/composition1/index.spec.ts | 4 ++-- test/e2e/composition2/index.spec.ts | 4 ++-- test/e2e/composition3/index.spec.ts | 4 ++-- test/e2e/composition4/index.spec.ts | 4 ++-- test/e2e/cpu1/index.spec.ts | 4 ++-- test/e2e/error1/index.spec.ts | 4 ++-- test/e2e/error2/index.spec.ts | 4 ++-- test/e2e/error3/index.spec.ts | 4 ++-- test/e2e/error4/index.spec.ts | 4 ++-- test/e2e/error6/index.spec.ts | 4 ++-- test/e2e/iframe1/index.spec.ts | 4 ++-- test/e2e/iframe2/index.spec.ts | 4 ++-- test/e2e/images1/index.spec.ts | 4 ++-- test/e2e/images2/index.spec.ts | 4 ++-- test/e2e/images3/index.spec.ts | 4 ++-- test/e2e/images4/index.spec.ts | 4 ++-- test/e2e/images5/index.spec.ts | 4 ++-- test/e2e/images6/index.spec.ts | 4 ++-- test/e2e/invisible1/index.spec.ts | 4 ++-- test/e2e/invisible2/index.spec.ts | 4 ++-- test/e2e/invisible3/index.spec.ts | 4 ++-- test/e2e/invisible4/index.spec.ts | 4 ++-- test/e2e/invisible5/index.spec.ts | 4 ++-- test/e2e/invisible6/index.spec.ts | 4 ++-- test/e2e/invisible7/index.spec.ts | 4 ++-- test/e2e/invisible8/index.spec.ts | 4 ++-- test/e2e/output1/index.spec.ts | 6 +++--- test/e2e/output2/index.spec.ts | 6 +++--- test/e2e/prerender1/index.spec.ts | 10 +++++----- test/e2e/react1/index.spec.ts | 4 ++-- test/e2e/react2/index.spec.ts | 4 ++-- test/e2e/scripts1/index.spec.ts | 4 ++-- test/e2e/scripts2/index.spec.ts | 4 ++-- test/e2e/scripts3/index.spec.ts | 4 ++-- test/e2e/scripts4/index.spec.ts | 4 ++-- test/e2e/scripts5/index.spec.ts | 4 ++-- test/e2e/spa1/index.spec.ts | 6 +++--- test/e2e/spa2/index.spec.ts | 8 ++++---- test/e2e/spa3/index.spec.ts | 6 +++--- test/e2e/spa4/index.spec.ts | 6 +++--- test/e2e/spa5/index.spec.ts | 6 +++--- test/e2e/static1/index.spec.ts | 4 ++-- test/e2e/stylesheet1/index.spec.ts | 4 ++-- test/util/entries.ts | 3 --- 50 files changed, 111 insertions(+), 114 deletions(-) diff --git a/test/e2e/ajax1/index.spec.ts b/test/e2e/ajax1/index.spec.ts index 95cb482..0d30ba0 100644 --- a/test/e2e/ajax1/index.spec.ts +++ b/test/e2e/ajax1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const AJAX_DELAY = 500; // see text-mutation.html @@ -13,7 +13,7 @@ test.describe('TTVC', () => { }); // await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + AJAX_DELAY); diff --git a/test/e2e/ajax2/index.spec.ts b/test/e2e/ajax2/index.spec.ts index 2a4f2af..7bf2208 100644 --- a/test/e2e/ajax2/index.spec.ts +++ b/test/e2e/ajax2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const AJAX_DELAY = 500; // see text-mutation.html @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + AJAX_DELAY); diff --git a/test/e2e/ajax3/index.spec.ts b/test/e2e/ajax3/index.spec.ts index 1cee447..8834677 100644 --- a/test/e2e/ajax3/index.spec.ts +++ b/test/e2e/ajax3/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const AJAX_DELAY = 500; // see text-mutation.html @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + AJAX_DELAY); diff --git a/test/e2e/ajax4/index.spec.ts b/test/e2e/ajax4/index.spec.ts index 197a701..3d52300 100644 --- a/test/e2e/ajax4/index.spec.ts +++ b/test/e2e/ajax4/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { }); await entryCountIs(page, 1, 30000); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); diff --git a/test/e2e/ajax5/index.spec.ts b/test/e2e/ajax5/index.spec.ts index 9f49f7b..036327c 100644 --- a/test/e2e/ajax5/index.spec.ts +++ b/test/e2e/ajax5/index.spec.ts @@ -1,6 +1,6 @@ import {test, expect} from '@playwright/test'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -17,7 +17,7 @@ test.describe('TTVC', () => { // pass } - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); // ttvc should never be reported expect(entries.length).toBe(0); diff --git a/test/e2e/bfcache/index.spec.ts b/test/e2e/bfcache/index.spec.ts index 7b12f1a..512ce5a 100644 --- a/test/e2e/bfcache/index.spec.ts +++ b/test/e2e/bfcache/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 1000; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - let entries = await getEntries(page); + let {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); @@ -22,7 +22,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - entries = await getEntries(page); + ({entries} = await getEntriesAndErrors(page)); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); @@ -31,7 +31,7 @@ test.describe('TTVC', () => { await page.goBack({waitUntil: 'networkidle'}); - entries = await getEntries(page); + ({entries} = await getEntriesAndErrors(page)); // note: webkit clears previous values from this list on page restore expect(entries[entries.length - 1].duration).toBeGreaterThanOrEqual(0); diff --git a/test/e2e/composition1/index.spec.ts b/test/e2e/composition1/index.spec.ts index 42644fd..4a02fe5 100644 --- a/test/e2e/composition1/index.spec.ts +++ b/test/e2e/composition1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const AJAX_DELAY = 500; @@ -13,7 +13,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + AJAX_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/composition2/index.spec.ts b/test/e2e/composition2/index.spec.ts index 967bd10..1650464 100644 --- a/test/e2e/composition2/index.spec.ts +++ b/test/e2e/composition2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const AJAX_DELAY = 500; @@ -16,7 +16,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + SCRIPT_DELAY + AJAX_DELAY + CPU_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/composition3/index.spec.ts b/test/e2e/composition3/index.spec.ts index 1deaab6..7be9936 100644 --- a/test/e2e/composition3/index.spec.ts +++ b/test/e2e/composition3/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const AJAX_DELAY = 500; @@ -15,7 +15,7 @@ test.describe('TTVC', () => { }); await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + SCRIPT_DELAY + AJAX_DELAY + CPU_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/composition4/index.spec.ts b/test/e2e/composition4/index.spec.ts index 3162595..5fd31e5 100644 --- a/test/e2e/composition4/index.spec.ts +++ b/test/e2e/composition4/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const AJAX_DELAY = 500; @@ -14,7 +14,7 @@ test.describe('TTVC', () => { }); await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + AJAX_DELAY + TIMEOUT_DELAY + AJAX_DELAY; diff --git a/test/e2e/cpu1/index.spec.ts b/test/e2e/cpu1/index.spec.ts index a386f1a..0d2d2a2 100644 --- a/test/e2e/cpu1/index.spec.ts +++ b/test/e2e/cpu1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const CPU_DELAY = 500; @@ -13,7 +13,7 @@ test.describe('TTVC', () => { }); await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + CPU_DELAY); diff --git a/test/e2e/error1/index.spec.ts b/test/e2e/error1/index.spec.ts index fedc60e..79b4e06 100644 --- a/test/e2e/error1/index.spec.ts +++ b/test/e2e/error1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const IMAGE_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + IMAGE_DELAY); diff --git a/test/e2e/error2/index.spec.ts b/test/e2e/error2/index.spec.ts index 72d412c..357f1c0 100644 --- a/test/e2e/error2/index.spec.ts +++ b/test/e2e/error2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const IMAGE_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + IMAGE_DELAY; diff --git a/test/e2e/error3/index.spec.ts b/test/e2e/error3/index.spec.ts index 573235b..5f1267d 100644 --- a/test/e2e/error3/index.spec.ts +++ b/test/e2e/error3/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const SCRIPT_DELAY = 200; @@ -14,7 +14,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/error4/index.spec.ts b/test/e2e/error4/index.spec.ts index 8e6a368..7140fcd 100644 --- a/test/e2e/error4/index.spec.ts +++ b/test/e2e/error4/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const SCRIPT_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + SCRIPT_DELAY); diff --git a/test/e2e/error6/index.spec.ts b/test/e2e/error6/index.spec.ts index b852ed6..1096c43 100644 --- a/test/e2e/error6/index.spec.ts +++ b/test/e2e/error6/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -14,7 +14,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(errors.length).toBe(0); diff --git a/test/e2e/iframe1/index.spec.ts b/test/e2e/iframe1/index.spec.ts index 6e9d51b..74104ea 100644 --- a/test/e2e/iframe1/index.spec.ts +++ b/test/e2e/iframe1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const IFRAME_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + IFRAME_DELAY); diff --git a/test/e2e/iframe2/index.spec.ts b/test/e2e/iframe2/index.spec.ts index 367a25d..c0e958d 100644 --- a/test/e2e/iframe2/index.spec.ts +++ b/test/e2e/iframe2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const IFRAME_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + IFRAME_DELAY); diff --git a/test/e2e/images1/index.spec.ts b/test/e2e/images1/index.spec.ts index 93e2028..0a1dd64 100644 --- a/test/e2e/images1/index.spec.ts +++ b/test/e2e/images1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 1000; const IMAGE_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + IMAGE_DELAY); diff --git a/test/e2e/images2/index.spec.ts b/test/e2e/images2/index.spec.ts index ddc82fd..621860d 100644 --- a/test/e2e/images2/index.spec.ts +++ b/test/e2e/images2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 1000; const IMAGE_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + IMAGE_DELAY); diff --git a/test/e2e/images3/index.spec.ts b/test/e2e/images3/index.spec.ts index 369127d..eb8d648 100644 --- a/test/e2e/images3/index.spec.ts +++ b/test/e2e/images3/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 1000; const LONGEST_IMAGE_DELAY = 400; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + LONGEST_IMAGE_DELAY); diff --git a/test/e2e/images4/index.spec.ts b/test/e2e/images4/index.spec.ts index b42eedf..505001d 100644 --- a/test/e2e/images4/index.spec.ts +++ b/test/e2e/images4/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 1000; const LONGEST_IMAGE_DELAY = 400; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + LONGEST_IMAGE_DELAY); diff --git a/test/e2e/images5/index.spec.ts b/test/e2e/images5/index.spec.ts index 6368be2..c579f5b 100644 --- a/test/e2e/images5/index.spec.ts +++ b/test/e2e/images5/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 1000; const IMAGE_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + IMAGE_DELAY); diff --git a/test/e2e/images6/index.spec.ts b/test/e2e/images6/index.spec.ts index 447913e..74a461f 100644 --- a/test/e2e/images6/index.spec.ts +++ b/test/e2e/images6/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries, entryCountIs} from '../../util/entries'; +import {getEntriesAndErrors, entryCountIs} from '../../util/entries'; const PAGELOAD_DELAY = 1000; @@ -13,7 +13,7 @@ test.describe('TTVC', () => { await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); diff --git a/test/e2e/invisible1/index.spec.ts b/test/e2e/invisible1/index.spec.ts index ccb0955..40c0c4c 100644 --- a/test/e2e/invisible1/index.spec.ts +++ b/test/e2e/invisible1/index.spec.ts @@ -1,6 +1,6 @@ import {test, expect} from '@playwright/test'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const IMAGE_DELAY = 500; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); diff --git a/test/e2e/invisible2/index.spec.ts b/test/e2e/invisible2/index.spec.ts index 4ee7c05..a4086f5 100644 --- a/test/e2e/invisible2/index.spec.ts +++ b/test/e2e/invisible2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); diff --git a/test/e2e/invisible3/index.spec.ts b/test/e2e/invisible3/index.spec.ts index 335b3a5..8177d7b 100644 --- a/test/e2e/invisible3/index.spec.ts +++ b/test/e2e/invisible3/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const SCRIPT_DELAY = 200; @@ -14,7 +14,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/invisible4/index.spec.ts b/test/e2e/invisible4/index.spec.ts index 588b8d2..4b69988 100644 --- a/test/e2e/invisible4/index.spec.ts +++ b/test/e2e/invisible4/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const SCRIPT_DELAY = 200; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/invisible5/index.spec.ts b/test/e2e/invisible5/index.spec.ts index 3524fd5..fe8416d 100644 --- a/test/e2e/invisible5/index.spec.ts +++ b/test/e2e/invisible5/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const SCRIPT_DELAY = 200; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/invisible6/index.spec.ts b/test/e2e/invisible6/index.spec.ts index 7778391..89ae78e 100644 --- a/test/e2e/invisible6/index.spec.ts +++ b/test/e2e/invisible6/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const SCRIPT_DELAY = 200; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/invisible7/index.spec.ts b/test/e2e/invisible7/index.spec.ts index 16ad718..f9be309 100644 --- a/test/e2e/invisible7/index.spec.ts +++ b/test/e2e/invisible7/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const SCRIPT_DELAY = 200; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + SCRIPT_DELAY; diff --git a/test/e2e/invisible8/index.spec.ts b/test/e2e/invisible8/index.spec.ts index 8737997..81ca3fb 100644 --- a/test/e2e/invisible8/index.spec.ts +++ b/test/e2e/invisible8/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const MUTATION_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); const expectedTtvc = PAGELOAD_DELAY + MUTATION_DELAY; diff --git a/test/e2e/output1/index.spec.ts b/test/e2e/output1/index.spec.ts index a0d65b1..d76354e 100644 --- a/test/e2e/output1/index.spec.ts +++ b/test/e2e/output1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const IMAGE_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + IMAGE_DELAY); @@ -26,7 +26,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].detail).toBeDefined(); diff --git a/test/e2e/output2/index.spec.ts b/test/e2e/output2/index.spec.ts index 3c9c77c..5928fbf 100644 --- a/test/e2e/output2/index.spec.ts +++ b/test/e2e/output2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); @@ -25,7 +25,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].detail).toBeDefined(); diff --git a/test/e2e/prerender1/index.spec.ts b/test/e2e/prerender1/index.spec.ts index 0d604f9..5b972fe 100644 --- a/test/e2e/prerender1/index.spec.ts +++ b/test/e2e/prerender1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; test.use({ // If you run this test headless, you must run with --headless=new to enable prerender2. @@ -29,7 +29,7 @@ test.describe('TTVC', () => { await page.click('a'); await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries[0].duration).toBeGreaterThanOrEqual(1000); expect(entries[0].duration).toBeLessThanOrEqual(1000 + FUDGE); @@ -54,7 +54,7 @@ test.describe('TTVC', () => { await page.click('a'); await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries[0].duration).toBeGreaterThanOrEqual(0); expect(entries[0].duration).toBeLessThanOrEqual(0 + FUDGE); @@ -82,7 +82,7 @@ test.describe('TTVC', () => { await page.click('a'); await entryCountIs(page, 1); - let entries = await getEntries(page); + let {entries} = await getEntriesAndErrors(page); expect(entries[0].duration).toBeGreaterThanOrEqual(0); expect(entries[0].duration).toBeLessThanOrEqual(0 + FUDGE); @@ -92,7 +92,7 @@ test.describe('TTVC', () => { await page.click('[data-goto="/about"]'); await entryCountIs(page, 2); - entries = await getEntries(page); + ({entries} = await getEntriesAndErrors(page)); expect(entries[1].duration).toBe(0); expect(entries[1].detail.navigationType).toBe('script'); diff --git a/test/e2e/react1/index.spec.ts b/test/e2e/react1/index.spec.ts index 1b7fcb4..a8f74e7 100644 --- a/test/e2e/react1/index.spec.ts +++ b/test/e2e/react1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); diff --git a/test/e2e/react2/index.spec.ts b/test/e2e/react2/index.spec.ts index 7965d8e..c5e9828 100644 --- a/test/e2e/react2/index.spec.ts +++ b/test/e2e/react2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const IMAGE_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + IMAGE_DELAY); diff --git a/test/e2e/scripts1/index.spec.ts b/test/e2e/scripts1/index.spec.ts index 35f6c1f..ff66e73 100644 --- a/test/e2e/scripts1/index.spec.ts +++ b/test/e2e/scripts1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const SCRIPT_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + SCRIPT_DELAY); diff --git a/test/e2e/scripts2/index.spec.ts b/test/e2e/scripts2/index.spec.ts index 868cf17..c9c4ae6 100644 --- a/test/e2e/scripts2/index.spec.ts +++ b/test/e2e/scripts2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const FIRST_SCRIPT_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + FIRST_SCRIPT_DELAY); diff --git a/test/e2e/scripts3/index.spec.ts b/test/e2e/scripts3/index.spec.ts index 2ff019e..7442ee6 100644 --- a/test/e2e/scripts3/index.spec.ts +++ b/test/e2e/scripts3/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const FIRST_SCRIPT_DELAY = 500; @@ -12,7 +12,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + FIRST_SCRIPT_DELAY); diff --git a/test/e2e/scripts4/index.spec.ts b/test/e2e/scripts4/index.spec.ts index 1f6c174..3e5e464 100644 --- a/test/e2e/scripts4/index.spec.ts +++ b/test/e2e/scripts4/index.spec.ts @@ -1,6 +1,6 @@ import {test, expect} from '@playwright/test'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { }); await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); // assert that inline resource doesn't cause ttvc to get stuck expect(entries.length).toBe(1); diff --git a/test/e2e/scripts5/index.spec.ts b/test/e2e/scripts5/index.spec.ts index b268241..ae711c3 100644 --- a/test/e2e/scripts5/index.spec.ts +++ b/test/e2e/scripts5/index.spec.ts @@ -1,6 +1,6 @@ import {test, expect} from '@playwright/test'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { }); await entryCountIs(page, 1); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); // assert that this malformed resource doesn't cause ttvc to get stuck expect(entries.length).toBe(1); diff --git a/test/e2e/spa1/index.spec.ts b/test/e2e/spa1/index.spec.ts index 149ee6e..60f8d27 100644 --- a/test/e2e/spa1/index.spec.ts +++ b/test/e2e/spa1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -14,7 +14,7 @@ test.describe('TTVC', () => { }); test('initial pageload', async ({page}) => { - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); @@ -27,7 +27,7 @@ test.describe('TTVC', () => { await page.click('[data-goto="/about"]'); await entryCountIs(page, 2); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries[1].duration).toBeGreaterThanOrEqual(0); expect(entries[1].duration).toBeLessThanOrEqual(0 + FUDGE); diff --git a/test/e2e/spa2/index.spec.ts b/test/e2e/spa2/index.spec.ts index 183b47a..72da4f3 100644 --- a/test/e2e/spa2/index.spec.ts +++ b/test/e2e/spa2/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const AJAX_DELAY = 500; @@ -15,7 +15,7 @@ test.describe('TTVC', () => { }); test('initial pageload', async ({page}) => { - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + AJAX_DELAY); @@ -28,7 +28,7 @@ test.describe('TTVC', () => { await page.click('[data-goto="/about"]'); await entryCountIs(page, 2); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries[1].duration).toBeGreaterThanOrEqual(AJAX_DELAY); expect(entries[1].duration).toBeLessThanOrEqual(AJAX_DELAY + FUDGE); @@ -52,7 +52,7 @@ test.describe('TTVC', () => { } catch (e) { // pass } - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(2); expect(entries[1].duration).toBeGreaterThanOrEqual(AJAX_DELAY); diff --git a/test/e2e/spa3/index.spec.ts b/test/e2e/spa3/index.spec.ts index 7f24f58..0c8e471 100644 --- a/test/e2e/spa3/index.spec.ts +++ b/test/e2e/spa3/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -14,7 +14,7 @@ test.describe('TTVC', () => { }); test('initial pageload', async ({page}) => { - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); @@ -32,7 +32,7 @@ test.describe('TTVC', () => { } catch (e) { // pass } - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(2); expect(entries[1].duration).toBeGreaterThanOrEqual(0); diff --git a/test/e2e/spa4/index.spec.ts b/test/e2e/spa4/index.spec.ts index ff62eb4..e5d115e 100644 --- a/test/e2e/spa4/index.spec.ts +++ b/test/e2e/spa4/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -14,7 +14,7 @@ test.describe('TTVC', () => { }); test('initial pageload', async ({page}) => { - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); @@ -27,7 +27,7 @@ test.describe('TTVC', () => { await page.click('[data-goto="/about"]'); await entryCountIs(page, 2); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries[1].duration).toBe(0); expect(entries[1].detail.navigationType).toBe('script'); diff --git a/test/e2e/spa5/index.spec.ts b/test/e2e/spa5/index.spec.ts index 458a58c..944aca4 100644 --- a/test/e2e/spa5/index.spec.ts +++ b/test/e2e/spa5/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {entryCountIs, getEntries} from '../../util/entries'; +import {entryCountIs, getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -14,7 +14,7 @@ test.describe('TTVC', () => { }); test('initial pageload', async ({page}) => { - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); @@ -32,7 +32,7 @@ test.describe('TTVC', () => { } catch (e) { // pass } - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(2); expect(entries[1].duration).toBeGreaterThanOrEqual(0); diff --git a/test/e2e/static1/index.spec.ts b/test/e2e/static1/index.spec.ts index d40de3c..6fddcc0 100644 --- a/test/e2e/static1/index.spec.ts +++ b/test/e2e/static1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY); diff --git a/test/e2e/stylesheet1/index.spec.ts b/test/e2e/stylesheet1/index.spec.ts index 93146af..a5550b6 100644 --- a/test/e2e/stylesheet1/index.spec.ts +++ b/test/e2e/stylesheet1/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; const STYLESHEET_DELAY = 500; @@ -13,7 +13,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY + STYLESHEET_DELAY); diff --git a/test/util/entries.ts b/test/util/entries.ts index 97ba069..8c8d52b 100644 --- a/test/util/entries.ts +++ b/test/util/entries.ts @@ -9,9 +9,6 @@ declare global { } } -/** Get the list of performance entries that have been recorded from the browser */ -export const getEntries = (page: Page) => page.evaluate(() => window.entries); - /** Get the list of performance entries and errors that have been recorded from the browser */ export const getEntriesAndErrors = (page: Page) => page.evaluate(() => { From ed5752b0d3de7906c42f9f4f0946bc8b91468f4d Mon Sep 17 00:00:00 2001 From: Andrew Hyndman Date: Wed, 3 Apr 2024 11:14:14 -0400 Subject: [PATCH 2/2] fixup! Updating and cleaning up e2e tests --- test/e2e/iframe3/index.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/iframe3/index.spec.ts b/test/e2e/iframe3/index.spec.ts index 7007f95..221e2dc 100644 --- a/test/e2e/iframe3/index.spec.ts +++ b/test/e2e/iframe3/index.spec.ts @@ -1,7 +1,7 @@ import {test, expect} from '@playwright/test'; import {FUDGE} from '../../util/constants'; -import {getEntries} from '../../util/entries'; +import {getEntriesAndErrors} from '../../util/entries'; const PAGELOAD_DELAY = 200; @@ -11,7 +11,7 @@ test.describe('TTVC', () => { waitUntil: 'networkidle', }); - const entries = await getEntries(page); + const {entries} = await getEntriesAndErrors(page); expect(entries.length).toBe(1); expect(entries[0].duration).toBeGreaterThanOrEqual(PAGELOAD_DELAY);