Bug 1517334 - [release 114] sync release-111. r=dwalsh
authorJason Laster <jlaster@mozilla.com>
Wed, 02 Jan 2019 15:59:34 -0500
changeset 509424 5b364b919152b7053d4846f20681e1442890c4ea
parent 509423 70ff3d9a4af6623fa830cd9335ed1e17584304ef
child 509425 83f92b601b0e1b2a53d341aad6a6c29945529170
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdwalsh
bugs1517334
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517334 - [release 114] sync release-111. r=dwalsh
devtools/client/debugger/new/src/actions/sources/newSources.js
devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-columns.js
devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-cond.js
--- a/devtools/client/debugger/new/src/actions/sources/newSources.js
+++ b/devtools/client/debugger/new/src/actions/sources/newSources.js
@@ -58,19 +58,19 @@ function loadSourceMaps(sources: Source[
     }
 
     const sourceList = await Promise.all(
       sources.map(async ({ id }) => {
         const originalSources = await dispatch(loadSourceMap(id));
         sourceQueue.queueSources(originalSources);
         return originalSources;
       })
-    )
+    );
 
-    await sourceQueue.flush()
+    await sourceQueue.flush();
     return flatten(sourceList);
   };
 }
 
 /**
  * @memberof actions/sources
  * @static
  */
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-columns.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-columns.js
@@ -41,17 +41,17 @@ async function setConditionalBreakpoint(
 function removeBreakpointViaContext(dbg, index) {
   rightClickElement(dbg, "breakpointItem", index);
   selectContextMenuItem(dbg, "#node-menu-delete-self");
 }
 
 // Test enabling and disabling a breakpoint using the check boxes
 add_task(async function() {
   const dbg = await initDebugger("doc-scripts.html", "simple1");
-  await pushPref("devtools.debugger.features.column-breakpoints", true);
+  await pushPref("devtools.debugger.features.column-breakpoints", false);
 
   if(!Services.prefs.getBoolPref("devtools.debugger.features.column-breakpoints")) {
     ok(true, "This test only applies when column breakpoints are on");
     return;
   }
 
   await selectSource(dbg, "simple1");
 
--- a/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-cond.js
+++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-cond.js
@@ -54,30 +54,32 @@ async function setConditionalBreakpoint(
   // Position cursor reliably at the end of the text.
   pressKey(dbg, "End");
   type(dbg, condition);
   pressKey(dbg, "Enter");
 }
 
 add_task(async function() {
   const dbg = await initDebugger("doc-scripts.html", "simple2");
+  await pushPref("devtools.debugger.features.column-breakpoints", false);
+
   await selectSource(dbg, "simple2");
   await waitForSelectedSource(dbg, "simple2");
 
   await setConditionalBreakpoint(dbg, 5, "1");
   await waitForDispatch(dbg, "ADD_BREAKPOINT");
   
   let bp = findBreakpoint(dbg, "simple2", 5);
   is(bp.condition, "1", "breakpoint is created with the condition");
   assertEditorBreakpoint(dbg, 5, true);
 
   await setConditionalBreakpoint(dbg, 5, "2");
   await waitForDispatch(dbg, "SET_BREAKPOINT_CONDITION");
   bp = findBreakpoint(dbg, "simple2", 5);
-  is(bp.condition, "12", "breakpoint is created with the condition");
+  is(bp.condition, "2", "breakpoint is created with the condition");
   assertEditorBreakpoint(dbg, 5, true);
 
   clickElement(dbg, "gutter", 5);
   await waitForDispatch(dbg, "REMOVE_BREAKPOINT");
   bp = findBreakpoint(dbg, "simple2", 5);
   is(bp, null, "breakpoint was removed");
   assertEditorBreakpoint(dbg, 5, false);