Bug 1314057 - Remove tests not relevant to the new debugger. r=jlast
authorDavid Walsh <dwalsh@mozilla.com>
Fri, 28 Sep 2018 14:52:05 -0500
changeset 494738 1e22371f8221f67506ebabd7b03cca6e2325995e
parent 494737 0ae9f4ff48d9915b5de8384297d8fdf0cc562438
child 494739 6237c17e8ac6e5a829f336e1c0b2dd5cfe985a4b
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlast
bugs1314057
milestone64.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 1314057 - Remove tests not relevant to the new debugger. r=jlast
devtools/client/debugger/test/mochitest/browser.ini
devtools/client/debugger/test/mochitest/browser2.ini
devtools/client/debugger/test/mochitest/browser_dbg_editor-contextmenu.js
devtools/client/debugger/test/mochitest/browser_dbg_function-display-name.js
devtools/client/debugger/test/mochitest/browser_dbg_searchbox-help-popup-01.js
devtools/client/debugger/test/mochitest/browser_dbg_searchbox-help-popup-02.js
devtools/client/debugger/test/mochitest/browser_dbg_searchbox-parse.js
devtools/client/debugger/test/mochitest/browser_dbg_source-maps-01.js
devtools/client/debugger/test/mochitest/browser_dbg_source-maps-02.js
devtools/client/debugger/test/mochitest/browser_dbg_source-maps-03.js
devtools/client/debugger/test/mochitest/browser_dbg_source-maps-04.js
--- a/devtools/client/debugger/test/mochitest/browser.ini
+++ b/devtools/client/debugger/test/mochitest/browser.ini
@@ -245,33 +245,27 @@ skip-if = e10s && debug
 [browser_dbg_controller-evaluate-01.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
 [browser_dbg_controller-evaluate-02.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
 [browser_dbg_debugger-statement.js]
 skip-if = e10s && debug
-[browser_dbg_editor-contextmenu.js]
-uses-unsafe-cpows = true
-skip-if = e10s && debug
 [browser_dbg_event-listeners-01.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
 [browser_dbg_event-listeners-02.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
 [browser_dbg_event-listeners-03.js]
 skip-if = e10s && debug
 [browser_dbg_file-reload.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
-[browser_dbg_function-display-name.js]
-uses-unsafe-cpows = true
-skip-if = e10s && debug
 [browser_dbg_global-method-override.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
 [browser_dbg_globalactor.js]
 skip-if = e10s
 [browser_dbg_host-layout.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
--- a/devtools/client/debugger/test/mochitest/browser2.ini
+++ b/devtools/client/debugger/test/mochitest/browser2.ini
@@ -150,36 +150,16 @@ skip-if = true # Bug 1177730
 uses-unsafe-cpows = true
 skip-if = e10s && debug
 [browser_dbg_promises-rejection-stack.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
 [browser_dbg_reload-same-script.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
-[browser_dbg_searchbox-help-popup-01.js]
-uses-unsafe-cpows = true
-skip-if = e10s && debug
-[browser_dbg_searchbox-help-popup-02.js]
-uses-unsafe-cpows = true
-skip-if = e10s && debug
-[browser_dbg_searchbox-parse.js]
-uses-unsafe-cpows = true
-skip-if = (debug) || (os == 'linux' && asan) # asan, bug 1313861, debug: bug 1313861
-[browser_dbg_source-maps-01.js]
-uses-unsafe-cpows = true
-skip-if = e10s && debug
-[browser_dbg_source-maps-02.js]
-uses-unsafe-cpows = true
-skip-if = e10s && debug
-[browser_dbg_source-maps-03.js]
-uses-unsafe-cpows = true
-skip-if = e10s && debug
-[browser_dbg_source-maps-04.js]
-skip-if = e10s # Bug 1093535
 [browser_dbg_sources-cache.js]
 uses-unsafe-cpows = true
 [browser_dbg_sources-iframe-reload.js]
 uses-unsafe-cpows = true
 skip-if = (os == "linux" && debug && bits == 64) #Bug 1455225, disable on Linux x64 debug for frequent failures
 [browser_dbg_sources-labels.js]
 uses-unsafe-cpows = true
 skip-if = e10s && debug
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_editor-contextmenu.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Bug 731394: Test the debugger source editor default context menu.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
-
-function test() {
-  let gTab, gPanel, gDebugger;
-  let gEditor, gSources, gContextMenu;
-
-  let options = {
-    source: EXAMPLE_URL + "code_script-switching-01.js",
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gTab = aTab;
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-    gEditor = gDebugger.DebuggerView.editor;
-    gSources = gDebugger.DebuggerView.Sources;
-    gContextMenu = gDebugger.document.getElementById("sourceEditorContextMenu");
-
-    waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1).then(performTest).catch(info);
-    callInTab(gTab, "firstCall");
-  });
-
-  function performTest() {
-    is(gDebugger.gThreadClient.state, "paused",
-      "Should only be getting stack frames while paused.");
-    is(gSources.itemCount, 2,
-      "Found the expected number of sources.");
-    is(gEditor.getText().indexOf("debugger"), 166,
-      "The correct source was loaded initially.");
-    is(gSources.selectedValue, gSources.values[1],
-      "The correct source is selected.");
-
-    is(gEditor.getText().indexOf("\u263a"), 162,
-      "Unicode characters are converted correctly.");
-
-    ok(gContextMenu,
-      "The source editor's context menupopup is available.");
-    ok(gEditor.getOption("readOnly"),
-      "The source editor is read only.");
-
-    gEditor.focus();
-    gEditor.setSelection({ line: 1, ch: 0 }, { line: 1, ch: 10 });
-
-    once(gContextMenu, "popupshown").then(testContextMenu).catch(info);
-    gContextMenu.openPopup(gEditor.container, "overlap", 0, 0, true, false);
-  }
-
-  function testContextMenu() {
-    let document = gDebugger.document;
-
-    ok(document.getElementById("editMenuCommands"),
-      "#editMenuCommands found.");
-    ok(!document.getElementById("editMenuKeys"),
-      "#editMenuKeys not found.");
-
-    gContextMenu.hidePopup();
-    resumeDebuggerThenCloseAndFinish(gPanel);
-  }
-}
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_function-display-name.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests that anonymous functions appear in the stack frame list with either
- * their displayName property or a SpiderMonkey-inferred name.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_function-display-name.html";
-
-var gTab, gPanel, gDebugger;
-
-function test() {
-  let options = {
-    source: TAB_URL,
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gTab = aTab;
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-
-    testAnonCall();
-  });
-}
-
-function testAnonCall() {
-  let onCaretUpdated = waitForCaretUpdated(gPanel, 15);
-  let onScopes = waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES);
-  callInTab(gTab, "evalCall");
-  promise.all([onCaretUpdated, onScopes]).then(() => {
-    ok(isCaretPos(gPanel, 15),
-      "The source editor caret position was incorrect.");
-    is(gDebugger.gThreadClient.state, "paused",
-      "Should only be getting stack frames while paused.");
-    is(gDebugger.document.querySelectorAll(".dbg-stackframe").length, 3,
-      "Should have three frames.");
-    is(gDebugger.document.querySelector("#stackframe-0 .dbg-stackframe-title").getAttribute("value"),
-      "anonFunc", "Frame name should be 'anonFunc'.");
-
-    testInferredName();
-  });
-}
-
-function testInferredName() {
-  waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES).then(() => {
-    ok(isCaretPos(gPanel, 15),
-      "The source editor caret position was incorrect.");
-    is(gDebugger.gThreadClient.state, "paused",
-      "Should only be getting stack frames while paused.");
-    is(gDebugger.document.querySelectorAll(".dbg-stackframe").length, 3,
-      "Should have three frames.");
-    is(gDebugger.document.querySelector("#stackframe-0 .dbg-stackframe-title").getAttribute("value"),
-      "a/<", "Frame name should be 'a/<'.");
-
-    resumeDebuggerThenCloseAndFinish(gPanel);
-  });
-
-  gDebugger.gThreadClient.resume();
-}
-
-registerCleanupFunction(function () {
-  gTab = null;
-  gPanel = null;
-  gDebugger = null;
-});
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_searchbox-help-popup-01.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Make sure that the searchbox popup is displayed when focusing the searchbox,
- * and hidden when the user starts typing.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
-
-var gTab, gPanel, gDebugger;
-var gSearchBox, gSearchBoxPanel;
-
-function test() {
-  let options = {
-    source: EXAMPLE_URL + "code_script-switching-01.js",
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gTab = aTab;
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-    gSearchBox = gDebugger.DebuggerView.Filtering._searchbox;
-    gSearchBoxPanel = gDebugger.DebuggerView.Filtering._searchboxHelpPanel;
-
-    waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1)
-      .then(showPopup)
-      .then(hidePopup)
-      .then(() => resumeDebuggerThenCloseAndFinish(gPanel))
-      .catch(aError => {
-        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
-      });
-
-    callInTab(gTab, "firstCall");
-  });
-}
-
-function showPopup() {
-  is(gSearchBoxPanel.state, "closed",
-    "The search box panel shouldn't be visible yet.");
-
-  let finished = once(gSearchBoxPanel, "popupshown");
-  EventUtils.sendMouseEvent({ type: "click" }, gSearchBox, gDebugger);
-  return finished;
-}
-
-function hidePopup() {
-  is(gSearchBoxPanel.state, "open",
-    "The search box panel should be visible after searching started.");
-
-  let finished = once(gSearchBoxPanel, "popuphidden");
-  setText(gSearchBox, "#");
-  return finished;
-}
-
-registerCleanupFunction(function () {
-  gTab = null;
-  gPanel = null;
-  gDebugger = null;
-  gSearchBox = null;
-  gSearchBoxPanel = null;
-});
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_searchbox-help-popup-02.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Make sure that the searchbox popup isn't displayed when there's some text
- * already present.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
-
-var gTab, gPanel, gDebugger;
-var gEditor, gSearchBox, gSearchBoxPanel;
-
-function test() {
-  let options = {
-    source: EXAMPLE_URL + "code_script-switching-01.js",
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gTab = aTab;
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-    gEditor = gDebugger.DebuggerView.editor;
-    gSearchBox = gDebugger.DebuggerView.Filtering._searchbox;
-    gSearchBoxPanel = gDebugger.DebuggerView.Filtering._searchboxHelpPanel;
-
-    once(gSearchBoxPanel, "popupshown").then(() => {
-      ok(false, "Damn it, this shouldn't have happened.");
-    });
-
-    waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1)
-      .then(tryShowPopup)
-      .then(focusEditor)
-      .then(testFocusLost)
-      .then(() => resumeDebuggerThenCloseAndFinish(gPanel))
-      .catch(aError => {
-        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
-      });
-
-    callInTab(gTab, "firstCall");
-  });
-}
-
-function tryShowPopup() {
-  setText(gSearchBox, "#call()");
-  ok(isCaretPos(gPanel, 4, 22),
-    "The editor caret position appears to be correct.");
-  ok(isEditorSel(gPanel, [125, 131]),
-    "The editor selection appears to be correct.");
-  is(gEditor.getSelection(), "Call()",
-    "The editor selected text appears to be correct.");
-
-  is(gSearchBoxPanel.state, "closed",
-    "The search box panel shouldn't be visible yet.");
-
-  EventUtils.sendMouseEvent({ type: "click" }, gSearchBox, gDebugger);
-}
-
-function focusEditor() {
-  let deferred = promise.defer();
-
-  // Focusing the editor takes a tick to update the caret and selection.
-  gEditor.focus();
-  executeSoon(deferred.resolve);
-
-  return deferred.promise;
-}
-
-function testFocusLost() {
-  ok(isCaretPos(gPanel, 4, 22),
-    "The editor caret position appears to be correct after gaining focus.");
-  ok(isEditorSel(gPanel, [125, 131]),
-    "The editor selection appears to be correct after gaining focus.");
-  is(gEditor.getSelection(), "Call()",
-    "The editor selected text appears to be correct after gaining focus.");
-
-  is(gSearchBoxPanel.state, "closed",
-    "The search box panel should still not be visible.");
-}
-
-registerCleanupFunction(function () {
-  gTab = null;
-  gPanel = null;
-  gDebugger = null;
-  gEditor = null;
-  gSearchBox = null;
-  gSearchBoxPanel = null;
-});
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_searchbox-parse.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests that text entered in the debugger's searchbox is properly parsed.
- */
-
-function test() {
-  initDebugger().then(([aTab,, aPanel]) => {
-    let filterView = aPanel.panelWin.DebuggerView.Filtering;
-    let searchbox = aPanel.panelWin.DebuggerView.Filtering._searchbox;
-
-    setText(searchbox, "");
-    is(filterView.searchData.toSource(), '["", [""]]',
-      "The searchbox data wasn't parsed correctly (1).");
-
-    setText(searchbox, "#token");
-    is(filterView.searchData.toSource(), '["#", ["", "token"]]',
-      "The searchbox data wasn't parsed correctly (2).");
-
-    setText(searchbox, ":42");
-    is(filterView.searchData.toSource(), '[":", ["", 42]]',
-      "The searchbox data wasn't parsed correctly (3).");
-
-    setText(searchbox, "#token:42");
-    is(filterView.searchData.toSource(), '["#", ["", "token:42"]]',
-      "The searchbox data wasn't parsed correctly (4).");
-
-    setText(searchbox, ":42#token");
-    is(filterView.searchData.toSource(), '["#", [":42", "token"]]',
-      "The searchbox data wasn't parsed correctly (5).");
-
-    setText(searchbox, "#token:42#token:42");
-    is(filterView.searchData.toSource(), '["#", ["#token:42", "token:42"]]',
-      "The searchbox data wasn't parsed correctly (6).");
-
-    setText(searchbox, ":42#token:42#token");
-    is(filterView.searchData.toSource(), '["#", [":42#token:42", "token"]]',
-      "The searchbox data wasn't parsed correctly (7).");
-
-
-    setText(searchbox, "file");
-    is(filterView.searchData.toSource(), '["", ["file"]]',
-      "The searchbox data wasn't parsed correctly (8).");
-
-    setText(searchbox, "file#token");
-    is(filterView.searchData.toSource(), '["#", ["file", "token"]]',
-      "The searchbox data wasn't parsed correctly (9).");
-
-    setText(searchbox, "file:42");
-    is(filterView.searchData.toSource(), '[":", ["file", 42]]',
-      "The searchbox data wasn't parsed correctly (10).");
-
-    setText(searchbox, "file#token:42");
-    is(filterView.searchData.toSource(), '["#", ["file", "token:42"]]',
-      "The searchbox data wasn't parsed correctly (11).");
-
-    setText(searchbox, "file:42#token");
-    is(filterView.searchData.toSource(), '["#", ["file:42", "token"]]',
-      "The searchbox data wasn't parsed correctly (12).");
-
-    setText(searchbox, "file#token:42#token:42");
-    is(filterView.searchData.toSource(), '["#", ["file#token:42", "token:42"]]',
-      "The searchbox data wasn't parsed correctly (13).");
-
-    setText(searchbox, "file:42#token:42#token");
-    is(filterView.searchData.toSource(), '["#", ["file:42#token:42", "token"]]',
-      "The searchbox data wasn't parsed correctly (14).");
-
-
-    setText(searchbox, "!token");
-    is(filterView.searchData.toSource(), '["!", ["token"]]',
-      "The searchbox data wasn't parsed correctly (15).");
-
-    setText(searchbox, "!token#global");
-    is(filterView.searchData.toSource(), '["!", ["token#global"]]',
-      "The searchbox data wasn't parsed correctly (16).");
-
-    setText(searchbox, "!token#global:42");
-    is(filterView.searchData.toSource(), '["!", ["token#global:42"]]',
-      "The searchbox data wasn't parsed correctly (17).");
-
-    setText(searchbox, "!token:42#global");
-    is(filterView.searchData.toSource(), '["!", ["token:42#global"]]',
-      "The searchbox data wasn't parsed correctly (18).");
-
-
-    setText(searchbox, "@token");
-    is(filterView.searchData.toSource(), '["@", ["token"]]',
-      "The searchbox data wasn't parsed correctly (19).");
-
-    setText(searchbox, "@token#global");
-    is(filterView.searchData.toSource(), '["@", ["token#global"]]',
-      "The searchbox data wasn't parsed correctly (20).");
-
-    setText(searchbox, "@token#global:42");
-    is(filterView.searchData.toSource(), '["@", ["token#global:42"]]',
-      "The searchbox data wasn't parsed correctly (21).");
-
-    setText(searchbox, "@token:42#global");
-    is(filterView.searchData.toSource(), '["@", ["token:42#global"]]',
-      "The searchbox data wasn't parsed correctly (22).");
-
-
-    setText(searchbox, "*token");
-    is(filterView.searchData.toSource(), '["*", ["token"]]',
-      "The searchbox data wasn't parsed correctly (23).");
-
-    setText(searchbox, "*token#global");
-    is(filterView.searchData.toSource(), '["*", ["token#global"]]',
-      "The searchbox data wasn't parsed correctly (24).");
-
-    setText(searchbox, "*token#global:42");
-    is(filterView.searchData.toSource(), '["*", ["token#global:42"]]',
-      "The searchbox data wasn't parsed correctly (25).");
-
-    setText(searchbox, "*token:42#global");
-    is(filterView.searchData.toSource(), '["*", ["token:42#global"]]',
-      "The searchbox data wasn't parsed correctly (26).");
-
-
-    closeDebuggerAndFinish(aPanel);
-  });
-}
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_source-maps-01.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Test that we can set breakpoints and step through source mapped
- * coffee script.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_binary_search.html";
-const COFFEE_URL = EXAMPLE_URL + "code_binary_search.coffee";
-
-var gTab, gPanel, gDebugger;
-var gEditor, gSources;
-
-function test() {
-  let options = {
-    source: COFFEE_URL,
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gTab = aTab;
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-    gEditor = gDebugger.DebuggerView.editor;
-    gSources = gDebugger.DebuggerView.Sources;
-
-    checkSourceMapsEnabled();
-
-    checkInitialSource();
-    testSetBreakpoint()
-      .then(testSetBreakpointBlankLine)
-      .then(testHitBreakpoint)
-      .then(testStepping)
-      .then(() => resumeDebuggerThenCloseAndFinish(gPanel))
-      .catch(aError => {
-        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
-      });
-  });
-}
-
-function checkSourceMapsEnabled() {
-  is(Services.prefs.getBoolPref("devtools.debugger.source-maps-enabled"), true,
-    "The source maps functionality should be enabled by default.");
-  is(gDebugger.Prefs.sourceMapsEnabled, true,
-    "The source maps pref should be true from startup.");
-  is(gDebugger.DebuggerView.Options._showOriginalSourceItem.getAttribute("checked"), "true",
-    "Source maps should be enabled from startup.");
-}
-
-function checkInitialSource() {
-  isnot(gSources.selectedItem.attachment.source.url.indexOf(".coffee"), -1,
-    "The debugger should show the source mapped coffee source file.");
-  is(gSources.selectedValue.indexOf(".js"), -1,
-    "The debugger should not show the generated js source file.");
-  is(gEditor.getText().indexOf("isnt"), 218,
-    "The debugger's editor should have the coffee source source displayed.");
-  is(gEditor.getText().indexOf("function"), -1,
-    "The debugger's editor should not have the JS source displayed.");
-}
-
-function testSetBreakpoint() {
-  let deferred = promise.defer();
-  let sourceForm = getSourceForm(gSources, COFFEE_URL);
-
-  gDebugger.gThreadClient.interrupt(aResponse => {
-    let source = gDebugger.gThreadClient.source(sourceForm);
-    source.setBreakpoint({ line: 5 }).then(([aResponse]) => {
-      ok(!aResponse.actualLocation,
-        "Should be able to set a breakpoint on line 5.");
-
-      deferred.resolve();
-    });
-  });
-
-  return deferred.promise;
-}
-
-function testSetBreakpointBlankLine() {
-  let deferred = promise.defer();
-  let sourceForm = getSourceForm(gSources, COFFEE_URL);
-
-  let source = gDebugger.gThreadClient.source(sourceForm);
-  source.setBreakpoint({ line: 8 }).then(([aResponse]) => {
-    ok(!aResponse.isPending,
-       "Should not be a pending breakpoint.");
-    ok(!aResponse.actualLocation,
-       "Should not be a moved breakpoint.");
-
-    deferred.resolve();
-  });
-
-  return deferred.promise;
-}
-
-function testHitBreakpoint() {
-  let deferred = promise.defer();
-
-  gDebugger.gThreadClient.resume(aResponse => {
-    ok(!aResponse.error, "Shouldn't get an error resuming.");
-    is(aResponse.type, "resumed", "Type should be 'resumed'.");
-
-    gDebugger.gThreadClient.addOneTimeListener("paused", (aEvent, aPacket) => {
-      is(aPacket.type, "paused",
-        "We should now be paused again.");
-      is(aPacket.why.type, "breakpoint",
-        "and the reason we should be paused is because we hit a breakpoint.");
-
-      // Check that we stopped at the right place, by making sure that the
-      // environment is in the state that we expect.
-      is(aPacket.frame.environment.bindings.variables.start.value, 0,
-         "'start' is 0.");
-      is(aPacket.frame.environment.bindings.variables.stop.value.type, "undefined",
-         "'stop' hasn't been assigned to yet.");
-      is(aPacket.frame.environment.bindings.variables.pivot.value.type, "undefined",
-         "'pivot' hasn't been assigned to yet.");
-
-      waitForCaretUpdated(gPanel, 5).then(deferred.resolve);
-    });
-
-    // This will cause the breakpoint to be hit, and put us back in the
-    // paused state.
-    callInTab(gTab, "binary_search", [0, 2, 3, 5, 7, 10], 5);
-  });
-
-  return deferred.promise;
-}
-
-function testStepping() {
-  let deferred = promise.defer();
-
-  gDebugger.gThreadClient.stepIn(aResponse => {
-    ok(!aResponse.error, "Shouldn't get an error resuming.");
-    is(aResponse.type, "resumed", "Type should be 'resumed'.");
-
-    // After stepping, we will pause again, so listen for that.
-    gDebugger.gThreadClient.addOneTimeListener("paused", (aEvent, aPacket) => {
-      is(aPacket.type, "paused",
-        "We should now be paused again.");
-      is(aPacket.why.type, "resumeLimit",
-        "and the reason we should be paused is because we hit the resume limit.");
-
-      // Check that we stopped at the right place, by making sure that the
-      // environment is in the state that we expect.
-      is(aPacket.frame.environment.bindings.variables.start.value, 0,
-         "'start' is 0.");
-      is(aPacket.frame.environment.bindings.variables.stop.value, 5,
-         "'stop' is 5.");
-      is(aPacket.frame.environment.bindings.variables.pivot.value.type, "undefined",
-         "'pivot' hasn't been assigned to yet.");
-
-      waitForCaretUpdated(gPanel, 6).then(deferred.resolve);
-    });
-  });
-
-  return deferred.promise;
-}
-
-registerCleanupFunction(function () {
-  gTab = null;
-  gPanel = null;
-  gDebugger = null;
-  gEditor = null;
-  gSources = null;
-});
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_source-maps-02.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Test that we can toggle between the original and generated sources.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_binary_search.html";
-const JS_URL = EXAMPLE_URL + "code_binary_search.js";
-
-var gTab, gPanel, gDebugger, gEditor;
-var gSources, gFrames, gPrefs, gOptions;
-
-function test() {
-  let options = {
-    source: EXAMPLE_URL + "code_binary_search.coffee",
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gTab = aTab;
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-    gEditor = gDebugger.DebuggerView.editor;
-    gSources = gDebugger.DebuggerView.Sources;
-    gFrames = gDebugger.DebuggerView.StackFrames;
-    gPrefs = gDebugger.Prefs;
-    gOptions = gDebugger.DebuggerView.Options;
-
-    testToggleGeneratedSource()
-      .then(testSetBreakpoint)
-      .then(testToggleOnPause)
-      .then(testResume)
-      .then(() => closeDebuggerAndFinish(gPanel))
-      .catch(aError => {
-        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
-      });
-  });
-}
-
-function testToggleGeneratedSource() {
-  let finished = waitForSourceShown(gPanel, ".js").then(() => {
-    is(gPrefs.sourceMapsEnabled, false,
-      "The source maps pref should have been set to false.");
-    is(gOptions._showOriginalSourceItem.getAttribute("checked"), "false",
-      "Source maps should now be disabled.");
-
-    is(gSources.selectedItem.attachment.source.url.indexOf(".coffee"), -1,
-      "The debugger should not show the source mapped coffee source file.");
-    isnot(gSources.selectedItem.attachment.source.url.indexOf(".js"), -1,
-      "The debugger should show the generated js source file.");
-
-    is(gEditor.getText().indexOf("isnt"), -1,
-      "The debugger's editor should not have the coffee source source displayed.");
-    is(gEditor.getText().indexOf("function"), 36,
-      "The debugger's editor should have the JS source displayed.");
-  });
-
-  gOptions._showOriginalSourceItem.setAttribute("checked", "false");
-  gOptions._toggleShowOriginalSource();
-  gOptions._onPopupHidden();
-
-  return finished;
-}
-
-function testSetBreakpoint() {
-  let deferred = promise.defer();
-  let sourceForm = getSourceForm(gSources, JS_URL);
-  let source = gDebugger.gThreadClient.source(sourceForm);
-
-  source.setBreakpoint({ line: 7 }).then(([aResponse]) => {
-    gDebugger.gClient.addOneTimeListener("resumed", () => {
-      waitForCaretAndScopes(gPanel, 7).then(() => {
-        // Make sure that we have JavaScript stack frames.
-        is(gFrames.itemCount, 1,
-          "Should have only one frame.");
-        is(gFrames.getItemAtIndex(0).attachment.url.indexOf(".coffee"), -1,
-          "First frame should not be a coffee source frame.");
-        isnot(gFrames.getItemAtIndex(0).attachment.url.indexOf(".js"), -1,
-          "First frame should be a JS frame.");
-
-        deferred.resolve();
-      });
-
-      // This will cause the breakpoint to be hit, and put us back in the
-      // paused state.
-      callInTab(gTab, "binary_search", [0, 2, 3, 5, 7, 10], 5);
-    });
-  });
-
-  return deferred.promise;
-}
-
-function testToggleOnPause() {
-  let finished = waitForSourceAndCaretAndScopes(gPanel, ".coffee", 5).then(() => {
-    is(gPrefs.sourceMapsEnabled, true,
-      "The source maps pref should have been set to true.");
-    is(gOptions._showOriginalSourceItem.getAttribute("checked"), "true",
-      "Source maps should now be enabled.");
-
-    isnot(gSources.selectedItem.attachment.source.url.indexOf(".coffee"), -1,
-      "The debugger should show the source mapped coffee source file.");
-    is(gSources.selectedItem.attachment.source.url.indexOf(".js"), -1,
-      "The debugger should not show the generated js source file.");
-
-    is(gEditor.getText().indexOf("isnt"), 218,
-      "The debugger's editor should have the coffee source source displayed.");
-    is(gEditor.getText().indexOf("function"), -1,
-      "The debugger's editor should not have the JS source displayed.");
-
-    // Make sure that we have coffee source stack frames.
-    is(gFrames.itemCount, 1,
-      "Should have only one frame.");
-    is(gFrames.getItemAtIndex(0).attachment.url.indexOf(".js"), -1,
-      "First frame should not be a JS frame.");
-    isnot(gFrames.getItemAtIndex(0).attachment.url.indexOf(".coffee"), -1,
-      "First frame should be a coffee source frame.");
-  });
-
-  gOptions._showOriginalSourceItem.setAttribute("checked", "true");
-  gOptions._toggleShowOriginalSource();
-  gOptions._onPopupHidden();
-
-  return finished;
-}
-
-function testResume() {
-  let deferred = promise.defer();
-
-  gDebugger.gThreadClient.resume(aResponse => {
-    ok(!aResponse.error, "Shouldn't get an error resuming.");
-    is(aResponse.type, "resumed", "Type should be 'resumed'.");
-
-    deferred.resolve();
-  });
-
-  return deferred.promise;
-}
-
-registerCleanupFunction(function () {
-  gTab = null;
-  gPanel = null;
-  gDebugger = null;
-  gEditor = null;
-  gSources = null;
-  gFrames = null;
-  gPrefs = null;
-  gOptions = null;
-});
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_source-maps-03.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Test that we can debug minified javascript with source maps.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_minified.html";
-const JS_URL = EXAMPLE_URL + "code_math.js";
-
-var gTab, gPanel, gDebugger;
-var gEditor, gSources, gFrames;
-
-function test() {
-  let options = {
-    source: JS_URL,
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gTab = aTab;
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-    gEditor = gDebugger.DebuggerView.editor;
-    gSources = gDebugger.DebuggerView.Sources;
-    gFrames = gDebugger.DebuggerView.StackFrames;
-
-    checkInitialSource()
-    testSetBreakpoint()
-      .then(() => resumeDebuggerThenCloseAndFinish(gPanel))
-      .catch(aError => {
-        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
-      });
-  });
-}
-
-function checkInitialSource() {
-  isnot(gSources.selectedItem.attachment.source.url.indexOf(".js"), -1,
-    "The debugger should not show the minified js file.");
-  is(gSources.selectedItem.attachment.source.url.indexOf(".min.js"), -1,
-    "The debugger should show the original js file.");
-  is(gEditor.getText().split("\n").length, 46,
-    "The debugger's editor should have the original source displayed, " +
-    "not the whitespace stripped minified version.");
-}
-
-function testSetBreakpoint() {
-  let deferred = promise.defer();
-  let sourceForm = getSourceForm(gSources, JS_URL);
-  let source = gDebugger.gThreadClient.source(sourceForm);
-
-  source.setBreakpoint({ line: 30 }).then(([aResponse]) => {
-    ok(!aResponse.actualLocation,
-      "Should be able to set a breakpoint on line 30.");
-
-    gDebugger.gClient.addOneTimeListener("resumed", () => {
-      waitForCaretAndScopes(gPanel, 30).then(() => {
-        // Make sure that we have the right stack frames.
-        is(gFrames.itemCount, 9,
-          "Should have nine frames.");
-        is(gFrames.getItemAtIndex(0).attachment.url.indexOf(".min.js"), -1,
-          "First frame should not be a minified JS frame.");
-        isnot(gFrames.getItemAtIndex(0).attachment.url.indexOf(".js"), -1,
-          "First frame should be a JS frame.");
-
-        deferred.resolve();
-      });
-
-      // This will cause the breakpoint to be hit, and put us back in the
-      // paused state.
-      callInTab(gTab, "arithmetic");
-    });
-  });
-
-  return deferred.promise;
-}
-
-registerCleanupFunction(function () {
-  gTab = null;
-  gPanel = null;
-  gDebugger = null;
-  gEditor = null;
-  gSources = null;
-  gFrames = null;
-});
deleted file mode 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_source-maps-04.js
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Test that bogus source maps don't break debugging.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_minified_bogus_map.html";
-const JS_URL = EXAMPLE_URL + "code_math_bogus_map.js";
-
-// This test causes an error to be logged in the console, which appears in TBPL
-// logs, so we are disabling that here.
-DevToolsUtils.reportingDisabled = true;
-
-var gPanel, gDebugger, gFrames, gSources, gPrefs, gOptions;
-
-function test() {
-  let options = {
-    source: JS_URL,
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-    gFrames = gDebugger.DebuggerView.StackFrames;
-    gSources = gDebugger.DebuggerView.Sources;
-    gPrefs = gDebugger.Prefs;
-    gOptions = gDebugger.DebuggerView.Options;
-
-    is(gPrefs.pauseOnExceptions, false,
-      "The pause-on-exceptions pref should be disabled by default.");
-    isnot(gOptions._pauseOnExceptionsItem.getAttribute("checked"), "true",
-      "The pause-on-exceptions menu item should not be checked.");
-
-    checkInitialSource();
-    enablePauseOnExceptions()
-      .then(disableIgnoreCaughtExceptions)
-      .then(testSetBreakpoint)
-      .then(reloadPage)
-      .then(testHitBreakpoint)
-      .then(enableIgnoreCaughtExceptions)
-      .then(disablePauseOnExceptions)
-      .then(() => closeDebuggerAndFinish(gPanel))
-      .catch(aError => {
-        ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
-      });
-  });
-}
-
-function checkInitialSource() {
-  isnot(gSources.selectedItem.attachment.source.url.indexOf("code_math_bogus_map.js"), -1,
-    "The debugger should show the minified js file.");
-}
-
-function enablePauseOnExceptions() {
-  let deferred = promise.defer();
-
-  gDebugger.gThreadClient.addOneTimeListener("resumed", () => {
-    is(gPrefs.pauseOnExceptions, true,
-      "The pause-on-exceptions pref should now be enabled.");
-
-    ok(true, "Pausing on exceptions was enabled.");
-    deferred.resolve();
-  });
-
-  gOptions._pauseOnExceptionsItem.setAttribute("checked", "true");
-  gOptions._togglePauseOnExceptions();
-
-  return deferred.promise;
-}
-
-function disableIgnoreCaughtExceptions() {
-  let deferred = promise.defer();
-
-  gDebugger.gThreadClient.addOneTimeListener("resumed", () => {
-    is(gPrefs.ignoreCaughtExceptions, false,
-      "The ignore-caught-exceptions pref should now be disabled.");
-
-    ok(true, "Ignore caught exceptions was disabled.");
-    deferred.resolve();
-  });
-
-  gOptions._ignoreCaughtExceptionsItem.setAttribute("checked", "false");
-  gOptions._toggleIgnoreCaughtExceptions();
-
-  return deferred.promise;
-}
-
-function testSetBreakpoint() {
-  let deferred = promise.defer();
-  let sourceForm = getSourceForm(gSources, JS_URL);
-  let source = gDebugger.gThreadClient.source(sourceForm);
-
-  source.setBreakpoint({ line: 3, column: 18 }).then(([aResponse]) => {
-    ok(!aResponse.actualLocation,
-      "Should be able to set a breakpoint on line 3 and column 18.");
-
-    deferred.resolve();
-  });
-
-  return deferred.promise;
-}
-
-function reloadPage() {
-  let loaded = waitForSourceAndCaret(gPanel, ".js", 3);
-  gDebugger.DebuggerController._target.activeTab.reload();
-  return loaded.then(() => ok(true, "Page was reloaded and execution resumed."));
-}
-
-function testHitBreakpoint() {
-  let deferred = promise.defer();
-
-  gDebugger.gThreadClient.resume(aResponse => {
-    ok(!aResponse.error, "Shouldn't get an error resuming.");
-    is(aResponse.type, "resumed", "Type should be 'resumed'.");
-
-    waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES).then(() => {
-      is(gFrames.itemCount, 2, "Should have two frames.");
-
-      // This is weird, but we need to let the debugger a chance to
-      // update first
-      executeSoon(() => {
-        gDebugger.gThreadClient.resume(() => {
-          gDebugger.gThreadClient.addOneTimeListener("paused", () => {
-            gDebugger.gThreadClient.resume(() => {
-              // We also need to make sure the next step doesn't add a
-              // "resumed" handler until this is completely finished
-              executeSoon(() => {
-                deferred.resolve();
-              });
-            });
-          });
-        });
-      });
-    });
-  });
-
-  return deferred.promise;
-}
-
-function enableIgnoreCaughtExceptions() {
-  let deferred = promise.defer();
-
-  gDebugger.gThreadClient.addOneTimeListener("resumed", () => {
-    is(gPrefs.ignoreCaughtExceptions, true,
-      "The ignore-caught-exceptions pref should now be enabled.");
-
-    ok(true, "Ignore caught exceptions was enabled.");
-    deferred.resolve();
-  });
-
-  gOptions._ignoreCaughtExceptionsItem.setAttribute("checked", "true");
-  gOptions._toggleIgnoreCaughtExceptions();
-
-  return deferred.promise;
-}
-
-function disablePauseOnExceptions() {
-  let deferred = promise.defer();
-
-  gDebugger.gThreadClient.addOneTimeListener("resumed", () => {
-    is(gPrefs.pauseOnExceptions, false,
-      "The pause-on-exceptions pref should now be disabled.");
-
-    ok(true, "Pausing on exceptions was disabled.");
-    deferred.resolve();
-  });
-
-  gOptions._pauseOnExceptionsItem.setAttribute("checked", "false");
-  gOptions._togglePauseOnExceptions();
-
-  return deferred.promise;
-}
-
-registerCleanupFunction(function () {
-  gPanel = null;
-  gDebugger = null;
-  gFrames = null;
-  gSources = null;
-  gPrefs = null;
-  gOptions = null;
-  DevToolsUtils.reportingDisabled = false;
-});