tweak tests for pause points

Author: jasonLaster

src/test/mochitest/browser_dbg-navigation.js

@@ -47,6 +47,8 @@ add_task(async function() {
   // Test that the current select source persists across reloads
   await selectSource(dbg, "long.js");
   await reload(dbg, "long.js");
+  await waitForSelectedSource(dbg, "long.js");
+
   ok(
     getSelectedSource(getState())
       .get("url")

src/test/mochitest/browser_dbg-pause-ux.js

@@ -24,7 +24,7 @@ add_task(async function() {
   let longSrc = findSource(dbg, "long.js");
   await addBreakpoint(dbg, longSrc, 66);
   invokeInTab("testModel");
-  await waitForPaused(dbg);
+  await waitForPaused(dbg, "long.js");
 
   const pauseScrollTop = getScrollTop(dbg);
 

src/test/mochitest/browser_dbg-reload.js

@@ -23,7 +23,8 @@ add_task(async function() {
   await selectSource(dbg, "sjs_code_reload");
   await addBreakpoint(dbg, "sjs_code_reload", 2);
 
-  await reload(dbg, "sjs_code_reload");
+  await reload(dbg, "sjs_code_reload.sjs");
+  await waitForSelectedSource(dbg, "sjs_code_reload.sjs")
 
   const source = findSource(dbg, "sjs_code_reload");
   const location = { sourceId: source.id, line: 6 };

src/test/mochitest/browser_dbg-stepping.js

@@ -4,18 +4,10 @@
  // This test can be really slow on debug platforms
  requestLongerTimeout(3);
 
-function assertSelectedFile(dbg, url) {
-  const selectedLocation = dbg.selectors.getSelectedSource(dbg.getState());
-  ok(selectedLocation, "The debugger should be at the paused location")
-  const selectedUrl = selectedLocation.get("url");
-  return ok( selectedUrl.includes(url), `The debugger should be paused at ${url}"`);
-}
-
 add_task(async function test() {
   const dbg = await initDebugger("big-sourcemap.html", "big-sourcemap");
   invokeInTab("hitDebugStatement");
-  await waitForPaused(dbg);
-  assertSelectedFile(dbg, "bundle.js");
+  await waitForPaused(dbg, "bundle.js");
 
   await stepIn(dbg);
   await stepIn(dbg);
@@ -32,7 +24,6 @@ add_task(async function test() {
   await stepIn(dbg);
   await stepIn(dbg);
 
-  assertSelectedFile(dbg, "bundle.js");
-  assertDebugLine(dbg, 42309);
+  assertDebugLine(dbg, 42264);
   assertPausedLocation(dbg);
 });

src/test/mochitest/head.js

@@ -423,21 +423,17 @@ async function waitForLoadedScopes(dbg) {
  * @param {Object} dbg
  * @static
  */
-async function waitForPaused(dbg) {
+async function waitForPaused(dbg, url) {
   const { getSelectedScope } = dbg.selectors;
 
-  const onScopesLoaded = waitForLoadedScopes(dbg);
-  const onStateChanged = waitForState(
+  await waitForState(
     dbg,
-    state => {
-      const paused = isPaused(dbg);
-      const scope = !!getSelectedScope(state);
-      return paused && scope;
-    },
+    state => isPaused(dbg) && !!getSelectedScope(state),
     "paused"
   );
 
-  await Promise.all([onStateChanged, onScopesLoaded]);
+  await waitForLoadedScopes(dbg);
+  await waitForSelectedSource(dbg, url);
 }
 
 /*
@@ -628,6 +624,8 @@ function closeTab(dbg, url) {
  * @static
  */
 async function stepOver(dbg) {
+  const pauseLine = getVisibleSelectedFrameLine(dbg);
+  info(`Stepping over from ${pauseLine}`);
   await dbg.actions.stepOver();
   return waitForPaused(dbg);
 }
@@ -641,7 +639,8 @@ async function stepOver(dbg) {
  * @static
  */
 async function stepIn(dbg) {
-  info("Stepping in");
+  const pauseLine = getVisibleSelectedFrameLine(dbg);
+  info(`Stepping in from ${pauseLine}`);
   await dbg.actions.stepIn();
   return waitForPaused(dbg);
 }
@@ -655,7 +654,8 @@ async function stepIn(dbg) {
  * @static
  */
 async function stepOut(dbg) {
-  info("Stepping out");
+  const pauseLine = getVisibleSelectedFrameLine(dbg);
+  info(`Stepping out from ${pauseLine}`);
   await dbg.actions.stepOut();
   return waitForPaused(dbg);
 }
@@ -669,7 +669,8 @@ async function stepOut(dbg) {
  * @static
  */
 function resume(dbg) {
-  info("Resuming");
+  const pauseLine = getVisibleSelectedFrameLine(dbg);
+  info(`Resuming from ${pauseLine}`);
   return dbg.actions.resume();
 }
 

src/workers/parser/pausePoints.js

@@ -7,6 +7,7 @@
 import { traverseAst } from "./utils/ast";
 import * as t from "@babel/types";
 import isEqual from "lodash/isEqual";
+import uniqBy from "lodash/uniqBy";
 
 import type { AstLocation } from "./types";
 import type { BabelNode } from "@babel/types";
@@ -44,10 +45,18 @@ const inExpression = (parent, grandParent) =>
 const isExport = node =>
   t.isExportNamedDeclaration(node) || t.isExportDefaultDeclaration(node);
 
+function removeDuplicatePoints(state) {
+  return uniqBy(
+    state,
+    ({ location }) => `${location.line}-$${location.column}`
+  );
+}
+
 export function getPausePoints(sourceId: string) {
   const state = [];
   traverseAst(sourceId, { enter: onEnter }, state);
-  return state;
+  const uniqPoints = removeDuplicatePoints(state);
+  return uniqPoints;
 }
 
 function onEnter(node: BabelNode, ancestors: SimplePath[], state) {
@@ -139,10 +148,6 @@ function addPoint(
   location,
   types = { breakpoint: true, stepOver: true }
 ) {
-  if (state.find(point => isEqual(point.location, location))) {
-    return;
-  }
-
   state.push(formatNode(location, types));
 }