Experimental merge main

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-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.
+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
 

packages/e2e-tests/authenticated/logpoints-01.test.ts

@@ -64,7 +64,7 @@ test(`authenticated/logpoints-01: Shared logpoints functionality`, async ({
     const page = await context.newPage();
     await load(page, recordingId, testUsers![1].apiKey, testScope);
 
-    const locator = await findPoints(page, "logpoint", { lineNumber });
+    const locator = await findPoints(page, { lineNumber });
 
     // Verify point is not editable
     await expect(await isPointEditable(locator)).toBe(false);

packages/e2e-tests/helpers/pause-information-panel.ts

@@ -18,10 +18,6 @@ async function toggleAccordionPane(page: Page, pane: Locator, targetState: "open
   }
 }
 
-export async function closeBreakpointsAccordionPane(page: Page): Promise<void> {
-  await toggleAccordionPane(page, getBreakpointsAccordionPane(page), "closed");
-}
-
 export async function closeCallStackAccordionPane(page: Page): Promise<void> {
   await toggleAccordionPane(page, getCallStackAccordionPane(page), "closed");
 }
@@ -33,6 +29,8 @@ export async function closePrintStatementsAccordionPane(page: Page): Promise<voi
 export async function expandAllScopesBlocks(page: Page): Promise<void> {
   await debugPrint(page, "Expanding all Scopes blocks", "expandAllScopesBlocks");
 
+  await openPauseInformationPanel(page);
+
   const scopesPanel = getScopesPanel(page);
   const blocks = scopesPanel.locator('[data-test-name="ScopesInspector"]');
 
@@ -47,7 +45,7 @@ export async function expandAllScopesBlocks(page: Page): Promise<void> {
 
 export async function closeSidePanel(page: Page) {
   // Ensure that it's closed by forcing the "Pause" pane to open instead...
-  const pane = getBreakpointsAccordionPane(page);
+  const pane = getPrintStatementsAccordionPane(page);
   const pauseButton = page.locator('[data-test-name="ToolbarButton-PauseInformation"]');
   await pauseButton.click();
   const isVisible = await pane.isVisible();
@@ -56,10 +54,6 @@ export async function closeSidePanel(page: Page) {
   }
 }
 
-export function getBreakpointsAccordionPane(page: Page): Locator {
-  return page.locator('[data-test-id="AccordionPane-Breakpoints"]');
-}
-
 export function getCallStackAccordionPane(page: Page): Locator {
   return page.locator('[data-test-id="AccordionPane-CallStack"]');
 }
@@ -108,17 +102,13 @@ export function getScopesPanel(page: Page): Locator {
   return page.locator('[data-test-name="ScopesList"]');
 }
 
-export async function openBreakpointsAccordionPane(page: Page): Promise<void> {
-  await toggleAccordionPane(page, getBreakpointsAccordionPane(page), "open");
-}
-
 export async function openCallStackPane(page: Page): Promise<void> {
   await toggleAccordionPane(page, getCallStackAccordionPane(page), "open");
 }
 
 export async function openPauseInformationPanel(page: Page): Promise<void> {
   // Only click if it's not already open; clicking again will collapse the side bar.
-  const pane = getBreakpointsAccordionPane(page);
+  const pane = getPrintStatementsAccordionPane(page);
 
   let isVisible = await pane.isVisible();
   if (!isVisible) {
@@ -158,14 +148,6 @@ export async function openScopeBlocks(page: Page, text: string): Promise<void> {
   });
 }
 
-export async function resumeToLine(page: Page, line: number): Promise<void> {
-  await debugPrint(page, `Resuming to line ${chalk.bold(line)}`, "resumeToLine");
-
-  await clickCommandBarButton(page, "Resume");
-
-  await waitForPaused(page, line);
-}
-
 export async function clickCommandBarButton(page: Page, title: string): Promise<void> {
   await debugPrint(page, title, "clickCommandBarButton");
 
@@ -190,23 +172,11 @@ export async function reverseStepOverToLine(page: Page, line: number) {
   await waitForPaused(page, line);
 }
 
-export async function rewind(page: Page) {
-  await debugPrint(page, "Rewinding", "rewind");
-
-  await clickCommandBarButton(page, "Rewind Execution");
-}
-
-export async function rewindToLine(page: Page, line: number): Promise<void> {
-  await debugPrint(page, `Rewinding to line ${chalk.bold(line)}`, "rewindToLine");
-
-  await clickCommandBarButton(page, "Rewind Execution");
-
-  await waitForPaused(page, line);
-}
-
 export async function selectFrame(page: Page, index: number): Promise<void> {
   await debugPrint(page, `Select frame ${chalk.bold(index)}`, "selectFrame");
 
+  await openPauseInformationPanel(page);
+
   const framesPanel = getFramesPanel(page);
 
   const frameListItems = framesPanel.locator(".frame");
@@ -362,7 +332,6 @@ export async function waitForScopeValue(
 
 export function findPoints(
   page: Page,
-  type: "logpoint" | "breakpoint",
   options: {
     sourceId?: SourceId;
     lineNumber?: number;
@@ -372,8 +341,7 @@ export function findPoints(
   const { columnIndex, lineNumber, sourceId } = options;
 
   const selectorCriteria = [
-    '[data-test-name="Breakpoint"]',
-    `[data-test-type="${type}"]`,
+    '[data-test-name="LogPoint"]',
     columnIndex != null ? `[data-test-column-index="${columnIndex}"]` : "",
     lineNumber != null ? `[data-test-line-number="${lineNumber}"]` : "",
     sourceId != null ? `[data-test-source-id="${sourceId}"]` : "",
@@ -383,17 +351,17 @@ export function findPoints(
 }
 
 export async function isPointEditable(pointLocator: Locator) {
-  const editButton = pointLocator.locator('[data-test-name="RemoveBreakpointButton"]');
+  const editButton = pointLocator.locator('[data-test-name="RemoveLogPointButton"]');
   return (await editButton.count()) > 0;
 }
 
 export async function removePoint(pointLocator: Locator) {
-  await pointLocator.locator('[data-test-name="RemoveBreakpointButton"]').first().click();
+  await pointLocator.locator('[data-test-name="RemoveLogPointButton"]').first().click();
 }
 
 export async function togglePoint(page: Page, pointLocator: Locator, enabled: boolean) {
   const targetState = enabled ? POINT_BEHAVIOR_ENABLED : POINT_BEHAVIOR_DISABLED_TEMPORARILY;
-  const toggle = pointLocator.locator('[data-test-name="BreakpointToggle"]');
+  const toggle = pointLocator.locator('[data-test-name="LogPointToggle"]');
   const currentState = await toggle.getAttribute("date-test-state");
   if (targetState !== currentState) {
     await debugPrint(page, `Toggling point to ${targetState}`, "togglePoint");