Update debug-expression detection in mochitests (#7242)

firefox-devtools · Nov 7, 2018 · 979e8a8 · 979e8a8
1 parent 45b0d4a
commit 979e8a8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/test/mochitest/helpers.js b/src/test/mochitest/helpers.js
@@ -340,11 +340,12 @@ function assertDebugLine(dbg, line) {
 
   const markedSpans = lineInfo.handle.markedSpans;
   if (markedSpans && markedSpans.length > 0) {
-    const markerIndex = Services.prefs.getBoolPref("devtools.debugger.features.column-breakpoints") ? markedSpans.length - 1 : 0;
-    const marker = markedSpans[markerIndex].marker;
+    const classMatch = markedSpans.filter(
+      span => span.marker.className.includes("debug-expression")
+    ).length > 0;
 
     ok(
-      marker.className.includes("debug-expression"),
+      classMatch,
       "expression is highlighted as paused"
     );
   }