Backed out changeset 145f6347bb11 (bug 1137285) depending on the backout of bug 1145049
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 15 Apr 2015 17:24:06 +0200
changeset 239342 bcca2f834b76e2f88c1b069081f9edfa34c1c0d3
parent 239341 69a16a89c8bfa7697b5c8e41f1a6a5abee930643
child 239343 3cb6adf9dc710c9c4efd9701972ef4a82209e1c0
push id28589
push userryanvm@gmail.com
push dateWed, 15 Apr 2015 19:13:10 +0000
treeherdermozilla-central@24ccca4707eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1137285, 1145049
milestone40.0a1
backs out145f6347bb119c65198bb1e7f105574413e2c0bf
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
Backed out changeset 145f6347bb11 (bug 1137285) depending on the backout of bug 1145049
browser/devtools/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js
browser/devtools/inspector/test/browser_inspector_highlight_after_transition.js
browser/devtools/inspector/test/browser_inspector_highlighter-01.js
browser/devtools/inspector/test/browser_inspector_infobar_01.js
browser/devtools/inspector/test/browser_inspector_pseudoclass-menu.js
--- a/browser/devtools/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js
+++ b/browser/devtools/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js
@@ -3,17 +3,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 // Test that hovering over nodes on the breadcrumb buttons in the inspector shows the highlighter over
 // those nodes
 add_task(function*() {
   info("Loading the test document and opening the inspector");
-  let {toolbox, inspector} = yield openInspectorForURL("data:text/html;charset=utf-8,<h1>foo</h1><span>bar</span>");
+  yield addTab("data:text/html;charset=utf-8,<h1>foo</h1><span>bar</span>");
+  let {toolbox, inspector} = yield openInspector();
   info("Selecting the test node");
   yield selectNode("span", inspector);
   let bcButtons = inspector.breadcrumbs["container"];
 
   let onNodeHighlighted = toolbox.once("node-highlight");
   let button = bcButtons.childNodes[1];
   EventUtils.synthesizeMouseAtCenter(button, {type: "mousemove"}, button.ownerDocument.defaultView);
   yield onNodeHighlighted;
--- a/browser/devtools/inspector/test/browser_inspector_highlight_after_transition.js
+++ b/browser/devtools/inspector/test/browser_inspector_highlight_after_transition.js
@@ -1,22 +1,25 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = TEST_URL_ROOT + "doc_inspector_highlight_after_transition.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/inspector/" +
+                 "test/browser_inspector_highlight_after_transition.html";
 
 // Test that the nodeinfobar is never displayed above the top or below the
 // bottom of the content area.
 add_task(function*() {
   info("Loading the test document and opening the inspector");
 
-  let {inspector} = yield openInspectorForURL(TEST_URI);
+  yield addTab(TEST_URI);
+
+  let {inspector} = yield openInspector();
 
   yield checkDivHeight(inspector);
 });
 
 function* checkDivHeight(inspector) {
   let div = getNode("div");
 
   div.setAttribute("visible", "true");
--- a/browser/devtools/inspector/test/browser_inspector_highlighter-01.js
+++ b/browser/devtools/inspector/test/browser_inspector_highlighter-01.js
@@ -3,17 +3,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 // Test that hovering over nodes in the markup-view shows the highlighter over
 // those nodes
 add_task(function*() {
   info("Loading the test document and opening the inspector");
-  let {toolbox, inspector} = yield openInspectorForURL("data:text/html;charset=utf-8,<h1>foo</h1><span>bar</span>");
+  yield addTab("data:text/html;charset=utf-8,<h1>foo</h1><span>bar</span>");
+  let {toolbox, inspector} = yield openInspector();
 
   let isVisible = yield isHighlighting(toolbox);
   ok(!isVisible, "The highlighter is hidden by default");
 
   info("Selecting the test node");
   yield selectNode("span", inspector);
   let container = yield getContainerForSelector("h1", inspector);
 
--- a/browser/devtools/inspector/test/browser_inspector_infobar_01.js
+++ b/browser/devtools/inspector/test/browser_inspector_infobar_01.js
@@ -1,20 +1,22 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 // Check the position and text content of the highlighter nodeinfo bar.
 
-const TEST_URI = TEST_URL_ROOT + "doc_inspector_infobar_01.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/inspector/" +
+                 "test/doc_inspector_infobar_01.html";
 
 add_task(function*() {
-  let {inspector} = yield openInspectorForURL(TEST_URI);
+  yield addTab(TEST_URI);
+  let {inspector} = yield openInspector();
 
   let testData = [
     {
       selector: "#top",
       position: "bottom",
       tag: "DIV",
       id: "top",
       classes: ".class1.class2",
--- a/browser/devtools/inspector/test/browser_inspector_pseudoclass-menu.js
+++ b/browser/devtools/inspector/test/browser_inspector_pseudoclass-menu.js
@@ -2,28 +2,27 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 // Test that the inspector has the correct pseudo-class locking menu items and
 // that these items actually work
 
 const DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
-const TEST_URI = "data:text/html;charset=UTF-8," +
-                 "pseudo-class lock node menu tests";
 const PSEUDOS = ["hover", "active", "focus"];
 
 add_task(function*() {
-  let {inspector} = yield openInspectorForURL(TEST_URI);
+  yield addTab("data:text/html,pseudo-class lock node menu tests");
 
   info("Creating the test element");
   let div = content.document.createElement("div");
   div.textContent = "test div";
   content.document.body.appendChild(div);
 
+  let {inspector} = yield openInspector();
   yield selectNode("div", inspector);
 
   info("Getting the inspector ctx menu and opening it");
   let menu = inspector.panelDoc.getElementById("inspector-node-popup");
   yield openMenu(menu);
 
   yield testMenuItems(div, menu, inspector);
 });