Bug 1090929 - Enable the variables-view tests;r=mratcliffe
authorEddy Bruël <ejpbruel@gmail.com>
Mon, 10 Nov 2014 16:27:21 +0100
changeset 214983 320f80475bd33f5323cd691feeca65c81db3a4dd
parent 214982 d141bf7e16248867835b2d7724461b7121f33212
child 214984 97cd2042865dd7455ead6ce8d8b40ec49a4b94f7
push id27802
push usercbook@mozilla.com
push dateTue, 11 Nov 2014 12:25:07 +0000
treeherdermozilla-central@c60fc2c11c0e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmratcliffe
bugs1090929
milestone36.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 1090929 - Enable the variables-view tests;r=mratcliffe
browser/devtools/debugger/test/browser.ini
browser/devtools/debugger/test/browser_dbg_variables-view-01.js
browser/devtools/debugger/test/browser_dbg_variables-view-02.js
browser/devtools/debugger/test/browser_dbg_variables-view-03.js
browser/devtools/debugger/test/browser_dbg_variables-view-04.js
browser/devtools/debugger/test/browser_dbg_variables-view-05.js
browser/devtools/debugger/test/browser_dbg_variables-view-06.js
--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -441,27 +441,27 @@ skip-if = e10s
 skip-if = e10s
 [browser_dbg_tracing-06.js]
 skip-if = e10s
 [browser_dbg_tracing-07.js]
 skip-if = e10s
 [browser_dbg_tracing-08.js]
 skip-if = e10s
 [browser_dbg_variables-view-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-04.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-05.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-06.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-accessibility.js]
 skip-if = e10s
 [browser_dbg_variables-view-data.js]
 skip-if = e10s
 [browser_dbg_variables-view-edit-cancel.js]
 skip-if = e10s
 [browser_dbg_variables-view-edit-click.js]
 skip-if = e10s || (os == 'mac' || os == 'win') && (debug == false) # Bug 986166
--- a/browser/devtools/debugger/test/browser_dbg_variables-view-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_variables-view-01.js
@@ -4,17 +4,17 @@
 /**
  * Tests that creating, collpasing and expanding scopes in the
  * variables view works as expected.
  */
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let variables = aPanel.panelWin.DebuggerView.Variables;
     let testScope = variables.addScope("test");
 
     ok(testScope,
       "Should have created a scope.");
     ok(testScope.id.contains("test"),
       "The newly created scope should have the default id set.");
     is(testScope.name, "test",
--- a/browser/devtools/debugger/test/browser_dbg_variables-view-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_variables-view-02.js
@@ -4,17 +4,17 @@
 /**
  * Tests that creating, collpasing and expanding variables in the
  * variables view works as expected.
  */
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let variables = aPanel.panelWin.DebuggerView.Variables;
     let testScope = variables.addScope("test");
     let testVar = testScope.addItem("something");
     let duplVar = testScope.addItem("something");
 
     info("Scope id: " + testScope.id);
     info("Scope name: " + testScope.name);
     info("Variable id: " + testVar.id);
--- a/browser/devtools/debugger/test/browser_dbg_variables-view-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_variables-view-03.js
@@ -4,17 +4,17 @@
 /**
  * Tests that recursively creating properties in the variables view works
  * as expected.
  */
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let variables = aPanel.panelWin.DebuggerView.Variables;
     let testScope = variables.addScope("test");
 
     is(testScope.target.querySelectorAll(".variables-view-element-details.enum").length, 1,
       "One enumerable container should be present in the scope.");
     is(testScope.target.querySelectorAll(".variables-view-element-details.nonenum").length, 1,
       "One non-enumerable container should be present in the scope.");
     is(testScope.target.querySelector(".variables-view-element-details.enum").childNodes.length, 0,
--- a/browser/devtools/debugger/test/browser_dbg_variables-view-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_variables-view-04.js
@@ -3,17 +3,17 @@
 
 /**
  * Tests that grips are correctly applied to variables.
  */
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let variables = aPanel.panelWin.DebuggerView.Variables;
     let testScope = variables.addScope("test");
     let testVar = testScope.addItem("something");
 
     testVar.setGrip(1.618);
 
     is(testVar.target.querySelector(".value").getAttribute("value"), "1.618",
       "The grip information for the variable wasn't set correctly (1).");
--- a/browser/devtools/debugger/test/browser_dbg_variables-view-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_variables-view-05.js
@@ -3,17 +3,17 @@
 
 /**
  * Tests that grips are correctly applied to variables and properties.
  */
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let variables = aPanel.panelWin.DebuggerView.Variables;
 
     let globalScope = variables.addScope("Test-Global");
     let localScope = variables.addScope("Test-Local");
 
     ok(globalScope, "The globalScope hasn't been created correctly.");
     ok(localScope, "The localScope hasn't been created correctly.");
 
--- a/browser/devtools/debugger/test/browser_dbg_variables-view-06.js
+++ b/browser/devtools/debugger/test/browser_dbg_variables-view-06.js
@@ -3,21 +3,21 @@
 
 /**
  * Test that Promises get their internal state added as psuedo properties.
  */
 
 const TAB_URL = EXAMPLE_URL + "doc_promise.html";
 
 const test = Task.async(function* () {
-  const [tab, debuggee, panel] = yield initDebugger(TAB_URL);
+  const [tab,, panel] = yield initDebugger(TAB_URL);
   yield ensureSourceIs(panel, "doc_promise.html", true);
 
   const scopes = waitForCaretAndScopes(panel, 21);
-  executeSoon(debuggee.doPause);
+  callInTab(tab, "doPause");
   yield scopes;
 
   const variables = panel.panelWin.DebuggerView.Variables;
   ok(variables, "Should get the variables view.");
 
   const scope = [...variables][0];
   ok(scope, "Should get the current function's scope.");