Bug 1262443 - Fix tests; r=pbro

devtools/client/animationinspector/test/browser_animation_spacebar_toggles_node_animations.js

@@ -11,6 +11,8 @@
 // is selected, animations will be displayed in the timeline, so the timeline
 // play/resume button will be displayed
 add_task(function* () {
+  requestLongerTimeout(2);
+
   yield addTab(URL_ROOT + "doc_simple_animation.html");
   let {panel, window} = yield openAnimationInspector();
   let {playTimelineButtonEl} = panel;

devtools/client/framework/test/browser_toolbox_textbox_context_menu.js

@@ -35,8 +35,12 @@ add_task(function* () {
   is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled");
   is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled");
   is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled");
-  is(cmdCut.getAttribute("disabled"), "true", "cmdCut is disabled");
-  is(cmdCopy.getAttribute("disabled"), "true", "cmdCopy is disabled");
+
+  // Cut/Copy items are enabled in context menu even if there
+  // is no selection. See also Bug 1303033
+  is(cmdCut.getAttribute("disabled"), "", "cmdCut is enabled");
+  is(cmdCopy.getAttribute("disabled"), "", "cmdCopy is enabled");
+
   if (isWindows()) {
     // emptyClipboard only works on Windows (666254), assert paste only for this OS.
     is(cmdPaste.getAttribute("disabled"), "true", "cmdPaste is disabled");

devtools/client/inspector/computed/test/browser_computed_search-filter_context-menu.js

@@ -44,8 +44,12 @@ add_task(function* () {
   is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled");
   is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled");
   is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled");
-  is(cmdCut.getAttribute("disabled"), "true", "cmdCut is disabled");
-  is(cmdCopy.getAttribute("disabled"), "true", "cmdCopy is disabled");
+
+  // Cut/Copy items are enabled in context menu even if there
+  // is no selection. See also Bug 1303033
+  is(cmdCut.getAttribute("disabled"), "", "cmdCut is enabled");
+  is(cmdCopy.getAttribute("disabled"), "", "cmdCopy is enabled");
+
   if (isWindows()) {
     // emptyClipboard only works on Windows (666254), assert paste only for this OS.
     is(cmdPaste.getAttribute("disabled"), "true", "cmdPaste is disabled");

devtools/client/inspector/rules/test/browser_rules_add-property-cancel_01.js

@@ -38,6 +38,7 @@ add_task(function* () {
     "Should have cancelled creating a new text property.");
   ok(!elementRuleEditor.propertyList.hasChildNodes(),
     "Should not have any properties.");
-  is(view.styleDocument.activeElement, view.styleDocument.documentElement,
+
+  is(view.styleDocument.activeElement, view.styleDocument.body,
     "Correct element has focus");
 });

devtools/client/inspector/rules/test/browser_rules_add-property-cancel_02.js

@@ -23,7 +23,7 @@ add_task(function* () {
   info("Test creating a new property and escaping");
   yield addProperty(view, 1, "color", "red", "VK_ESCAPE", false);
 
-  is(view.styleDocument.documentElement, view.styleDocument.activeElement,
+  is(view.styleDocument.activeElement, view.styleDocument.body,
     "Correct element has focus");
 
   let elementRuleEditor = getRuleViewRuleEditor(view, 1);

devtools/client/inspector/rules/test/browser_rules_add-property-cancel_03.js

@@ -38,6 +38,6 @@ add_task(function* () {
 
   is(elementRuleEditor.rule.textProps.length, 1,
     "Should have canceled creating a new text property.");
-  is(view.styleDocument.documentElement, view.styleDocument.activeElement,
+  is(view.styleDocument.activeElement, view.styleDocument.body,
     "Correct element has focus");
 });

devtools/client/inspector/rules/test/browser_rules_search-filter_context-menu.js

@@ -43,8 +43,12 @@ add_task(function* () {
   is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled");
   is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled");
   is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled");
-  is(cmdCut.getAttribute("disabled"), "true", "cmdCut is disabled");
-  is(cmdCopy.getAttribute("disabled"), "true", "cmdCopy is disabled");
+
+  // Cut/Copy items are enabled in context menu even if there
+  // is no selection. See also Bug 1303033
+  is(cmdCut.getAttribute("disabled"), "", "cmdCut is enabled");
+  is(cmdCopy.getAttribute("disabled"), "", "cmdCopy is enabled");
+
   if (isWindows()) {
     // emptyClipboard only works on Windows (666254), assert paste only for this OS.
     is(cmdPaste.getAttribute("disabled"), "true", "cmdPaste is disabled");

devtools/client/inspector/rules/test/browser_rules_user-agent-styles.js

@@ -58,7 +58,7 @@ const TEST_DATA = [
 ];
 
 add_task(function* () {
-  requestLongerTimeout(2);
+  requestLongerTimeout(4);
 
   info("Starting the test with the pref set to true before toolbox is opened");
   yield setUserAgentStylesPref(true);

devtools/client/inspector/rules/test/head.js

@@ -634,7 +634,9 @@ var togglePropStatus = Task.async(function* (view, textProp) {
  */
 var focusNewRuleViewProperty = Task.async(function* (ruleEditor) {
   info("Clicking on a close ruleEditor brace to start editing a new property");
-  ruleEditor.closeBrace.scrollIntoView();
+
+  // Use bottom alignment to avoid scrolling out of the parent element area.
+  ruleEditor.closeBrace.scrollIntoView(false);
   let editor = yield focusEditableField(ruleEditor.ruleView,
     ruleEditor.closeBrace);
 

devtools/client/inspector/test/browser_inspector_search-filter_context-menu.js

@@ -41,8 +41,12 @@ add_task(function* () {
   is(cmdUndo.getAttribute("disabled"), "true", "cmdUndo is disabled");
   is(cmdDelete.getAttribute("disabled"), "true", "cmdDelete is disabled");
   is(cmdSelectAll.getAttribute("disabled"), "true", "cmdSelectAll is disabled");
-  is(cmdCut.getAttribute("disabled"), "true", "cmdCut is disabled");
-  is(cmdCopy.getAttribute("disabled"), "true", "cmdCopy is disabled");
+
+  // Cut/Copy items are enabled in context menu even if there
+  // is no selection. See also Bug 1303033
+  is(cmdCut.getAttribute("disabled"), "", "cmdCut is enabled");
+  is(cmdCopy.getAttribute("disabled"), "", "cmdCopy is enabled");
+
   if (isWindows()) {
     // emptyClipboard only works on Windows (666254), assert paste only for this OS.
     is(cmdPaste.getAttribute("disabled"), "true", "cmdPaste is disabled");