Bug 1376534 - Fix failing tests. r= draft
authorNicolas Chevobbe <nchevobbe@mozilla.com>
Fri, 07 Jul 2017 16:12:20 +0200
changeset 605329 719c671b650337d6c8090f1c0202f7e651f62b51
parent 605317 edf770b74f5e6c1b5f190f6fceb568151a62fcd7
child 636464 0c786c5faf4e470ce45d44e02afcf5155a235756
push id67378
push userbmo:nchevobbe@mozilla.com
push dateFri, 07 Jul 2017 14:13:04 +0000
bugs1376534
milestone56.0a1
Bug 1376534 - Fix failing tests. r= MozReview-Commit-ID: 3AHs6IsvNXG
browser/base/content/test/static/browser_parsable_css.js
devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_in_var_view.js
devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js
--- a/browser/base/content/test/static/browser_parsable_css.js
+++ b/browser/base/content/test/static/browser_parsable_css.js
@@ -60,16 +60,19 @@ let whitelist = [
   {sourceName: /webide\/skin\/logs\.css$/i,
    intermittent: true,
    errorMessage: /Property contained reference to invalid variable.*background/i,
    isFromDevTools: true},
   {sourceName: /devtools\/skin\/animationinspector\.css$/i,
    intermittent: true,
    errorMessage: /Property contained reference to invalid variable.*color/i,
    isFromDevTools: true},
+   // Reps uses cross-browser CSS.
+   {sourceName: /devtools\/client\/shared\/components\/reps\/reps.css/i,
+    isFromDevTools: true},
 ];
 
 if (!Services.prefs.getBoolPref("full-screen-api.unprefix.enabled")) {
   whitelist.push({
     sourceName: /(?:res|gre-resources)\/(ua|html)\.css$/i,
     errorMessage: /Unknown pseudo-class .*\bfullscreen\b/i,
     isFromDevTools: false
   });
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_in_var_view.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_in_var_view.js
@@ -15,28 +15,30 @@ const TEST_URI = `data:text/html;charset
 
 add_task(function* () {
   let hud = yield openNewTabAndConsole(TEST_URI);
 
   let [msgWithText, msgWithObj] = yield waitFor(() => findMessages(hud, "foo"));
   ok(msgWithText && msgWithObj, "Two messages should have appeared");
 
   let text = msgWithText.querySelector(".objectBox-string");
-  let objInMsgWithObj = msgWithObj.querySelector(".cm-variable");
+
+  let objInMsgWithObj = msgWithObj.querySelector(".objectBox-Window .objectBoxTitle");
   let textInMsgWithObj = msgWithObj.querySelector(".objectBox-string");
 
   info("Check open in variables view is disabled for text only messages");
   let menuPopup = yield openContextMenu(hud, text);
   let openMenuItem = menuPopup.querySelector("#console-menu-open");
   ok(openMenuItem.disabled, "open in variables view is disabled for text message");
   yield hideContextMenu(hud);
 
   info("Check open in variables view is enabled for objects in complex messages");
   menuPopup = yield openContextMenu(hud, objInMsgWithObj);
   openMenuItem = menuPopup.querySelector("#console-menu-open");
+
   ok(!openMenuItem.disabled,
     "open in variables view is enabled for object in complex message");
   yield hideContextMenu(hud);
 
   info("Check open in variables view is disabled for text in complex messages");
   menuPopup = yield openContextMenu(hud, textInMsgWithObj);
   openMenuItem = menuPopup.querySelector("#console-menu-open");
   ok(openMenuItem.disabled,
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js
@@ -18,23 +18,23 @@ const TEST_URI = `data:text/html;charset
 add_task(function* () {
   let hud = yield openNewTabAndConsole(TEST_URI);
 
   let [msgWithText, msgWithObj, msgNested] =
     yield waitFor(() => findMessages(hud, "foo"));
   ok(msgWithText && msgWithObj && msgNested, "Three messages should have appeared");
 
   let text = msgWithText.querySelector(".objectBox-string");
-  let objInMsgWithObj = msgWithObj.querySelector(".cm-variable");
+  let objInMsgWithObj = msgWithObj.querySelector(".objectBox-object");
   let textInMsgWithObj = msgWithObj.querySelector(".objectBox-string");
 
   // The third message has an object nested in an array, the array is therefore the top
   // object, the object is the nested object.
-  let topObjInMsg = msgNested.querySelector(".objectBox-array > .cm-variable");
-  let nestedObjInMsg = msgNested.querySelector(".objectBox-object > .cm-variable");
+  let topObjInMsg = msgNested.querySelector(".objectBox-array");
+  let nestedObjInMsg = msgNested.querySelector(".objectBox-object");
 
   info("Check store as global variable is disabled for text only messages");
   let menuPopup = yield openContextMenu(hud, text);
   let storeMenuItem = menuPopup.querySelector("#console-menu-store");
   ok(storeMenuItem.disabled, "store as global variable is disabled for text message");
   yield hideContextMenu(hud);
 
   info("Check store as global variable is disabled for text in complex messages");