Bug 1407253 - Add missing helper function and enable green old console tests; r=bgrins.
MozReview-Commit-ID: 2CJ5AX9eHVt
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -196,86 +196,69 @@ skip-if = true # Bug 1406060
[browser_console_webconsole_private_browsing.js]
skip-if = true # Bug 1403188
# old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
[browser_jsterm_copy_command.js]
skip-if = true
subsuite = clipboard
# old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
[browser_jsterm_history_persist.js]
-skip-if = true # Bug 1401881
[browser_jsterm_inspect.js]
[browser_jsterm_no_autocompletion_on_defined_variables.js]
-skip-if = true # Bug 1401881
[browser_netmonitor_shows_reqs_in_webconsole.js]
[browser_webconsole.js]
skip-if = true # Bug 1404829
[browser_webconsole_No_input_and_Tab_key_pressed.js]
skip-if = true # Bug 1403910
[browser_webconsole_No_input_change_and_Tab_key_pressed.js]
skip-if = true # Bug 1404882
[browser_webconsole_add_edited_input_to_history.js]
-skip-if = true # Bug 1401881
[browser_webconsole_allow_mixedcontent_securityerrors.js]
tags = mcb
skip-if = true # Bug 1403452
# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
[browser_webconsole_assert.js]
skip-if = true # Bug 1403458
[browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js]
-skip-if = true # Bug 1401881
[browser_webconsole_autocomplete_JSTerm_helpers.js]
-skip-if = true # Bug 1401881
[browser_webconsole_autocomplete_accessibility.js]
-skip-if = true # Bug 1401881
[browser_webconsole_autocomplete_and_selfxss.js]
subsuite = clipboard
skip-if = true # Bug 1404850
# old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
[browser_webconsole_autocomplete_crossdomain_iframe.js]
-skip-if = true # Bug 1401881
[browser_webconsole_autocomplete_in_debugger_stackframe.js]
-skip-if = true # Bug 1401881
[browser_webconsole_autocomplete_keys.js]
-skip-if = true # Bug 1401881
[browser_webconsole_autocomplete_popup.js]
-skip-if = true # Bug 1401881
[browser_webconsole_autocomplete_popup_close_on_tab_switch.js]
-skip-if = true # Bug 1401881
[browser_webconsole_batching.js]
[browser_webconsole_block_mixedcontent_securityerrors.js]
tags = mcb
skip-if = true # Bug 1403899
# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
[browser_webconsole_cached_autocomplete.js]
-skip-if = true # Bug 1401881
[browser_webconsole_cached_messages.js]
skip-if = true # Bug 1406069
[browser_webconsole_cd_iframe.js]
skip-if = true # Bug 1406030
[browser_webconsole_certificate_messages.js]
-skip-if = true # Bug 1401881
+# skip-if = true # Bug 1401881
# old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
[browser_webconsole_charset.js]
skip-if = true # Bug 1404400
[browser_webconsole_chrome.js]
-skip-if = true # Bug 1401881
[browser_webconsole_click_function_to_source.js]
skip-if = true # Bug 1406038
[browser_webconsole_clickable_urls.js]
[browser_webconsole_closing_after_completion.js]
-skip-if = true # Bug 1401881
[browser_webconsole_closing_brackets.js]
-skip-if = true # Bug 1401881
[browser_webconsole_closure_inspection.js]
skip-if = true # Bug 1405250
[browser_webconsole_completion.js]
-skip-if = true # Bug 1401881
[browser_webconsole_console_api_iframe.js]
-skip-if = true # Bug 1401881
[browser_webconsole_console_dir.js]
[browser_webconsole_console_dir_uninspectable.js]
skip-if = true # Bug 1403449
[browser_webconsole_console_group.js]
[browser_webconsole_console_logging_workers_api.js]
skip-if = true # Bug 1405252
[browser_webconsole_console_table.js]
[browser_webconsole_context_menu_copy_entire_message.js]
@@ -290,57 +273,46 @@ subsuite = clipboard
[browser_webconsole_context_menu_store_as_global.js]
[browser_webconsole_copy_entire_message_context_menu.js]
subsuite = clipboard
skip-if = true # Bug 1401958
# old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
[browser_webconsole_copy_link_location.js]
skip-if = true # Bug 1401944
[browser_webconsole_csp_ignore_reflected_xss_message.js]
-skip-if = true # Bug 1401881
-# old console skip-if = (e10s && debug) || (e10s && os == 'win') # Bug 1221499 enabled these on windows
+skip-if = (e10s && debug) || (e10s && os == 'win') # Bug 1221499 enabled these on windows
[browser_webconsole_cspro.js]
-skip-if = true # Bug 1401881
-# old console skip-if = e10s && (os == 'win' || os == 'mac') # Bug 1243967
+skip-if = e10s && (os == 'win' || os == 'mac') # Bug 1243967
[browser_webconsole_ctrl_key_nav.js]
-skip-if = true # Bug 1401881
-# old console skip-if = os != "mac"
+skip-if = os != "mac"
[browser_webconsole_deactivateHUDForContext_unfocused_window.js]
-skip-if = true # Bug 1401881
[browser_webconsole_document_body_autocomplete.js]
skip-if = true # Bug 1404851
[browser_webconsole_document_focus.js]
skip-if = true # Bug 1404368
[browser_webconsole_duplicate_errors.js]
skip-if = true # Bug 1403907
[browser_webconsole_errors_after_page_reload.js]
-skip-if = true # Bug 1401881
[browser_webconsole_eval_in_debugger_stackframe.js]
-skip-if = true # Bug 1401881
[browser_webconsole_eval_in_debugger_stackframe2.js]
-skip-if = true # Bug 1401881
[browser_webconsole_execution_scope.js]
skip-if = true # Bug 1405333
[browser_webconsole_external_script_errors.js]
-skip-if = true # Bug 1401881
[browser_webconsole_file_uri.js]
skip-if = true # Bug 1404382
[browser_webconsole_filter_scroll.js]
skip-if = true # Bug 1404392
[browser_webconsole_filters.js]
[browser_webconsole_filters_persist.js]
[browser_webconsole_highlighter_console_helper.js]
skip-if = true # Bug 1404853
# old console skip-if = true # Requires direct access to content nodes
[browser_webconsole_history.js]
-skip-if = true # Bug 1401881
[browser_webconsole_history_arrow_keys.js]
-skip-if = true # Bug 1401881
[browser_webconsole_history_nav.js]
-skip-if = true # Bug 1401881
[browser_webconsole_hpkp_invalid-headers.js]
skip-if = true # Bug 1405340
# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
[browser_webconsole_hsts_invalid-headers.js]
skip-if = true # Bug 1405341
# old console skip-if = e10s # Bug 1042253 - webconsole e10s tests
[browser_webconsole_iframe_wrong_hud.js]
skip-if = true # Bug 1404378
@@ -385,78 +357,69 @@ skip-if = true # Bug 1403448
skip-if = true # Bug 1403448
[browser_webconsole_message_categories.js]
skip-if = true # Bug 1404384
# old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
[browser_webconsole_mixedcontent.js]
tags = mcb
skip-if = true # Bug 1404886
[browser_webconsole_multiline_input.js]
-skip-if = true # Bug 1401881
[browser_webconsole_multiple_windows_and_tabs.js]
-skip-if = true # Bug 1401881
[browser_webconsole_netlogging_reset_filter.js]
skip-if = true # Bug 1405636
[browser_webconsole_network_exceptions.js]
-skip-if = true # Bug 1401881
[browser_webconsole_network_messages_expand.js]
[browser_webconsole_network_messages_openinnet.js]
[browser_webconsole_network_requests_from_chrome.js]
-skip-if = true # Bug 1401881
[browser_webconsole_nodes_highlight.js]
[browser_webconsole_nodes_select.js]
[browser_webconsole_notifications.js]
skip-if = true # Bug 1405637
[browser_webconsole_object_inspector.js]
[browser_webconsole_object_inspector_entries.js]
[browser_webconsole_observer_notifications.js]
[browser_webconsole_optimized_out_vars.js]
-skip-if = true # Bug 1401881
[browser_webconsole_output_copy.js]
subsuite = clipboard
skip-if = true # Bug 1404364
# old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
[browser_webconsole_output_copy_newlines.js]
subsuite = clipboard
skip-if = true # Bug 1405641
# old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
[browser_webconsole_output_order.js]
-skip-if = true # Bug 1401881
[browser_webconsole_persist.js]
[browser_webconsole_property_provider.js]
skip-if = true # Bug 1406841
#old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
[browser_webconsole_prune_scroll.js]
skip-if = true # Bug 1404832
[browser_webconsole_reflow.js]
skip-if = true # Bug 1406022
[browser_webconsole_reopen_closed_tab.js]
-skip-if = true # Bug 1401881
[browser_webconsole_repeat_different_objects.js]
skip-if = true # Bug 1401953
[browser_webconsole_repeated_messages_accuracy.js]
skip-if = true # Bug 1403450
[browser_webconsole_sandbox_update_after_navigation.js]
skip-if = true # Bug 1401942
[browser_webconsole_script_errordoc_urls.js]
skip-if = true # Bug 1403454
# old console skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
[browser_webconsole_scroll.js]
[browser_webconsole_select_all.js]
skip-if = true # Bug 1404359
[browser_webconsole_show_subresource_security_errors.js]
-skip-if = true # Bug 1401881
-# old console skip-if = e10s && (os == 'win' || os == 'mac') # Bug 1243987
+skip-if = e10s && (os == 'win' || os == 'mac') # Bug 1243987
[browser_webconsole_shows_reqs_in_netmonitor.js]
[browser_webconsole_sourcemap_css.js]
[browser_webconsole_sourcemap_error.js]
[browser_webconsole_sourcemap_invalid.js]
[browser_webconsole_sourcemap_nosource.js]
[browser_webconsole_split.js]
-skip-if = true # Bug 1401881
[browser_webconsole_split_escape_key.js]
skip-if = true # Bug 1405647
[browser_webconsole_split_focus.js]
skip-if = true # Bug 1405648
[browser_webconsole_split_persist.js]
skip-if = true # Bug 1405649
[browser_webconsole_stacktrace_location_debugger_link.js]
[browser_webconsole_stacktrace_location_scratchpad_link.js]
@@ -479,9 +442,8 @@ skip-if = true # Bug 1403205
[browser_webconsole_view_source.js]
skip-if = true # Bug 1405652
# old console skip-if = (os == 'win' && bits == 64) # Bug 1390001
[browser_webconsole_violation.js]
skip-if = true # Bug 1405245
# old console skip-if = e10s && (os == 'win') # Bug 1264955
[browser_webconsole_warn_about_replaced_api.js]
[browser_webconsole_websocket.js]
-skip-if = true # Bug 1401881
\ No newline at end of file
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@@ -49,16 +49,33 @@ registerCleanupFunction(function* () {
var openNewTabAndConsole = Task.async(function* (url) {
let toolbox = yield openNewTabAndToolbox(url, "webconsole");
let hud = toolbox.getCurrentPanel().hud;
hud.jsterm._lazyVariablesView = false;
return hud;
});
/**
+ * Open the Web Console for the given tab.
+ *
+ * @param nsIDOMElement [tab]
+ * Optional tab element for which you want open the Web Console. The
+ * default tab is taken from the global variable |tab|.
+ * @return object
+ * A promise that is resolved once the web console is open.
+ */
+async function openConsole(tab) {
+ let target = TargetFactory.forTab(tab || gBrowser.selectedTab);
+ const toolbox = await gDevTools.showToolbox(target, "webconsole");
+ let hud = toolbox.getCurrentPanel().hud;
+ hud.jsterm._lazyVariablesView = false;
+ return hud;
+};
+
+/**
* Wait for messages in the web console output, resolving once they are received.
*
* @param object options
* - hud: the webconsole
* - messages: Array[Object]. An array of messages to match.
Current supported options:
* - text: Exact text match in .message-body
*/
@@ -177,16 +194,22 @@ function hideContextMenu(hud) {
return Promise.resolve();
}
let onPopupHidden = once(popup, "popuphidden");
popup.hidePopup();
return onPopupHidden;
}
+function loadTab(url, preferredRemoteType) {
+ return addTab(url, { preferredRemoteType }).then( tab => {
+ return { tab, browser: tab.linkedBrowser };
+ });
+}
+
function loadDocument(url, browser = gBrowser.selectedBrowser) {
return new Promise(resolve => {
browser.addEventListener("load", resolve, {capture: true, once: true});
BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
});
}
/**