From abfa559a9da8329b04389f6d15cb96dae4640c78 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Mon, 8 Jul 2024 08:43:51 -0400 Subject: [PATCH 1/2] Switch meta e2e tests from breakpoints-02 to logpoints-01 --- packages/e2e-tests/README.md | 2 +- packages/e2e-tests/examples.json | 4 ++-- packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts | 6 +++--- .../tests/logpoints-10_too_many_points_to_find.test.ts | 2 +- .../logpoints-11_too_many_points_to_run_analysis.test.ts | 6 +++--- .../e2e-tests/tests/react_devtools-02-integrations.test.ts | 4 ++-- test/README.md | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/e2e-tests/README.md b/packages/e2e-tests/README.md index 462f7da408f..fbc5c432302 100644 --- a/packages/e2e-tests/README.md +++ b/packages/e2e-tests/README.md @@ -150,7 +150,7 @@ You'll also probably need to specifically share that recording as "Public", espe We use 1 specific Playwright test recording which is a replay of the breakpoints-05 test from this repo. Similar to the instructions above, to update this to a more recent version, you can visit the dashboard for FE E2E Tests and select a more recent recording ID for that test. -We also now have a "golden recording" of one of our own `breakpoints-02` E2E test runs. This serves as a testbed for checking more advanced behaviors like the React and Redux routines. If we ever need to update this, just copy-paste the recording ID from a test run in our "Frontend E2E tests" workspace. +We also now have a "golden recording" of one of our own `logpoints-01` E2E test runs. This serves as a testbed for checking more advanced behaviors like the React and Redux routines. If we ever need to update this, just copy-paste the recording ID from a test run in our "Frontend E2E tests" workspace. ### Test Suite Dashboard Tests diff --git a/packages/e2e-tests/examples.json b/packages/e2e-tests/examples.json index 191b877d11e..e51278f8df7 100644 --- a/packages/e2e-tests/examples.json +++ b/packages/e2e-tests/examples.json @@ -12,8 +12,8 @@ "recording": "ee962319-b43a-4e3e-bbdd-db2ccf7a57b8", "buildId": "linux-chromium-20240418-4747c93165f9-4699f489a2b6" }, - "breakpoints-02": { - "recording": "dbe7a147-98b4-4f90-9196-678c0f3e6fc9", + "logpoints-01": { + "recording": "332ae837-23b1-48bf-96f0-a152bd628ba3", "buildId": "linux-chromium-20240705-cc8ac2ff87ab-6c7e9991dcf5", "requiresManualUpdate": true }, diff --git a/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts b/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts index b93f5f3c65d..f7521e722cb 100644 --- a/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts +++ b/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts @@ -8,7 +8,7 @@ import { getByTestName, waitFor } from "../helpers/utils"; import test from "../testFixture"; // trunk-ignore(gitleaks/generic-api-key) -test.use({ exampleKey: "breakpoints-02" }); +test.use({ exampleKey: "logpoints-01" }); async function checkForJumpButton(actionListItem: Locator, shouldBeEnabled: boolean) { const jumpButton = getEventJumpButton(actionListItem); @@ -90,8 +90,8 @@ test(`jump-to-code-02: Redux J2C functionality`, async ({ await closeSource(page, "SourcesTree.tsx"); // Inside of an adapter that passes dispatch-wrapped actions to - // This is also one tick off, but should still _display_ as "1/3" + // This is also one tick off, but should still _display_ as "1/10" jumpToReduxDispatch(page, "quickOpen/setQuickOpenQuery"); - await verifyJumpToCodeResults(page, "QuickOpenModal.tsx", 551, { current: 1, total: 3 }); + await verifyJumpToCodeResults(page, "QuickOpenModal.tsx", 551, { current: 1, total: 10 }); await closeSource(page, "QuickOpenModal.tsx"); }); diff --git a/packages/e2e-tests/tests/logpoints-10_too_many_points_to_find.test.ts b/packages/e2e-tests/tests/logpoints-10_too_many_points_to_find.test.ts index d4d7ce848af..9aefe2de72d 100644 --- a/packages/e2e-tests/tests/logpoints-10_too_many_points_to_find.test.ts +++ b/packages/e2e-tests/tests/logpoints-10_too_many_points_to_find.test.ts @@ -16,7 +16,7 @@ const sourceUrl = "react-dom.production.js"; const lineNumber = 150; // trunk-ignore(gitleaks/generic-api-key) -test.use({ exampleKey: "breakpoints-02" }); +test.use({ exampleKey: "logpoints-01" }); test(`logpoints-10: too-many-points-to-find UX`, async ({ pageWithMeta: { page, recordingId, testScope }, diff --git a/packages/e2e-tests/tests/logpoints-11_too_many_points_to_run_analysis.test.ts b/packages/e2e-tests/tests/logpoints-11_too_many_points_to_run_analysis.test.ts index d26c561f84b..1cbc1c604d4 100644 --- a/packages/e2e-tests/tests/logpoints-11_too_many_points_to_run_analysis.test.ts +++ b/packages/e2e-tests/tests/logpoints-11_too_many_points_to_run_analysis.test.ts @@ -11,12 +11,12 @@ import { getFocusBeginTime, getFocusEndTime, setFocusRange } from "../helpers/ti import test, { expect } from "../testFixture"; // We need 500...10k hits -// Line 301 has 534 hits +// Line 12196 has 4.4k hits const sourceUrl = "react-dom.production.js"; -const lineNumber = 301; +const lineNumber = 12196; // trunk-ignore(gitleaks/generic-api-key) -test.use({ exampleKey: "breakpoints-02" }); +test.use({ exampleKey: "logpoints-01" }); test(`logpoints-11: too-many-points-to-run-analysis UX`, async ({ pageWithMeta: { page, recordingId, testScope }, diff --git a/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts b/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts index 667b4d22925..6cdffefbf2f 100644 --- a/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts +++ b/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts @@ -17,7 +17,7 @@ import test, { expect } from "../testFixture"; // Why is this even getting confused as an API key? // trunk-ignore(gitleaks/generic-api-key) -test.use({ exampleKey: "breakpoints-02" }); +test.use({ exampleKey: "logpoints-01" }); test("react_devtools-02: RDT integrations (Chromium)", async ({ pageWithMeta: { page, recordingId, testScope }, @@ -32,7 +32,7 @@ test("react_devtools-02: RDT integrations (Chromium)", async ({ await openDevToolsTab(page); - await warpToMessage(page, "Waiting for breakpoint at doc_rr_basic.html:21 (waitForBreakpoint)"); + await warpToMessage(page, "Waiting for breakpoint at doc_rr_basic.html:20 (waitForBreakpoint)"); // If the "React" tab shows up, we know that the routine ran await openReactDevtoolsPanel(page); diff --git a/test/README.md b/test/README.md index 4f1840759be..b81d9879879 100644 --- a/test/README.md +++ b/test/README.md @@ -10,7 +10,7 @@ Tests are defined in the `manifest.js` file. // Example browser based e2e tests { "example": "doc_rr_basic.html", - "script": "breakpoints-02.js", + "script": "logpoints-01.js", "targets": ["gecko", "chromium"] }, From 85bc145005058e8ee47d55bd1a48525efe4459fb Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Mon, 8 Jul 2024 13:47:48 -0400 Subject: [PATCH 2/2] Remove unnecessary trunk-ignore comments --- packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts | 1 - .../tests/logpoints-10_too_many_points_to_find.test.ts | 1 - .../tests/logpoints-11_too_many_points_to_run_analysis.test.ts | 1 - packages/e2e-tests/tests/react_devtools-02-integrations.test.ts | 2 -- 4 files changed, 5 deletions(-) diff --git a/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts b/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts index f7521e722cb..039462cfd2b 100644 --- a/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts +++ b/packages/e2e-tests/tests/jump-to-code-02_redux-j2c.test.ts @@ -7,7 +7,6 @@ import { closeSource, verifyJumpToCodeResults } from "../helpers/source-panel"; import { getByTestName, waitFor } from "../helpers/utils"; import test from "../testFixture"; -// trunk-ignore(gitleaks/generic-api-key) test.use({ exampleKey: "logpoints-01" }); async function checkForJumpButton(actionListItem: Locator, shouldBeEnabled: boolean) { diff --git a/packages/e2e-tests/tests/logpoints-10_too_many_points_to_find.test.ts b/packages/e2e-tests/tests/logpoints-10_too_many_points_to_find.test.ts index 9aefe2de72d..5e01b4a2507 100644 --- a/packages/e2e-tests/tests/logpoints-10_too_many_points_to_find.test.ts +++ b/packages/e2e-tests/tests/logpoints-10_too_many_points_to_find.test.ts @@ -15,7 +15,6 @@ import test from "../testFixture"; const sourceUrl = "react-dom.production.js"; const lineNumber = 150; -// trunk-ignore(gitleaks/generic-api-key) test.use({ exampleKey: "logpoints-01" }); test(`logpoints-10: too-many-points-to-find UX`, async ({ diff --git a/packages/e2e-tests/tests/logpoints-11_too_many_points_to_run_analysis.test.ts b/packages/e2e-tests/tests/logpoints-11_too_many_points_to_run_analysis.test.ts index 1cbc1c604d4..67a451f299b 100644 --- a/packages/e2e-tests/tests/logpoints-11_too_many_points_to_run_analysis.test.ts +++ b/packages/e2e-tests/tests/logpoints-11_too_many_points_to_run_analysis.test.ts @@ -15,7 +15,6 @@ import test, { expect } from "../testFixture"; const sourceUrl = "react-dom.production.js"; const lineNumber = 12196; -// trunk-ignore(gitleaks/generic-api-key) test.use({ exampleKey: "logpoints-01" }); test(`logpoints-11: too-many-points-to-run-analysis UX`, async ({ diff --git a/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts b/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts index 6cdffefbf2f..f6cd6911bb8 100644 --- a/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts +++ b/packages/e2e-tests/tests/react_devtools-02-integrations.test.ts @@ -15,8 +15,6 @@ import { getSelectedLineNumber, waitForSelectedSource } from "../helpers/source- import { debugPrint, waitFor } from "../helpers/utils"; import test, { expect } from "../testFixture"; -// Why is this even getting confused as an API key? -// trunk-ignore(gitleaks/generic-api-key) test.use({ exampleKey: "logpoints-01" }); test("react_devtools-02: RDT integrations (Chromium)", async ({