diff --git a/.eslintignore b/.eslintignore index 7fd21dfc2857..09399a1de33d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -117,8 +117,8 @@ devtools/startup/preferences/devtools-startup.js # Ignore devtools generated code devtools/shared/css/generated/properties-db.js -devtools/client/webconsole/test/fixtures/stubs/*.js -!devtools/client/webconsole/test/fixtures/stubs/index.js +devtools/client/webconsole/test/node/fixtures/stubs/*.js +!devtools/client/webconsole/test/node/fixtures/stubs/index.js # Ignore devtools third-party libs devtools/shared/jsbeautify/* @@ -146,8 +146,8 @@ devtools/client/debugger/test/mochitest/code_*.js devtools/client/framework/test/code_* devtools/client/inspector/markup/test/events_bundle.js devtools/client/netmonitor/test/xhr_bundle.js -devtools/client/webconsole/test/mochitest/code_bundle_nosource.js -devtools/client/webconsole/test/mochitest/code_bundle_invalidmap.js +devtools/client/webconsole/test/browser/code_bundle_nosource.js +devtools/client/webconsole/test/browser/code_bundle_invalidmap.js devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js devtools/server/tests/unit/setBreakpoint* devtools/server/tests/unit/sourcemapped.js diff --git a/devtools/client/bin/devtools-node-test-runner.js b/devtools/client/bin/devtools-node-test-runner.js index a73f6cf073df..b00480ace1b9 100644 --- a/devtools/client/bin/devtools-node-test-runner.js +++ b/devtools/client/bin/devtools-node-test-runner.js @@ -46,7 +46,7 @@ const SUITES = { type: TEST_TYPES.JEST, }, webconsole: { - path: "../webconsole/test", + path: "../webconsole/test/node", type: TEST_TYPES.MOCHA, }, }; diff --git a/devtools/client/webconsole/test/README.md b/devtools/client/webconsole/test/README.md index e340f926919f..9a4f6e2fd593 100644 --- a/devtools/client/webconsole/test/README.md +++ b/devtools/client/webconsole/test/README.md @@ -1,29 +1,30 @@ # Console Tests + The console panel uses currently two different frameworks for tests: -* Mochitest - [Mochitest](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Mochitest) is an automated testing framework built on top of the MochiKit JavaScript libraries. It's just one of the automated regression testing frameworks used by Mozilla. +- Mochitest - [Mochitest](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Mochitest) is an automated testing framework built on top of the MochiKit JavaScript libraries. It's just one of the automated regression testing frameworks used by Mozilla. -Mochitests are located in `devtools/client/webconsole/test/mochitest/` and can be run with the following command: +Mochitests are located in `devtools/client/webconsole/test/browser/` and can be run with the following command: ```sh -./mach test devtools/client/webconsole/test/mochitest/ +./mach test devtools/client/webconsole/test/browser/ ``` These tests can be run on CI when pushing to TRY. Not all tests are enabled at the moment since they were copied over from the old frontend (See Bug 1400847). -* Mocha + Enzyme - [mocha](https://mochajs.org/) Mocha is JavaScript test framework running on Node.js -[Enzyme](http://airbnb.io/enzyme/) is a JavaScript Testing utility for React that makes it easier to assert, manipulate, and traverse your React Components' output. +- Mocha + Enzyme - [mocha](https://mochajs.org/) Mocha is JavaScript test framework running on Node.js + [Enzyme](http://airbnb.io/enzyme/) is a JavaScript Testing utility for React that makes it easier to assert, manipulate, and traverse your React Components' output. -These tests are located in `test/components/` and `test/store/`, and can be run with the following command: +These tests are located in `tests/node/`, and can be run with the following command: ```sh -cd devtools/client/webconsole/test/ && npm install && npm test +cd devtools/client/webconsole/test/node && npm install && npm test ``` or using yarn with ```sh -cd devtools/client/webconsole/test/ && yarn && yarn test +cd devtools/client/webconsole/test/node && yarn && yarn test ``` --- @@ -32,51 +33,29 @@ The team is leaning towards Enzyme since it's well known and suitable for React. It's also easier to contribute to tests written on top of Enzyme. # Stubs + Many tests depends on fix data structures (aka stubs) that mimic RDP packets that represents Console logs. Stubs are stored in `test/fixtures` directory and you might automatically generate them. -## Append new Console API stubs -See how to generate stubs for Console API calls. +## Append new stubs -* Append new entry into `consoleApiCommands` array. The array is defined in this module: -`\test\fixtures\stub-generators\stub-snippets.js` -* Generate stubs with existing mochitest: -`\test\fixtures\stub-generators\browser_webconsole_check_stubs_console_api.js` +- Append new entry into the `getCommands` function return value in on of the `\tests\browser\browser_webconsole_stubs_*.js` + and run the generator using `mach` command, with the `WEBCONSOLE_STUBS_UPDATE=true` environment variable. -Run the generator using `mach` command. -`./mach test devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js --headless` +For console API stubs, you can do: -This will override `test/fixtures/stubs/consoleApi.js`. +`./mach test devtools/client/webconsole/test/browser/browser_webconsole_stubs_console_api.js --headless --setenv WEBCONSOLE_STUBS_UPDATE=true` -## Append new CSS Messages stubs -See how to generate stubs for CSS messages. +This will override `tests/node/fixtures/stubs/consoleApi.js`. -* Append new entry into `cssMessage` map into `stub-snippets.js` -* Generate stubs with: `browser_webconsole_check_stubs_css_message.js` +The same can be done in: -This will override `test/fixtures/stubs/cssMessage.js`. +- `browser_webconsole_stubs_css_message.js` (writes to `tests/node/fixtures/stubs/cssMessage.js`) +- `browser_webconsole_stubs_evaluation_result.js` (writes to `tests/node/fixtures/stubs/evaluationResult.js`) +- `browser_webconsole_stubs_network_event.js` (writes to `tests/node/fixtures/stubs/networkEvent.js`) +- `browser_webconsole_stubs_page_error.js` (writes to `tests/node/fixtures/stubs/pageError.js`) -## Append new Evaluation Result stubs -See how to generate stubs for evaluation results. +If you made some changes that impact all stubs, you can update all at once using: -* Append new entry into `evaluationResultCommands` map into `stub-snippets.js` -* Generate stubs with: `browser_webconsole_check_stubs_evaluation_result.js` - -This will override `test/fixtures/stubs/evaluationResult.js`. - -## Append new Network Events stubs -See how to generate stubs for network events - -* Append new entry into `networkEvent` map into `stub-snippets.js` -* Generate stubs with: `browser_webconsole_update_stubs_network_event.js` - -This will override `test/fixtures/stubs/networkEvent.js`. - -## Append new Page Error stubs -See how to generate stubs for page errors. - -* Append new entry into `pageError` array into `stub-snippets.js` -* Generate stubs with: `browser_webconsole_update_stubs_page_error.js` - -This will override `test/fixtures/stubs/pageError.js`. +`./mach test devtools/client/webconsole/test/browser/browser_webconsole_stubs --headless --setenv WEBCONSOLE_STUBS_UPDATE=true` diff --git a/devtools/client/webconsole/test/mochitest/.eslintrc.js b/devtools/client/webconsole/test/browser/.eslintrc.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/.eslintrc.js rename to devtools/client/webconsole/test/browser/.eslintrc.js diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/browser/browser.ini similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser.ini rename to devtools/client/webconsole/test/browser/browser.ini index 18516092c315..fbb606083d39 100644 --- a/devtools/client/webconsole/test/mochitest/browser.ini +++ b/devtools/client/webconsole/test/browser/browser.ini @@ -155,7 +155,7 @@ support-files = skip-if = !e10s # This test is only valid in e10s [browser_console_clear_cache.js] [browser_console_clear_method.js] -skip-if = true # Bug 1437843 +skip-if = true # Bug XXX # Bug 1437843 [browser_console_consolejsm_output.js] [browser_console_context_menu_entries.js] skip-if = os == "linux" # Bug 1440059, disabled for all build types @@ -285,7 +285,7 @@ skip-if = fission [browser_webconsole_close_unfocused_window.js] [browser_webconsole_closing_after_completion.js] [browser_webconsole_close_sidebar.js] -skip-if = true # Bug 1405250 +skip-if = true # Bug XXX # Bug 1405250 [browser_webconsole_console_api_iframe.js] [browser_webconsole_console_dir.js] [browser_webconsole_console_dir_uninspectable.js] @@ -334,7 +334,7 @@ skip-if = fission [browser_webconsole_execution_scope.js] [browser_webconsole_external_script_errors.js] [browser_webconsole_file_uri.js] -skip-if = true # Bug 1404382 +skip-if = true # Bug XXX # Bug 1404382 [browser_webconsole_filter_buttons_overflow.js] [browser_webconsole_filter_by_input.js] [browser_webconsole_filter_by_regex_input.js] @@ -377,7 +377,7 @@ skip-if = fission [browser_webconsole_network_message_close_on_escape.js] [browser_webconsole_network_message_ctrl_click.js] [browser_webconsole_network_messages_expand.js] -skip-if = true # Bug 1438979 +skip-if = true # Bug XXX # Bug 1438979 [browser_webconsole_network_messages_openinnet.js] fail-if = fission [browser_webconsole_network_messages_resend_request.js] @@ -451,6 +451,16 @@ skip-if = verify [browser_webconsole_stacktrace_location_scratchpad_link.js] [browser_webconsole_strict_mode_errors.js] [browser_webconsole_string.js] +[browser_webconsole_stubs_console_api.js] +skip-if = true # Bug 1572667 +[browser_webconsole_stubs_css_message.js] +skip-if = true # Bug 1572667 +[browser_webconsole_stubs_evaluation_result.js] +skip-if = true # Bug 1572667 +[browser_webconsole_stubs_network_event.js] +skip-if = true # Bug 1572667 +[browser_webconsole_stubs_page_error.js] +skip-if = true # Bug 1572667 [browser_webconsole_telemetry_js_errors.js] [browser_webconsole_telemetry_filters_changed.js] [browser_webconsole_telemetry_persist_toggle_changed.js] diff --git a/devtools/client/webconsole/test/mochitest/browser_console.js b/devtools/client/webconsole/test/browser/browser_console.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_console.js rename to devtools/client/webconsole/test/browser/browser_console.js index 9f5cfb7c36a6..51c4c3c387a3 100644 --- a/devtools/client/webconsole/test/mochitest/browser_console.js +++ b/devtools/client/webconsole/test/browser/browser_console.js @@ -9,11 +9,11 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html?" + + "test/browser/test-console.html?" + Date.now(); const TEST_FILE = "chrome://mochitests/content/browser/devtools/client/" + - "webconsole/test/mochitest/" + + "webconsole/test/browser/" + "test-cu-reporterror.js"; const TEST_XHR_ERROR_URI = `http://example.com/404.html?${Date.now()}`; diff --git a/devtools/client/webconsole/test/mochitest/browser_console_chrome_context_message.js b/devtools/client/webconsole/test/browser/browser_console_chrome_context_message.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_chrome_context_message.js rename to devtools/client/webconsole/test/browser/browser_console_chrome_context_message.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_clear_cache.js b/devtools/client/webconsole/test/browser/browser_console_clear_cache.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_clear_cache.js rename to devtools/client/webconsole/test/browser/browser_console_clear_cache.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_clear_method.js b/devtools/client/webconsole/test/browser/browser_console_clear_method.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_clear_method.js rename to devtools/client/webconsole/test/browser/browser_console_clear_method.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js b/devtools/client/webconsole/test/browser/browser_console_consolejsm_output.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js rename to devtools/client/webconsole/test/browser/browser_console_consolejsm_output.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js b/devtools/client/webconsole/test/browser/browser_console_context_menu_entries.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js rename to devtools/client/webconsole/test/browser/browser_console_context_menu_entries.js index 73c526287af0..46b01c65d153 100644 --- a/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js +++ b/devtools/client/webconsole/test/browser/browser_console_context_menu_entries.js @@ -7,7 +7,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { await pushPref("devtools.browserconsole.contentMessages", true); diff --git a/devtools/client/webconsole/test/mochitest/browser_console_cpow.js b/devtools/client/webconsole/test/browser/browser_console_cpow.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_cpow.js rename to devtools/client/webconsole/test/browser/browser_console_cpow.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_dead_objects.js b/devtools/client/webconsole/test/browser/browser_console_dead_objects.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_dead_objects.js rename to devtools/client/webconsole/test/browser/browser_console_dead_objects.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_devtools_loader_exception.js b/devtools/client/webconsole/test/browser/browser_console_devtools_loader_exception.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_devtools_loader_exception.js rename to devtools/client/webconsole/test/browser/browser_console_devtools_loader_exception.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_error_source_click.js b/devtools/client/webconsole/test/browser/browser_console_error_source_click.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_error_source_click.js rename to devtools/client/webconsole/test/browser/browser_console_error_source_click.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_filters.js b/devtools/client/webconsole/test/browser/browser_console_filters.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_filters.js rename to devtools/client/webconsole/test/browser/browser_console_filters.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_jsterm_await.js b/devtools/client/webconsole/test/browser/browser_console_jsterm_await.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_jsterm_await.js rename to devtools/client/webconsole/test/browser/browser_console_jsterm_await.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_nsiconsolemessage.js b/devtools/client/webconsole/test/browser/browser_console_nsiconsolemessage.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_nsiconsolemessage.js rename to devtools/client/webconsole/test/browser/browser_console_nsiconsolemessage.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js b/devtools/client/webconsole/test/browser/browser_console_open_or_focus.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js rename to devtools/client/webconsole/test/browser/browser_console_open_or_focus.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_restore.js b/devtools/client/webconsole/test/browser/browser_console_restore.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_restore.js rename to devtools/client/webconsole/test/browser/browser_console_restore.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_webconsole_console_api_calls.js b/devtools/client/webconsole/test/browser/browser_console_webconsole_console_api_calls.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_webconsole_console_api_calls.js rename to devtools/client/webconsole/test/browser/browser_console_webconsole_console_api_calls.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_webconsole_ctrlw_close_tab.js b/devtools/client/webconsole/test/browser/browser_console_webconsole_ctrlw_close_tab.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_webconsole_ctrlw_close_tab.js rename to devtools/client/webconsole/test/browser/browser_console_webconsole_ctrlw_close_tab.js diff --git a/devtools/client/webconsole/test/mochitest/browser_console_webconsole_iframe_messages.js b/devtools/client/webconsole/test/browser/browser_console_webconsole_iframe_messages.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_console_webconsole_iframe_messages.js rename to devtools/client/webconsole/test/browser/browser_console_webconsole_iframe_messages.js index d4072a07516d..f5ea0650a587 100644 --- a/devtools/client/webconsole/test/mochitest/browser_console_webconsole_iframe_messages.js +++ b/devtools/client/webconsole/test/browser/browser_console_webconsole_iframe_messages.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console-iframes.html"; + "test/browser/test-console-iframes.html"; const expectedMessages = ["main file", "blah", "iframe 2", "iframe 3"]; diff --git a/devtools/client/webconsole/test/mochitest/browser_console_webconsole_private_browsing.js b/devtools/client/webconsole/test/browser/browser_console_webconsole_private_browsing.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_console_webconsole_private_browsing.js rename to devtools/client/webconsole/test/browser/browser_console_webconsole_private_browsing.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js b/devtools/client/webconsole/test/browser/browser_jsterm_add_edited_input_to_history.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js rename to devtools/client/webconsole/test/browser/browser_jsterm_add_edited_input_to_history.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_accept_no_scroll.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_accept_no_scroll.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_accept_no_scroll.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_accept_no_scroll.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_array_no_index.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_array_no_index.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_arrow_keys.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_arrow_keys.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_arrow_keys.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_await.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_await.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_await.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_await.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_cached_results.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_cached_results.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_commands.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_commands.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_commands.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_control_space.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_control_space.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_control_space.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_control_space.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_crossdomain_iframe.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_crossdomain_iframe.js index b0986369752c..661dded1f722 100644 --- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js +++ b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_crossdomain_iframe.js @@ -8,7 +8,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-iframe-parent.html"; + "test/browser/test-iframe-parent.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_disabled.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_disabled.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_disabled.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_disabled.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_escape_key.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_escape_key.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_extraneous_closing_brackets.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_extraneous_closing_brackets.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_getters_cache.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_getters_cache.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_getters_cache.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_getters_cache.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_getters_cancel.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_getters_cancel.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_getters_cancel.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_getters_cancel.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_getters_confirm.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_getters_confirm.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_getters_confirm.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_getters_confirm.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_getters_learn_more_link.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_getters_learn_more_link.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_getters_learn_more_link.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_getters_learn_more_link.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_helpers.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_helpers.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_in_chrome_tab.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_in_chrome_tab.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_in_debugger_stackframe.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_in_debugger_stackframe.js index 784fde70e84c..6425255c3eed 100644 --- a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js +++ b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_in_debugger_stackframe.js @@ -11,7 +11,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-autocomplete-in-stackframe.html"; + "test/browser/test-autocomplete-in-stackframe.html"; requestLongerTimeout(20); diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_inside_text.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_inside_text.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_native_getters.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_native_getters.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_nav_and_tab_key.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_nav_and_tab_key.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_paste_undo.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_paste_undo.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_paste_undo.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_return_key.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_return_key.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_return_key_no_selection.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_return_key_no_selection.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_width.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_width.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_width.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_width.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_will_navigate.js b/devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_will_navigate.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_will_navigate.js rename to devtools/client/webconsole/test/browser/browser_jsterm_autocomplete_will_navigate.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_await.js b/devtools/client/webconsole/test/browser/browser_jsterm_await.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_await.js rename to devtools/client/webconsole/test/browser/browser_jsterm_await.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_await_assignments.js b/devtools/client/webconsole/test/browser/browser_jsterm_await_assignments.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_await_assignments.js rename to devtools/client/webconsole/test/browser/browser_jsterm_await_assignments.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_await_concurrent.js b/devtools/client/webconsole/test/browser/browser_jsterm_await_concurrent.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_await_concurrent.js rename to devtools/client/webconsole/test/browser/browser_jsterm_await_concurrent.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_await_dynamic_import.js b/devtools/client/webconsole/test/browser/browser_jsterm_await_dynamic_import.js similarity index 93% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_await_dynamic_import.js rename to devtools/client/webconsole/test/browser/browser_jsterm_await_dynamic_import.js index 81dabb332c80..b031e889c979 100644 --- a/devtools/client/webconsole/test/mochitest/browser_jsterm_await_dynamic_import.js +++ b/devtools/client/webconsole/test/browser/browser_jsterm_await_dynamic_import.js @@ -6,7 +6,7 @@ "use strict"; const TEST_URI = - "http://example.com/browser/devtools/client/webconsole/test/mochitest/test-dynamic-import.html"; + "http://example.com/browser/devtools/client/webconsole/test/browser/test-dynamic-import.html"; add_task(async function() { // Enable dynamic import diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_await_error.js b/devtools/client/webconsole/test/browser/browser_jsterm_await_error.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_await_error.js rename to devtools/client/webconsole/test/browser/browser_jsterm_await_error.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_await_helper_dollar_underscore.js b/devtools/client/webconsole/test/browser/browser_jsterm_await_helper_dollar_underscore.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_await_helper_dollar_underscore.js rename to devtools/client/webconsole/test/browser/browser_jsterm_await_helper_dollar_underscore.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_await_paused.js b/devtools/client/webconsole/test/browser/browser_jsterm_await_paused.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_await_paused.js rename to devtools/client/webconsole/test/browser/browser_jsterm_await_paused.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js b/devtools/client/webconsole/test/browser/browser_jsterm_completion.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js rename to devtools/client/webconsole/test/browser/browser_jsterm_completion.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion_bracket.js b/devtools/client/webconsole/test/browser/browser_jsterm_completion_bracket.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_completion_bracket.js rename to devtools/client/webconsole/test/browser/browser_jsterm_completion_bracket.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion_bracket_cached_results.js b/devtools/client/webconsole/test/browser/browser_jsterm_completion_bracket_cached_results.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_completion_bracket_cached_results.js rename to devtools/client/webconsole/test/browser/browser_jsterm_completion_bracket_cached_results.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion_case_sensitivity.js b/devtools/client/webconsole/test/browser/browser_jsterm_completion_case_sensitivity.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_completion_case_sensitivity.js rename to devtools/client/webconsole/test/browser/browser_jsterm_completion_case_sensitivity.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion_dollar_underscore.js b/devtools/client/webconsole/test/browser/browser_jsterm_completion_dollar_underscore.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_completion_dollar_underscore.js rename to devtools/client/webconsole/test/browser/browser_jsterm_completion_dollar_underscore.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion_dollar_zero.js b/devtools/client/webconsole/test/browser/browser_jsterm_completion_dollar_zero.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_completion_dollar_zero.js rename to devtools/client/webconsole/test/browser/browser_jsterm_completion_dollar_zero.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_completion_perfect_match.js b/devtools/client/webconsole/test/browser/browser_jsterm_completion_perfect_match.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_completion_perfect_match.js rename to devtools/client/webconsole/test/browser/browser_jsterm_completion_perfect_match.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js b/devtools/client/webconsole/test/browser/browser_jsterm_content_defined_helpers.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_content_defined_helpers.js rename to devtools/client/webconsole/test/browser/browser_jsterm_content_defined_helpers.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_context_menu_labels.js b/devtools/client/webconsole/test/browser/browser_jsterm_context_menu_labels.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_context_menu_labels.js rename to devtools/client/webconsole/test/browser/browser_jsterm_context_menu_labels.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js b/devtools/client/webconsole/test/browser/browser_jsterm_copy_command.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js rename to devtools/client/webconsole/test/browser/browser_jsterm_copy_command.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js b/devtools/client/webconsole/test/browser/browser_jsterm_ctrl_a_select_all.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js rename to devtools/client/webconsole/test/browser/browser_jsterm_ctrl_a_select_all.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js b/devtools/client/webconsole/test/browser/browser_jsterm_ctrl_key_nav.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js rename to devtools/client/webconsole/test/browser/browser_jsterm_ctrl_key_nav.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js b/devtools/client/webconsole/test/browser/browser_jsterm_document_no_xray.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js rename to devtools/client/webconsole/test/browser/browser_jsterm_document_no_xray.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_editor.js b/devtools/client/webconsole/test/browser/browser_jsterm_editor.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_editor.js rename to devtools/client/webconsole/test/browser/browser_jsterm_editor.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_editor_disabled_history_nav_with_keyboard.js b/devtools/client/webconsole/test/browser/browser_jsterm_editor_disabled_history_nav_with_keyboard.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_editor_disabled_history_nav_with_keyboard.js rename to devtools/client/webconsole/test/browser/browser_jsterm_editor_disabled_history_nav_with_keyboard.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_editor_enter.js b/devtools/client/webconsole/test/browser/browser_jsterm_editor_enter.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_editor_enter.js rename to devtools/client/webconsole/test/browser/browser_jsterm_editor_enter.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_editor_execute.js b/devtools/client/webconsole/test/browser/browser_jsterm_editor_execute.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_editor_execute.js rename to devtools/client/webconsole/test/browser/browser_jsterm_editor_execute.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_editor_gutter.js b/devtools/client/webconsole/test/browser/browser_jsterm_editor_gutter.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_editor_gutter.js rename to devtools/client/webconsole/test/browser/browser_jsterm_editor_gutter.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_editor_resize.js b/devtools/client/webconsole/test/browser/browser_jsterm_editor_resize.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_editor_resize.js rename to devtools/client/webconsole/test/browser/browser_jsterm_editor_resize.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_editor_toggle_keyboard_shortcut.js b/devtools/client/webconsole/test/browser/browser_jsterm_editor_toggle_keyboard_shortcut.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_editor_toggle_keyboard_shortcut.js rename to devtools/client/webconsole/test/browser/browser_jsterm_editor_toggle_keyboard_shortcut.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_editor_toolbar.js b/devtools/client/webconsole/test/browser/browser_jsterm_editor_toolbar.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_editor_toolbar.js rename to devtools/client/webconsole/test/browser/browser_jsterm_editor_toolbar.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js b/devtools/client/webconsole/test/browser/browser_jsterm_error_docs.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js rename to devtools/client/webconsole/test/browser/browser_jsterm_error_docs.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js b/devtools/client/webconsole/test/browser/browser_jsterm_error_outside_valid_range.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js rename to devtools/client/webconsole/test/browser/browser_jsterm_error_outside_valid_range.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_focus_reload.js b/devtools/client/webconsole/test/browser/browser_jsterm_focus_reload.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_focus_reload.js rename to devtools/client/webconsole/test/browser/browser_jsterm_focus_reload.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js b/devtools/client/webconsole/test/browser/browser_jsterm_helper_clear.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js rename to devtools/client/webconsole/test/browser/browser_jsterm_helper_clear.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js b/devtools/client/webconsole/test/browser/browser_jsterm_helper_dollar.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js rename to devtools/client/webconsole/test/browser/browser_jsterm_helper_dollar.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js b/devtools/client/webconsole/test/browser/browser_jsterm_helper_dollar_dollar.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js rename to devtools/client/webconsole/test/browser/browser_jsterm_helper_dollar_dollar.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js b/devtools/client/webconsole/test/browser/browser_jsterm_helper_dollar_x.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js rename to devtools/client/webconsole/test/browser/browser_jsterm_helper_dollar_x.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js b/devtools/client/webconsole/test/browser/browser_jsterm_helper_help.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js rename to devtools/client/webconsole/test/browser/browser_jsterm_helper_help.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js b/devtools/client/webconsole/test/browser/browser_jsterm_helper_keys_values.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js rename to devtools/client/webconsole/test/browser/browser_jsterm_helper_keys_values.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js b/devtools/client/webconsole/test/browser/browser_jsterm_helper_pprint.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js rename to devtools/client/webconsole/test/browser/browser_jsterm_helper_pprint.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js b/devtools/client/webconsole/test/browser/browser_jsterm_hide_when_devtools_chrome_enabled_false.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js rename to devtools/client/webconsole/test/browser/browser_jsterm_hide_when_devtools_chrome_enabled_false.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js b/devtools/client/webconsole/test/browser/browser_jsterm_history.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_history.js rename to devtools/client/webconsole/test/browser/browser_jsterm_history.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js b/devtools/client/webconsole/test/browser/browser_jsterm_history_arrow_keys.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_history_arrow_keys.js rename to devtools/client/webconsole/test/browser/browser_jsterm_history_arrow_keys.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js b/devtools/client/webconsole/test/browser/browser_jsterm_history_nav.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js rename to devtools/client/webconsole/test/browser/browser_jsterm_history_nav.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js b/devtools/client/webconsole/test/browser/browser_jsterm_history_persist.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js rename to devtools/client/webconsole/test/browser/browser_jsterm_history_persist.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js b/devtools/client/webconsole/test/browser/browser_jsterm_inspect.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js rename to devtools/client/webconsole/test/browser/browser_jsterm_inspect.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js b/devtools/client/webconsole/test/browser/browser_jsterm_instance_of.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js rename to devtools/client/webconsole/test/browser/browser_jsterm_instance_of.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_middle_click_paste.js b/devtools/client/webconsole/test/browser/browser_jsterm_middle_click_paste.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_middle_click_paste.js rename to devtools/client/webconsole/test/browser/browser_jsterm_middle_click_paste.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js b/devtools/client/webconsole/test/browser/browser_jsterm_multiline.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js rename to devtools/client/webconsole/test/browser/browser_jsterm_multiline.js index 3df877696afa..b0005a8341db 100644 --- a/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js +++ b/devtools/client/webconsole/test/browser/browser_jsterm_multiline.js @@ -11,7 +11,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; const ALL_CHANNELS = Ci.nsITelemetry.DATASET_ALL_CHANNELS; const SHOULD_ENTER_MULTILINE = [ diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js b/devtools/client/webconsole/test/browser/browser_jsterm_no_input_and_tab_key_pressed.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js rename to devtools/client/webconsole/test/browser/browser_jsterm_no_input_and_tab_key_pressed.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js b/devtools/client/webconsole/test/browser/browser_jsterm_null_undefined.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js rename to devtools/client/webconsole/test/browser/browser_jsterm_null_undefined.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js b/devtools/client/webconsole/test/browser/browser_jsterm_popup_close_on_tab_switch.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js rename to devtools/client/webconsole/test/browser/browser_jsterm_popup_close_on_tab_switch.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_clipboard.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js rename to devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_clipboard.js index 5f7d7272c900..376d8215c394 100644 --- a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js +++ b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_clipboard.js @@ -7,7 +7,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test_jsterm_screenshot_command.html"; + "test/browser/test_jsterm_screenshot_command.html"; // on some machines, such as macOS, dpr is set to 2. This is expected behavior, however // to keep tests consistant across OSs we are setting the dpr to 1 diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js similarity index 94% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js rename to devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js index 0d0468477825..c7463f0a93e1 100644 --- a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js +++ b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js @@ -7,7 +7,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test_jsterm_screenshot_command.html"; + "test/browser/test_jsterm_screenshot_command.html"; const { FileUtils } = ChromeUtils.import( "resource://gre/modules/FileUtils.jsm" diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_user.js b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_user.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_user.js rename to devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_user.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js b/devtools/client/webconsole/test/browser/browser_jsterm_selfxss.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js rename to devtools/client/webconsole/test/browser/browser_jsterm_selfxss.js diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_syntax_highlight_output.js b/devtools/client/webconsole/test/browser/browser_jsterm_syntax_highlight_output.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_jsterm_syntax_highlight_output.js rename to devtools/client/webconsole/test/browser/browser_jsterm_syntax_highlight_output.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser/browser_webconsole_allow_mixedcontent_securityerrors.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js rename to devtools/client/webconsole/test/browser/browser_webconsole_allow_mixedcontent_securityerrors.js index c476a4201a8c..b66af1845bdf 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_allow_mixedcontent_securityerrors.js @@ -15,8 +15,7 @@ const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + - "test-mixedcontent-securityerrors.html"; + "test/browser/test-mixedcontent-securityerrors.html"; const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" + "Mixed_content" + diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_batching.js b/devtools/client/webconsole/test/browser/browser_webconsole_batching.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_batching.js rename to devtools/client/webconsole/test/browser/browser_webconsole_batching.js index 4af4af7c9bb0..1203b808927d 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_batching.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_batching.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-batching.html"; + "test/browser/test-batching.html"; const { l10n } = require("devtools/client/webconsole/utils/messages"); add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js similarity index 94% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js rename to devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js index 13f2d4e7ff6a..2e1e374e723e 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js @@ -18,15 +18,13 @@ const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + - "test-mixedcontent-securityerrors.html"; + "test/browser/test-mixedcontent-securityerrors.html"; const LEARN_MORE_URI = - "https://developer.mozilla.org/docs/Web/Security/" + - "Mixed_content" + + "https://developer.mozilla.org/docs/Web/Security/Mixed_content" + DOCS_GA_PARAMS; const blockedActiveContentText = - "Blocked loading mixed active content " + "\u201chttp://example.com/\u201d"; + "Blocked loading mixed active content \u201chttp://example.com/\u201d"; const blockedDisplayContentText = "Blocked loading mixed display content " + "\u201chttp://example.com/tests/image/test/mochitest/blue.png\u201d"; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages.js b/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages.js rename to devtools/client/webconsole/test/browser/browser_webconsole_cached_messages.js index 972e3880fdf7..a8cc3e31ebb9 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-webconsole-error-observer.html"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages_cross_domain_iframe.js b/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages_cross_domain_iframe.js similarity index 88% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages_cross_domain_iframe.js rename to devtools/client/webconsole/test/browser/browser_webconsole_cached_messages_cross_domain_iframe.js index 44bfc1b6c57b..8ca2f52c34f0 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages_cross_domain_iframe.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_cached_messages_cross_domain_iframe.js @@ -10,10 +10,10 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-iframe-parent.html"; + "test/browser/test-iframe-parent.html"; add_task(async function() { - // test-iframe-parent has an iframe pointing to http://mochi.test:8888/browser/devtools/client/webconsole/test/mochitest/test-iframe-child.html + // test-iframe-parent has an iframe pointing to http://mochi.test:8888/browser/devtools/client/webconsole/test/browser/test-iframe-child.html info("Open the tab first"); await addTab(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_cd_iframe.js b/devtools/client/webconsole/test/browser/browser_webconsole_cd_iframe.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_cd_iframe.js rename to devtools/client/webconsole/test/browser/browser_webconsole_cd_iframe.js index be1692d9485b..01a331f7508d 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_cd_iframe.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_cd_iframe.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-cd-iframe-parent.html"; + "test/browser/test-cd-iframe-parent.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_certificate_messages.js b/devtools/client/webconsole/test/browser/browser_webconsole_certificate_messages.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_certificate_messages.js rename to devtools/client/webconsole/test/browser/browser_webconsole_certificate_messages.js index c693ce167f3d..8a37c36b11d1 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_certificate_messages.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_certificate_messages.js @@ -11,7 +11,7 @@ const TEST_URI = "data:text/html;charset=utf8,Web Console weak crypto warnings test"; const TEST_URI_PATH = "/browser/devtools/client/webconsole/test/" + - "mochitest/test-certificate-messages.html"; + "browser/test-certificate-messages.html"; const SHA1_URL = "https://sha1ee.example.com" + TEST_URI_PATH; const SHA256_URL = "https://sha256ee.example.com" + TEST_URI_PATH; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_clear_cache.js b/devtools/client/webconsole/test/browser/browser_webconsole_clear_cache.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_clear_cache.js rename to devtools/client/webconsole/test/browser/browser_webconsole_clear_cache.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_click_function_to_source.js b/devtools/client/webconsole/test/browser/browser_webconsole_click_function_to_source.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_click_function_to_source.js rename to devtools/client/webconsole/test/browser/browser_webconsole_click_function_to_source.js index 233b2cfee57a..364dc86f903a 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_click_function_to_source.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_click_function_to_source.js @@ -11,12 +11,12 @@ requestLongerTimeout(5); const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-click-function-to-source.html"; const TEST_SCRIPT_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-click-function-to-source.js"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_clickable_urls.js b/devtools/client/webconsole/test/browser/browser_webconsole_clickable_urls.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_clickable_urls.js rename to devtools/client/webconsole/test/browser/browser_webconsole_clickable_urls.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_close_sidebar.js b/devtools/client/webconsole/test/browser/browser_webconsole_close_sidebar.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_close_sidebar.js rename to devtools/client/webconsole/test/browser/browser_webconsole_close_sidebar.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_close_unfocused_window.js b/devtools/client/webconsole/test/browser/browser_webconsole_close_unfocused_window.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_close_unfocused_window.js rename to devtools/client/webconsole/test/browser/browser_webconsole_close_unfocused_window.js index 5c4a60d5826e..df9a43504b29 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_close_unfocused_window.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_close_unfocused_window.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { const tab1 = await addTab(TEST_URI, { window }); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_closing_after_completion.js b/devtools/client/webconsole/test/browser/browser_webconsole_closing_after_completion.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_closing_after_completion.js rename to devtools/client/webconsole/test/browser/browser_webconsole_closing_after_completion.js index 6e122c733c5b..ed64c67f2586 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_closing_after_completion.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_closing_after_completion.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { const tab = await addTab(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_api_iframe.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_api_iframe.js similarity index 94% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_api_iframe.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_api_iframe.js index ca4213242e74..f20119ff2451 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_api_iframe.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_api_iframe.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console-api-iframe.html"; + "test/browser/test-console-api-iframe.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_dir.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_dir.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir_uninspectable.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_dir_uninspectable.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir_uninspectable.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_dir_uninspectable.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_error_expand_object.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_error_expand_object.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_error_expand_object.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_error_expand_object.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_group.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_group.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_group.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_group.js index 5da195f00cd4..fff7d0f6630a 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_group.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_group.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console-group.html"; + "test/browser/test-console-group.html"; const { INDENT_WIDTH, } = require("devtools/client/webconsole/components/Output/MessageIndent"); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_group_open_no_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_group_open_no_scroll.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_group_open_no_scroll.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_group_open_no_scroll.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_logging_workers_api.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_logging_workers_api.js similarity index 94% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_logging_workers_api.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_logging_workers_api.js index a1b67f265aed..e805f99de185 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_logging_workers_api.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_logging_workers_api.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console-workers.html"; + "test/browser/test-console-workers.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_table.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_table.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_table.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_table.js index 3b974818cf68..2f9771a57341 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_table.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_table.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console-table.html"; + "test/browser/test-console-table.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_timeStamp.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_timeStamp.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_timeStamp.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_timeStamp.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_distinct.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_distinct.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_distinct.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_trace_distinct.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_duplicates.js b/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_duplicates.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_duplicates.js rename to devtools/client/webconsole/test/browser/browser_webconsole_console_trace_duplicates.js index 08cb3f12481e..f5612645229a 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_duplicates.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_console_trace_duplicates.js @@ -6,7 +6,7 @@ "use strict"; const TEST_URI = - "http://example.com/browser/devtools/client/webconsole/test/mochitest/" + + "http://example.com/browser/devtools/client/webconsole/test/browser/" + "test-console-trace-duplicates.html"; add_task(async function testTraceMessages() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js rename to devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_entire_message.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_link_location.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_link_location.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_link_location.js rename to devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_link_location.js index 198c1c61b92d..f799bb738755 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_link_location.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_link_location.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html?_date=" + + "test/browser/test-console.html?_date=" + Date.now(); const CONTEXT_MENU_ID = "#console-menu-copy-url"; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js rename to devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_message_with_framework_stacktrace.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_object.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_object.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_object.js rename to devtools/client/webconsole/test/browser/browser_webconsole_context_menu_copy_object.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_export_console_output.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_export_console_output.js rename to devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_object_in_sidebar.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js rename to devtools/client/webconsole/test/browser/browser_webconsole_context_menu_object_in_sidebar.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_open_url.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_open_url.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_open_url.js rename to devtools/client/webconsole/test/browser/browser_webconsole_context_menu_open_url.js index 2c5e61ade9ae..245f153af899 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_open_url.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_open_url.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { // Enable net messages in the console for this test. diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_store_as_global.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_store_as_global.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_store_as_global.js rename to devtools/client/webconsole/test/browser/browser_webconsole_context_menu_store_as_global.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_cors_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_cors_errors.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_cors_errors.js rename to devtools/client/webconsole/test/browser/browser_webconsole_cors_errors.js index ec16134284d3..927ac6075b68 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_cors_errors.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_cors_errors.js @@ -7,7 +7,7 @@ "use strict"; const TEST_URI = - "http://example.com/browser/devtools/client/webconsole/test/mochitest/test-network-request.html"; + "http://example.com/browser/devtools/client/webconsole/test/browser/test-network-request.html"; const BASE_CORS_ERROR_URL = "https://developer.mozilla.org/docs/Web/HTTP/CORS/Errors/"; const BASE_CORS_ERROR_URL_PARAMS = new URLSearchParams({ @@ -157,8 +157,8 @@ add_task(async function() { // See Bug 1480672. // XXX: Failing with another error: Console message: Security Error: Content at - // http://example.com/browser/devtools/client/webconsole/test/mochitest/test-network-request.html - // may not load or link to file:///Users/nchevobbe/Projects/mozilla-central/devtools/client/webconsole/test/mochitest/sjs_cors-test-server.sjs. + // http://example.com/browser/devtools/client/webconsole/test/browser/test-network-request.html + // may not load or link to file:///Users/nchevobbe/Projects/mozilla-central/devtools/client/webconsole/test/browser/sjs_cors-test-server.sjs. // info("Test CORSRequestNotHttp"); // onCorsMessage = waitForMessage(hud, "Reason: CORS request not http"); // const dir = getChromeDir(getResolvedURI(gTestPath)); @@ -191,7 +191,7 @@ function makeFaultyCorsCall(errorCategory, corsUrl) { ([category, url]) => { if (!url) { const baseUrl = - "http://mochi.test:8888/browser/devtools/client/webconsole/test/mochitest"; + "http://mochi.test:8888/browser/devtools/client/webconsole/test/browser"; url = `${baseUrl}/sjs_cors-test-server.sjs?corsErrorCategory=${category}`; } diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js b/devtools/client/webconsole/test/browser/browser_webconsole_csp_ignore_reflected_xss_message.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js rename to devtools/client/webconsole/test/browser/browser_webconsole_csp_ignore_reflected_xss_message.js index 8d83b7023874..29c1d8721e89 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_csp_ignore_reflected_xss_message.js @@ -13,7 +13,7 @@ const EXPECTED_RESULT = "Directive and values will be ignored."; const TEST_FILE = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test_console_csp_ignore_reflected_xss_message.html"; const TEST_URI = diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_violation.js b/devtools/client/webconsole/test/browser/browser_webconsole_csp_violation.js similarity index 94% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_csp_violation.js rename to devtools/client/webconsole/test/browser/browser_webconsole_csp_violation.js index 750314b03497..cd766bc25676 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_violation.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_csp_violation.js @@ -15,7 +15,7 @@ add_task(async function() { { const TEST_VIOLATION = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-csp-violation.html"; + "test/browser/test-csp-violation.html"; const CSP_VIOLATION_MSG = "Content Security Policy: The page\u2019s settings " + "blocked the loading of a resource at " + @@ -30,7 +30,7 @@ add_task(async function() { { const TEST_VIOLATION = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-csp-violation-inline.html"; + "test/browser/test-csp-violation-inline.html"; const CSP_VIOLATION = `Content Security Policy: The page’s settings blocked` + ` the loading of a resource at inline (“style-src”).`; @@ -64,7 +64,7 @@ add_task(async function() { { const TEST_VIOLATION = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-csp-violation-base-uri.html"; + "test/browser/test-csp-violation-base-uri.html"; const CSP_VIOLATION = `Content Security Policy: The page’s settings blocked the loading of a resource at https://evil.com/ (“base-uri”).`; const VIOLATION_LOCATION = "test-csp-violation-base-uri.html:15:24"; await loadDocument(TEST_VIOLATION); @@ -89,7 +89,7 @@ add_task(async function() { { const TEST_VIOLATION = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-csp-violation-form-action.html"; + "test/browser/test-csp-violation-form-action.html"; const CSP_VIOLATION = `Content Security Policy: The page’s settings blocked the loading of a resource at https://evil.com/evil.com (“form-action”).`; const VIOLATION_LOCATION = "test-csp-violation-form-action.html:14:39"; @@ -107,7 +107,7 @@ add_task(async function() { { const TEST_VIOLATION = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-csp-violation-frame-ancestor-parent.html"; + "test/browser/test-csp-violation-frame-ancestor-parent.html"; const CSP_VIOLATION = `Content Security Policy: The page’s settings blocked` + ` the loading of a resource at ${TEST_VIOLATION} (“frame-ancestors”).`; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_cspro.js b/devtools/client/webconsole/test/browser/browser_webconsole_cspro.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_cspro.js rename to devtools/client/webconsole/test/browser/browser_webconsole_cspro.js index 222f3b5f774d..1d4db75aa3de 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_cspro.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_cspro.js @@ -19,7 +19,7 @@ See Bug 1010953. const TEST_URI = "data:text/html;charset=utf8,Web Console CSP report only test"; const TEST_VIOLATION = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-cspro.html"; + "test/browser/test-cspro.html"; const CSP_VIOLATION_MSG = "Content Security Policy: The page\u2019s settings blocked the loading of a resource " + "at http://some.example.com/cspro.png (\u201cimg-src\u201d)."; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_document_focus.js b/devtools/client/webconsole/test/browser/browser_webconsole_document_focus.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_document_focus.js rename to devtools/client/webconsole/test/browser/browser_webconsole_document_focus.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_duplicate_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_duplicate_errors.js similarity index 95% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_duplicate_errors.js rename to devtools/client/webconsole/test/browser/browser_webconsole_duplicate_errors.js index f27b8dbf6b7f..556cdf75defe 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_duplicate_errors.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_duplicate_errors.js @@ -8,7 +8,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-duplicate-error.html"; + "test/browser/test-duplicate-error.html"; add_task(async function() { // On e10s, the exception is triggered in child process diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_grouped_stack.js b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_grouped_stack.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_grouped_stack.js rename to devtools/client/webconsole/test/browser/browser_webconsole_error_with_grouped_stack.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_longstring_stack.js b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_longstring_stack.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_longstring_stack.js rename to devtools/client/webconsole/test/browser/browser_webconsole_error_with_longstring_stack.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_unicode.js b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_unicode.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_unicode.js rename to devtools/client/webconsole/test/browser/browser_webconsole_error_with_unicode.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_url.js b/devtools/client/webconsole/test/browser/browser_webconsole_error_with_url.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_error_with_url.js rename to devtools/client/webconsole/test/browser/browser_webconsole_error_with_url.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_errors_after_page_reload.js b/devtools/client/webconsole/test/browser/browser_webconsole_errors_after_page_reload.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_errors_after_page_reload.js rename to devtools/client/webconsole/test/browser/browser_webconsole_errors_after_page_reload.js index 1160648718d4..c14977d7e414 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_errors_after_page_reload.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_errors_after_page_reload.js @@ -11,7 +11,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-error.html"; + "test/browser/test-error.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_eval_error.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_eval_error.js rename to devtools/client/webconsole/test/browser/browser_webconsole_eval_error.js index e09b04e49ddd..7e1edf04cd31 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_error.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_eval_error.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-eval-error.html"; + "test/browser/test-eval-error.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js b/devtools/client/webconsole/test/browser/browser_webconsole_eval_in_debugger_stackframe.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js rename to devtools/client/webconsole/test/browser/browser_webconsole_eval_in_debugger_stackframe.js index 6bf5c6e5fe4b..4c20a8e1d4ec 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_eval_in_debugger_stackframe.js @@ -11,7 +11,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-eval-in-stackframe.html"; + "test/browser/test-eval-in-stackframe.html"; add_task(async function() { info("open the console"); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js b/devtools/client/webconsole/test/browser/browser_webconsole_eval_in_debugger_stackframe2.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js rename to devtools/client/webconsole/test/browser/browser_webconsole_eval_in_debugger_stackframe2.js index cca91cf78b85..c42992120710 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_eval_in_debugger_stackframe2.js @@ -11,7 +11,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-eval-in-stackframe.html"; + "test/browser/test-eval-in-stackframe.html"; add_task(async function() { info("open the console"); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_sources.js b/devtools/client/webconsole/test/browser/browser_webconsole_eval_sources.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_eval_sources.js rename to devtools/client/webconsole/test/browser/browser_webconsole_eval_sources.js index 281219669927..f264423f63df 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_sources.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_eval_sources.js @@ -7,7 +7,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-eval-sources.html"; + "test/browser/test-eval-sources.html"; async function clickFirstStackElement(hud, message, needsExpansion) { if (needsExpansion) { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_execution_scope.js b/devtools/client/webconsole/test/browser/browser_webconsole_execution_scope.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_execution_scope.js rename to devtools/client/webconsole/test/browser/browser_webconsole_execution_scope.js index 382ecf8db18e..27805bf3bc87 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_execution_scope.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_execution_scope.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_external_script_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_external_script_errors.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_external_script_errors.js rename to devtools/client/webconsole/test/browser/browser_webconsole_external_script_errors.js index d760df6eec64..da927b354f88 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_external_script_errors.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_external_script_errors.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-external-script-errors.html"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_file_uri.js b/devtools/client/webconsole/test/browser/browser_webconsole_file_uri.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_file_uri.js rename to devtools/client/webconsole/test/browser/browser_webconsole_file_uri.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_buttons_overflow.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_buttons_overflow.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_filter_buttons_overflow.js rename to devtools/client/webconsole/test/browser/browser_webconsole_filter_buttons_overflow.js index 997ab26824c2..558213fb1dd7 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_buttons_overflow.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_filter_buttons_overflow.js @@ -7,7 +7,7 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_by_input.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_filter_by_input.js rename to devtools/client/webconsole/test/browser/browser_webconsole_filter_by_input.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_by_regex_input.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_regex_input.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_filter_by_regex_input.js rename to devtools/client/webconsole/test/browser/browser_webconsole_filter_by_regex_input.js index 5f983eb9041c..a96d982f4774 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_by_regex_input.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_filter_by_regex_input.js @@ -16,7 +16,7 @@ const MESSAGES = [ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console-filter-by-regex-input.html"; + "test/browser/test-console-filter-by-regex-input.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_navigation_marker.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_navigation_marker.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_filter_navigation_marker.js rename to devtools/client/webconsole/test/browser/browser_webconsole_filter_navigation_marker.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_filter_scroll.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_filter_scroll.js rename to devtools/client/webconsole/test/browser/browser_webconsole_filter_scroll.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_filters.js b/devtools/client/webconsole/test/browser/browser_webconsole_filters.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_filters.js rename to devtools/client/webconsole/test/browser/browser_webconsole_filters.js index 047ef6315dbe..8b7e3be0e736 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_filters.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_filters.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console-filters.html"; + "test/browser/test-console-filters.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_filters_persist.js b/devtools/client/webconsole/test/browser/browser_webconsole_filters_persist.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_filters_persist.js rename to devtools/client/webconsole/test/browser/browser_webconsole_filters_persist.js index 10c7b0901d8d..4ac5435e4946 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_filters_persist.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_filters_persist.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console-filters.html"; + "test/browser/test-console-filters.html"; add_task(async function() { let hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_highlighter_console_helper.js b/devtools/client/webconsole/test/browser/browser_webconsole_highlighter_console_helper.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_highlighter_console_helper.js rename to devtools/client/webconsole/test/browser/browser_webconsole_highlighter_console_helper.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_hpkp_invalid-headers.js b/devtools/client/webconsole/test/browser/browser_webconsole_hpkp_invalid-headers.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_hpkp_invalid-headers.js rename to devtools/client/webconsole/test/browser/browser_webconsole_hpkp_invalid-headers.js index e0ded086b9cc..86f6a5f7ef25 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_hpkp_invalid-headers.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_hpkp_invalid-headers.js @@ -9,7 +9,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console HPKP invalid header test"; const SJS_URL = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test_hpkp-invalid-headers.sjs"; + "test/browser/test_hpkp-invalid-headers.sjs"; const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/" + "Public_Key_Pinning" + diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_hsts_invalid-headers.js b/devtools/client/webconsole/test/browser/browser_webconsole_hsts_invalid-headers.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_hsts_invalid-headers.js rename to devtools/client/webconsole/test/browser/browser_webconsole_hsts_invalid-headers.js index 880ec729276f..d6f5c398809a 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_hsts_invalid-headers.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_hsts_invalid-headers.js @@ -9,7 +9,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console HSTS invalid header test"; const SJS_URL = "https://example.com/browser/devtools/client/webconsole/" + - "/test/mochitest/test_hsts-invalid-headers.sjs"; + "/test/browser/test_hsts-invalid-headers.sjs"; const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/Headers/" + "Strict-Transport-Security" + diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_iframe_wrong_hud.js b/devtools/client/webconsole/test/browser/browser_webconsole_iframe_wrong_hud.js similarity index 90% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_iframe_wrong_hud.js rename to devtools/client/webconsole/test/browser/browser_webconsole_iframe_wrong_hud.js index 3a64d843b01a..7378fefd56bc 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_iframe_wrong_hud.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_iframe_wrong_hud.js @@ -9,15 +9,15 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-iframe-wrong-hud.html"; + "test/browser/test-iframe-wrong-hud.html"; const TEST_IFRAME_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-iframe-wrong-hud-iframe.html"; + "test/browser/test-iframe-wrong-hud-iframe.html"; const TEST_DUMMY_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { await pushPref("devtools.webconsole.filter.net", true); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_in_line_layout.js b/devtools/client/webconsole/test/browser/browser_webconsole_in_line_layout.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_in_line_layout.js rename to devtools/client/webconsole/test/browser/browser_webconsole_in_line_layout.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js b/devtools/client/webconsole/test/browser/browser_webconsole_ineffective_iframe_sandbox_warning.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js rename to devtools/client/webconsole/test/browser/browser_webconsole_ineffective_iframe_sandbox_warning.js index 009b3cb2adeb..3a4df6c788f2 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_ineffective_iframe_sandbox_warning.js @@ -11,7 +11,7 @@ requestLongerTimeout(2); const TEST_PATH = - "http://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "http://example.com/browser/devtools/client/webconsole/" + "test/browser/"; const TEST_URI_WARNING = `${TEST_PATH}test-ineffective-iframe-sandbox-warning0.html`; const TEST_URI_NOWARNING = [ `${TEST_PATH}test-ineffective-iframe-sandbox-warning1.html`, diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_init.js b/devtools/client/webconsole/test/browser/browser_webconsole_init.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_init.js rename to devtools/client/webconsole/test/browser/browser_webconsole_init.js index e07ce27beb20..a584cd323590 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_init.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_init.js @@ -7,7 +7,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js b/devtools/client/webconsole/test/browser/browser_webconsole_input_field_focus_on_panel_select.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js rename to devtools/client/webconsole/test/browser/browser_webconsole_input_field_focus_on_panel_select.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_input_focus.js b/devtools/client/webconsole/test/browser/browser_webconsole_input_focus.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_input_focus.js rename to devtools/client/webconsole/test/browser/browser_webconsole_input_focus.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js b/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js rename to devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js index ce1c6abdfee5..47dd37444e3d 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-insecure-passwords-about-blank-web-console-warning.html"; const INSECURE_PASSWORD_MSG = "Password fields present on an insecure (http://) iframe." + diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js b/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_web_console_warning.js similarity index 91% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js rename to devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_web_console_warning.js index 1015288eb259..6a5ce76a9da1 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_insecure_passwords_web_console_warning.js @@ -10,13 +10,13 @@ const INSECURE_IFRAME_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-insecure-passwords-web-console-warning.html"; + "test/browser/test-insecure-passwords-web-console-warning.html"; const INSECURE_PASSWORD_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-iframe-insecure-form-action.html"; + "test/browser/test-iframe-insecure-form-action.html"; const INSECURE_FORM_ACTION_URI = "https://example.com/browser/devtools/client/" + - "webconsole/test/mochitest/test-iframe-insecure-form-action.html"; + "webconsole/test/browser/test-iframe-insecure-form-action.html"; const STOLEN = "This is a security risk that allows user login credentials to be stolen."; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_inspect_cross_domain_object.js b/devtools/client/webconsole/test/browser/browser_webconsole_inspect_cross_domain_object.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_inspect_cross_domain_object.js rename to devtools/client/webconsole/test/browser/browser_webconsole_inspect_cross_domain_object.js index 3eaac21b31f5..fe479fa9d726 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_inspect_cross_domain_object.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_inspect_cross_domain_object.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-inspect-cross-domain-objects-top.html"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_keyboard_accessibility.js b/devtools/client/webconsole/test/browser/browser_webconsole_keyboard_accessibility.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_keyboard_accessibility.js rename to devtools/client/webconsole/test/browser/browser_webconsole_keyboard_accessibility.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_location_debugger_link.js b/devtools/client/webconsole/test/browser/browser_webconsole_location_debugger_link.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_location_debugger_link.js rename to devtools/client/webconsole/test/browser/browser_webconsole_location_debugger_link.js index aa68d8ea7711..09798d5d9964 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_location_debugger_link.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_location_debugger_link.js @@ -19,7 +19,7 @@ requestLongerTimeout(2); const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-location-debugger-link.html"; + "test/browser/test-location-debugger-link.html"; add_task(async function() { await pushPref("devtools.webconsole.filter.error", true); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_location_scratchpad_link.js b/devtools/client/webconsole/test/browser/browser_webconsole_location_scratchpad_link.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_location_scratchpad_link.js rename to devtools/client/webconsole/test/browser/browser_webconsole_location_scratchpad_link.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_location_styleeditor_link.js b/devtools/client/webconsole/test/browser/browser_webconsole_location_styleeditor_link.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_location_styleeditor_link.js rename to devtools/client/webconsole/test/browser/browser_webconsole_location_styleeditor_link.js index 707fbd1bc76c..759d8834ab61 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_location_styleeditor_link.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_location_styleeditor_link.js @@ -7,7 +7,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-location-styleeditor-link.html"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_logErrorInPage.js b/devtools/client/webconsole/test/browser/browser_webconsole_logErrorInPage.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_logErrorInPage.js rename to devtools/client/webconsole/test/browser/browser_webconsole_logErrorInPage.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_logWarningInPage.js b/devtools/client/webconsole/test/browser/browser_webconsole_logWarningInPage.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_logWarningInPage.js rename to devtools/client/webconsole/test/browser/browser_webconsole_logWarningInPage.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_loglimit.js b/devtools/client/webconsole/test/browser/browser_webconsole_loglimit.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_loglimit.js rename to devtools/client/webconsole/test/browser/browser_webconsole_loglimit.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_longstring.js b/devtools/client/webconsole/test/browser/browser_webconsole_longstring.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_longstring.js rename to devtools/client/webconsole/test/browser/browser_webconsole_longstring.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_getter.js b/devtools/client/webconsole/test/browser/browser_webconsole_longstring_getter.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_getter.js rename to devtools/client/webconsole/test/browser/browser_webconsole_longstring_getter.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_message_categories.js b/devtools/client/webconsole/test/browser/browser_webconsole_message_categories.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_message_categories.js rename to devtools/client/webconsole/test/browser/browser_webconsole_message_categories.js index e81a68f6649a..da1adfc2e5dd 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_message_categories.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_message_categories.js @@ -11,7 +11,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " + "bug 595934 - message categories coverage."; const TESTS_PATH = - "http://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "http://example.com/browser/devtools/client/webconsole/" + "test/browser/"; const TESTS = [ { // #0 diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js b/devtools/client/webconsole/test/browser/browser_webconsole_multiple_windows_and_tabs.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js rename to devtools/client/webconsole/test/browser/browser_webconsole_multiple_windows_and_tabs.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_navigate_to_parse_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_navigate_to_parse_error.js similarity index 94% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_navigate_to_parse_error.js rename to devtools/client/webconsole/test/browser/browser_webconsole_navigate_to_parse_error.js index d0aae2ca0a58..74ae980dd374 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_navigate_to_parse_error.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_navigate_to_parse_error.js @@ -12,7 +12,7 @@ const TEST_URI = "data:text/html;charset=utf8,Web Console navigate-to parse error test"; const TEST_VIOLATION = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-navigate-to-parse-error.html"; + "test/browser/test-navigate-to-parse-error.html"; const CSP_VIOLATION_MSG = "Content Security Policy: Couldn\u2019t process unknown directive \u2018navigate-to\u2019"; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_attach.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_attach.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_attach.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_attach.js index 480c87e3be25..f7b26b5b2f82 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_attach.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_attach.js @@ -5,7 +5,7 @@ const TEST_FILE = "test-network-request.html"; const TEST_PATH = - "http://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "http://example.com/browser/devtools/client/webconsole/" + "test/browser/"; const TEST_URI = TEST_PATH + TEST_FILE; add_task(async function task() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_exceptions.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_exceptions.js similarity index 95% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_exceptions.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_exceptions.js index fc731dba22d1..1b802c35ade0 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_exceptions.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_exceptions.js @@ -11,7 +11,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 618078"; const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-network-exceptions.html"; + "test/browser/test-network-exceptions.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_message_close_on_escape.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_message_close_on_escape.js similarity index 95% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_message_close_on_escape.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_message_close_on_escape.js index 1ed3aa8a4856..4d12b3a4d811 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_message_close_on_escape.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_message_close_on_escape.js @@ -5,7 +5,7 @@ const TEST_FILE = "test-network-request.html"; const TEST_PATH = - "https://example.com/browser/devtools/client/webconsole/test/mochitest/"; + "https://example.com/browser/devtools/client/webconsole/test/browser/"; const TEST_URI = TEST_PATH + TEST_FILE; add_task(async function task() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_message_ctrl_click.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_message_ctrl_click.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_message_ctrl_click.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_message_ctrl_click.js index d7c64084124a..75aac6237de2 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_message_ctrl_click.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_message_ctrl_click.js @@ -5,7 +5,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { // Enable net messages in the console for this test. diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_expand.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_expand.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_expand.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_messages_expand.js index 6a7c12d55dbf..63912db70189 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_expand.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_expand.js @@ -5,7 +5,7 @@ const TEST_FILE = "test-network-request.html"; const TEST_PATH = - "https://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "https://example.com/browser/devtools/client/webconsole/" + "test/browser/"; const TEST_URI = TEST_PATH + TEST_FILE; requestLongerTimeout(2); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_openinnet.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_openinnet.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_openinnet.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_messages_openinnet.js index 311cc462c2cc..19e427a4bf77 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_openinnet.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_openinnet.js @@ -10,7 +10,7 @@ const TEST_URI = const TEST_FILE = "test-network-request.html"; const JSON_TEST_URL = "test-network-request.html"; const TEST_PATH = - "http://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "http://example.com/browser/devtools/client/webconsole/" + "test/browser/"; const NET_PREF = "devtools.webconsole.filter.net"; const XHR_PREF = "devtools.webconsole.filter.netxhr"; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_resend_request.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_resend_request.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_resend_request.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_messages_resend_request.js index 79d9b306b94c..7cf9ed03c8ba 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_resend_request.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_resend_request.js @@ -9,7 +9,7 @@ const TEST_URI = const TEST_FILE = "test-network-request.html"; const TEST_PATH = - "http://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "http://example.com/browser/devtools/client/webconsole/" + "test/browser/"; add_task(async function task() { await pushPref("devtools.webconsole.filter.net", true); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_stacktrace_console_initiated_request.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_messages_stacktrace_console_initiated_request.js index d23628c6f45a..f65048ee8ecf 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_stacktrace_console_initiated_request.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_stacktrace_console_initiated_request.js @@ -5,7 +5,7 @@ const TEST_FILE = "test-network-request.html"; const TEST_PATH = - "https://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "https://example.com/browser/devtools/client/webconsole/" + "test/browser/"; const TEST_URI = TEST_PATH + TEST_FILE; pushPref("devtools.webconsole.filter.netxhr", true); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_status_code.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_status_code.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_status_code.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_messages_status_code.js index 6a25da5ee71a..eb0b1ba20ede 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_status_code.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_messages_status_code.js @@ -5,7 +5,7 @@ const TEST_FILE = "test-network-request.html"; const TEST_PATH = - "http://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "http://example.com/browser/devtools/client/webconsole/" + "test/browser/"; const TEST_URI = TEST_PATH + TEST_FILE; const NET_PREF = "devtools.webconsole.filter.net"; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_requests_from_chrome.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_requests_from_chrome.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_requests_from_chrome.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_requests_from_chrome.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_reset_filter.js b/devtools/client/webconsole/test/browser/browser_webconsole_network_reset_filter.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_network_reset_filter.js rename to devtools/client/webconsole/test/browser/browser_webconsole_network_reset_filter.js index bb36940b99b9..e8d305698bfd 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_reset_filter.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_reset_filter.js @@ -9,7 +9,7 @@ "use strict"; const TEST_PATH = - "http://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "http://example.com/browser/devtools/client/webconsole/" + "test/browser/"; const TEST_URI = "data:text/html;charset=utf8,

test file URI"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_highlight.js b/devtools/client/webconsole/test/browser/browser_webconsole_nodes_highlight.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_highlight.js rename to devtools/client/webconsole/test/browser/browser_webconsole_nodes_highlight.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_select.js b/devtools/client/webconsole/test/browser/browser_webconsole_nodes_select.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_select.js rename to devtools/client/webconsole/test/browser/browser_webconsole_nodes_select.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_warning.js b/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_warning.js similarity index 81% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_warning.js rename to devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_warning.js index 5afca864419a..d5d7ad8d404d 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_warning.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_warning.js @@ -10,10 +10,10 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-non-javascript-mime.html"; const MIME_WARNING_MSG = - "The script from “http://example.com/browser/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js” was loaded even though its MIME type (“text/plain”) is not a valid JavaScript MIME type"; + "The script from “http://example.com/browser/devtools/client/webconsole/test/browser/test-non-javascript-mime.js” was loaded even though its MIME type (“text/plain”) is not a valid JavaScript MIME type"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_worker_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_worker_error.js similarity index 91% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_worker_error.js rename to devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_worker_error.js index 738c2bf28b7e..67a94a4d6fea 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_worker_error.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_non_javascript_mime_worker_error.js @@ -12,11 +12,11 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-non-javascript-mime-worker.html"; const JS_URI = - "http://example.com/browser/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js"; + "http://example.com/browser/devtools/client/webconsole/test/browser/test-non-javascript-mime.js"; const MIME_ERROR_MSG1 = `Loading Worker from “${JS_URI}” was blocked because of a disallowed MIME type (“text/plain”).`; const MIME_ERROR_MSG2 = `Loading script from “${JS_URI}” with importScripts() was blocked because of a disallowed MIME type (“text/plain”).`; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_ctrl_click.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_ctrl_click.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_ctrl_click.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_ctrl_click.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_in_sidebar_keyboard_nav.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_in_sidebar_keyboard_nav.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_in_sidebar_keyboard_nav.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_in_sidebar_keyboard_nav.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector__proto__.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector__proto__.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector__proto__.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector__proto__.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_entries.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_entries.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_entries.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_entries.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_getters.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_getters.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_getters_prototype.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_prototype.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_getters_prototype.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_prototype.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_getters_shadowed.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_shadowed.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_getters_shadowed.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_getters_shadowed.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_key_sorting.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_key_sorting.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_key_sorting.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_key_sorting.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_local_session_storage.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_local_session_storage.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_local_session_storage.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_local_session_storage.js index ffd49940ecb7..f90b8d6c7c4b 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_local_session_storage.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_local_session_storage.js @@ -8,7 +8,7 @@ // Check expanding/collapsing local and session storage in the console. const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-local-session-storage.html"; + "test/browser/test-local-session-storage.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_nested_proxy.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_proxy.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_nested_proxy.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_proxy.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_scroll.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_scroll.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_scroll.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_selected_text.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_selected_text.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_selected_text.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_selected_text.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_while_debugging_and_inspecting.js similarity index 97% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js rename to devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_while_debugging_and_inspecting.js index 80ae6afac4d4..2276db10af46 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_while_debugging_and_inspecting.js @@ -10,7 +10,7 @@ const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-eval-in-stackframe.html"; + "test/browser/test-eval-in-stackframe.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_observer_notifications.js b/devtools/client/webconsole/test/browser/browser_webconsole_observer_notifications.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_observer_notifications.js rename to devtools/client/webconsole/test/browser/browser_webconsole_observer_notifications.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js b/devtools/client/webconsole/test/browser/browser_webconsole_optimized_out_vars.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js rename to devtools/client/webconsole/test/browser/browser_webconsole_optimized_out_vars.js index 1451b489399e..12305dc85841 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_optimized_out_vars.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-closure-optimized-out.html"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy.js b/devtools/client/webconsole/test/browser/browser_webconsole_output_copy.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy.js rename to devtools/client/webconsole/test/browser/browser_webconsole_output_copy.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy_newlines.js b/devtools/client/webconsole/test/browser/browser_webconsole_output_copy_newlines.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy_newlines.js rename to devtools/client/webconsole/test/browser/browser_webconsole_output_copy_newlines.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_output_order.js b/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_output_order.js rename to devtools/client/webconsole/test/browser/browser_webconsole_output_order.js index bc31c55bcfaf..deeabd029084 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_output_order.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_output_trimmed.js b/devtools/client/webconsole/test/browser/browser_webconsole_output_trimmed.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_output_trimmed.js rename to devtools/client/webconsole/test/browser/browser_webconsole_output_trimmed.js index b685809dd8fc..15f3974d8126 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_output_trimmed.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_output_trimmed.js @@ -6,7 +6,7 @@ "use strict"; -const TEST_URI = `http://example.com/browser/devtools/client/webconsole/test/mochitest/test-console.html`; +const TEST_URI = `http://example.com/browser/devtools/client/webconsole/test/browser/test-console.html`; const TEST_ITEMS = [ { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_persist.js b/devtools/client/webconsole/test/browser/browser_webconsole_persist.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_persist.js rename to devtools/client/webconsole/test/browser/browser_webconsole_persist.js index 07a2d6abfe90..0b7faa5432e7 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_persist.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_persist.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; registerCleanupFunction(() => { Services.prefs.clearUserPref("devtools.webconsole.persistlog"); diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_primitive_stacktrace.js b/devtools/client/webconsole/test/browser/browser_webconsole_primitive_stacktrace.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_primitive_stacktrace.js rename to devtools/client/webconsole/test/browser/browser_webconsole_primitive_stacktrace.js index 92a3877a477b..bed114821b04 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_primitive_stacktrace.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_primitive_stacktrace.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-primitive-stacktrace.html"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_promise_rejected_object.js b/devtools/client/webconsole/test/browser/browser_webconsole_promise_rejected_object.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_promise_rejected_object.js rename to devtools/client/webconsole/test/browser/browser_webconsole_promise_rejected_object.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_reopen_closed_tab.js b/devtools/client/webconsole/test/browser/browser_webconsole_reopen_closed_tab.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_reopen_closed_tab.js rename to devtools/client/webconsole/test/browser/browser_webconsole_reopen_closed_tab.js index c2e57c763258..ddd57d9b6064 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_reopen_closed_tab.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_reopen_closed_tab.js @@ -10,7 +10,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-reopen-closed-tab.html"; + "test/browser/test-reopen-closed-tab.html"; add_task(async function() { // If we persist log, the test might be successful even if only the first diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_repeat_different_objects.js b/devtools/client/webconsole/test/browser/browser_webconsole_repeat_different_objects.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_repeat_different_objects.js rename to devtools/client/webconsole/test/browser/browser_webconsole_repeat_different_objects.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search.js b/devtools/client/webconsole/test/browser/browser_webconsole_reverse_search.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search.js rename to devtools/client/webconsole/test/browser/browser_webconsole_reverse_search.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_initial_value.js b/devtools/client/webconsole/test/browser/browser_webconsole_reverse_search_initial_value.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_initial_value.js rename to devtools/client/webconsole/test/browser/browser_webconsole_reverse_search_initial_value.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_keyboard_navigation.js b/devtools/client/webconsole/test/browser/browser_webconsole_reverse_search_keyboard_navigation.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_keyboard_navigation.js rename to devtools/client/webconsole/test/browser/browser_webconsole_reverse_search_keyboard_navigation.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_mouse_navigation.js b/devtools/client/webconsole/test/browser/browser_webconsole_reverse_search_mouse_navigation.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_mouse_navigation.js rename to devtools/client/webconsole/test/browser/browser_webconsole_reverse_search_mouse_navigation.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_toggle.js b/devtools/client/webconsole/test/browser/browser_webconsole_reverse_search_toggle.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_reverse_search_toggle.js rename to devtools/client/webconsole/test/browser/browser_webconsole_reverse_search_toggle.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js b/devtools/client/webconsole/test/browser/browser_webconsole_sandbox_update_after_navigation.js similarity index 95% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js rename to devtools/client/webconsole/test/browser/browser_webconsole_sandbox_update_after_navigation.js index 294099e6a781..acb6b7f0106d 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_sandbox_update_after_navigation.js @@ -10,7 +10,7 @@ "use strict"; const BASE_URI = - "browser/devtools/client/webconsole/" + "test/mochitest/test-console.html"; + "browser/devtools/client/webconsole/" + "test/browser/test-console.html"; const TEST_URI1 = "http://example.com/" + BASE_URI; const TEST_URI2 = "http://example.org/" + BASE_URI; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_script_errordoc_urls.js b/devtools/client/webconsole/test/browser/browser_webconsole_script_errordoc_urls.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_script_errordoc_urls.js rename to devtools/client/webconsole/test/browser/browser_webconsole_script_errordoc_urls.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_scroll.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_scroll.js rename to devtools/client/webconsole/test/browser/browser_webconsole_scroll.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_select_all.js b/devtools/client/webconsole/test/browser/browser_webconsole_select_all.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_select_all.js rename to devtools/client/webconsole/test/browser/browser_webconsole_select_all.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_show_subresource_security_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_show_subresource_security_errors.js similarity index 93% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_show_subresource_security_errors.js rename to devtools/client/webconsole/test/browser/browser_webconsole_show_subresource_security_errors.js index e477ae814cfe..a508c4e378b4 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_show_subresource_security_errors.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_show_subresource_security_errors.js @@ -11,7 +11,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console subresource STS " + "warning test"; const TEST_DOC = "https://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-subresource-security-error.html"; + "test/browser/test-subresource-security-error.html"; const SAMPLE_MSG = "specified a header that could not be parsed successfully."; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js b/devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_from_netmonitor.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js rename to devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_from_netmonitor.js index 46a560f05f08..378693e32fd9 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_from_netmonitor.js @@ -13,7 +13,7 @@ const TEST_URI = const TEST_FILE = "test-network-request.html"; const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + TEST_FILE; const NET_PREF = "devtools.webconsole.filter.net"; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js b/devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_in_netmonitor.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js rename to devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_in_netmonitor.js index 23770bb9aab0..9ae218c240f3 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_shows_reqs_in_netmonitor.js @@ -13,7 +13,7 @@ const TEST_URI = const TEST_FILE = "test-network-request.html"; const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + TEST_FILE; const NET_PREF = "devtools.webconsole.filter.net"; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_sidebar_object_expand_when_message_pruned.js b/devtools/client/webconsole/test/browser/browser_webconsole_sidebar_object_expand_when_message_pruned.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_sidebar_object_expand_when_message_pruned.js rename to devtools/client/webconsole/test/browser/browser_webconsole_sidebar_object_expand_when_message_pruned.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_sidebar_scroll.js b/devtools/client/webconsole/test/browser/browser_webconsole_sidebar_scroll.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_sidebar_scroll.js rename to devtools/client/webconsole/test/browser/browser_webconsole_sidebar_scroll.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_css.js b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_css.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_css.js rename to devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_css.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_error.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_error.js rename to devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_error.js index fd31f833b45d..c639db1fdb95 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_error.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_error.js @@ -8,7 +8,7 @@ // Test that a missing source map is reported. const BASE = - "http://example.com/browser/devtools/client/webconsole/" + "test/mochitest/"; + "http://example.com/browser/devtools/client/webconsole/" + "test/browser/"; add_task(async function() { for (const test of [ diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_invalid.js b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_invalid.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_invalid.js rename to devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_invalid.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_nosource.js b/devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_nosource.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_nosource.js rename to devtools/client/webconsole/test/browser/browser_webconsole_sourcemap_nosource.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_split.js b/devtools/client/webconsole/test/browser/browser_webconsole_split.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_split.js rename to devtools/client/webconsole/test/browser/browser_webconsole_split.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_split_close_button.js b/devtools/client/webconsole/test/browser/browser_webconsole_split_close_button.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_split_close_button.js rename to devtools/client/webconsole/test/browser/browser_webconsole_split_close_button.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_split_escape_key.js b/devtools/client/webconsole/test/browser/browser_webconsole_split_escape_key.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_split_escape_key.js rename to devtools/client/webconsole/test/browser/browser_webconsole_split_escape_key.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_split_focus.js b/devtools/client/webconsole/test/browser/browser_webconsole_split_focus.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_split_focus.js rename to devtools/client/webconsole/test/browser/browser_webconsole_split_focus.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_split_persist.js b/devtools/client/webconsole/test/browser/browser_webconsole_split_persist.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_split_persist.js rename to devtools/client/webconsole/test/browser/browser_webconsole_split_persist.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js b/devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_debugger_link.js similarity index 99% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js rename to devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_debugger_link.js index 64753ab0fbd7..6f17ce701644 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_debugger_link.js @@ -18,7 +18,7 @@ PromiseTestUtils.whitelistRejectionsGlobally(/this\.worker is null/); const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/" + + "test/browser/" + "test-stacktrace-location-debugger-link.html"; add_task(async function() { diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_scratchpad_link.js b/devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_scratchpad_link.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_scratchpad_link.js rename to devtools/client/webconsole/test/browser/browser_webconsole_stacktrace_location_scratchpad_link.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_strict_mode_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_strict_mode_errors.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_strict_mode_errors.js rename to devtools/client/webconsole/test/browser/browser_webconsole_strict_mode_errors.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_string.js b/devtools/client/webconsole/test/browser/browser_webconsole_string.js similarity index 96% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_string.js rename to devtools/client/webconsole/test/browser/browser_webconsole_string.js index b9a1124f8780..a74955db3fdd 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_string.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_string.js @@ -7,7 +7,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-console.html"; + "test/browser/test-console.html"; add_task(async function() { const hud = await openNewTabAndConsole(TEST_URI); diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_stubs_console_api.js b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_console_api.js new file mode 100644 index 000000000000..29a1312191d6 --- /dev/null +++ b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_console_api.js @@ -0,0 +1,302 @@ +/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ +/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +const { + STUBS_UPDATE_ENV, + formatPacket, + formatStub, + formatFile, + getStubFilePath, +} = require("devtools/client/webconsole/test/browser/stub-generator-helpers"); + +const TEST_URI = + "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html"; + +add_task(async function() { + const isStubsUpdate = env.get(STUBS_UPDATE_ENV) == "true"; + const filePath = getStubFilePath("consoleApi.js", env); + info(`${isStubsUpdate ? "Update" : "Check"} stubs at ${filePath}`); + + const generatedStubs = await generateConsoleApiStubs(); + + if (isStubsUpdate) { + const serializedStubs = formatFile(generatedStubs, "ConsoleMessage"); + await OS.File.writeAtomic(filePath, serializedStubs); + ok(true, `${filePath} was successfully updated`); + return; + } + + const existingStubs = require(filePath); + is( + generatedStubs.existingStubs.length, + existingStubs.stubPackets.length, + "There's the expected number of stub packets" + ); + + const repoStubFileContent = await OS.File.read(filePath, { + encoding: "utf-8", + }); + is(generatedStubs, repoStubFileContent, "stubs file is up to date"); + + if (generatedStubs != repoStubFileContent) { + ok( + false, + "The consoleApi stubs file needs to be updated by running " + + "`mach test devtools/client/webconsole/test/browser/" + + "browser_webconsole_stubs_console_api.js --headless " + + "--setenv WEBCONSOLE_STUBS_UPDATE=true`" + ); + } +}); + +async function generateConsoleApiStubs() { + const { PREFS } = require("devtools/client/webconsole/constants"); + // Hiding log messages so we don't get unwanted client/server communication. + const { getPrefsService } = require("devtools/client/webconsole/utils/prefs"); + getPrefsService({}).setBoolPref(PREFS.FILTER.LOG, false); + + const stubs = { + preparedMessages: [], + packets: [], + }; + + const toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole"); + + for (const { keys, code } of getCommands()) { + const received = new Promise(resolve => { + let i = 0; + const listener = async res => { + const callKey = keys[i]; + stubs.packets.push(formatPacket(callKey, res)); + stubs.preparedMessages.push(formatStub(callKey, res)); + if (++i === keys.length) { + toolbox.target.activeConsole.off("consoleAPICall", listener); + resolve(); + } + }; + toolbox.target.activeConsole.on("consoleAPICall", listener); + }); + + await ContentTask.spawn(gBrowser.selectedBrowser, code, function(subCode) { + const script = content.document.createElement("script"); + script.append( + content.document.createTextNode(`function triggerPacket() {${subCode}}`) + ); + content.document.body.append(script); + content.wrappedJSObject.triggerPacket(); + script.remove(); + }); + + await received; + } + + Services.prefs.clearUserPref(PREFS.FILTER.LOG); + await closeTabAndToolbox().catch(() => {}); + + return formatFile(stubs, "ConsoleMessage"); +} + +function getCommands() { + const consoleApiCommands = [ + "console.log('foobar', 'test')", + "console.log(undefined)", + "console.warn('danger, will robinson!')", + "console.log(NaN)", + "console.log(null)", + "console.log('\u9f2c')", + "console.clear()", + "console.count('bar')", + "console.assert(false, {message: 'foobar'})", + "console.log('hello \\nfrom \\rthe \\\"string world!')", + "console.log('\xFA\u1E47\u0129\xE7\xF6d\xEA \u021B\u0115\u0219\u0165')", + "console.dirxml(window)", + "console.log('myarray', ['red', 'green', 'blue'])", + "console.log('myregex', /a.b.c/)", + "console.table(['red', 'green', 'blue']);", + "console.log('myobject', {red: 'redValue', green: 'greenValue', blue: 'blueValue'});", + "console.debug('debug message');", + "console.info('info message');", + "console.error('error message');", + ]; + + const consoleApi = consoleApiCommands.map(cmd => ({ + keys: [cmd], + code: cmd, + })); + + consoleApi.push( + { + keys: ["console.log('mymap')"], + code: ` + var map = new Map(); + map.set("key1", "value1"); + map.set("key2", "value2"); + console.log('mymap', map); + `, + }, + { + keys: ["console.log('myset')"], + code: ` + console.log('myset', new Set(["a", "b"])); + `, + }, + { + keys: ["console.trace()"], + code: ` + function testStacktraceFiltering() { + console.trace() + } + function foo() { + testStacktraceFiltering() + } + + foo() + `, + }, + { + keys: ["console.trace('bar', {'foo': 'bar'}, [1,2,3])"], + code: ` + function testStacktraceWithLog() { + console.trace('bar', {'foo': 'bar'}, [1,2,3]) + } + function foo() { + testStacktraceWithLog() + } + + foo() + `, + }, + { + keys: [ + "console.time('bar')", + "timerAlreadyExists", + "console.timeLog('bar') - 1", + "console.timeLog('bar') - 2", + "console.timeEnd('bar')", + "timeEnd.timerDoesntExist", + "timeLog.timerDoesntExist", + ], + code: ` + console.time("bar"); + console.time("bar"); + console.timeLog("bar"); + console.timeLog("bar", "second call", {state: 1}); + console.timeEnd("bar"); + console.timeEnd("bar"); + console.timeLog("bar"); + `, + }, + { + keys: ["console.table('bar')"], + code: ` + console.table('bar'); + `, + }, + { + keys: ["console.table(['a', 'b', 'c'])"], + code: ` + console.table(['a', 'b', 'c']); + `, + }, + { + keys: ["console.group('bar')", "console.groupEnd('bar')"], + code: ` + console.group("bar"); + console.groupEnd(); + `, + }, + { + keys: ["console.groupCollapsed('foo')", "console.groupEnd('foo')"], + code: ` + console.groupCollapsed("foo"); + console.groupEnd(); + `, + }, + { + keys: ["console.group()", "console.groupEnd()"], + code: ` + console.group(); + console.groupEnd(); + `, + }, + { + keys: ["console.log(%cfoobar)"], + code: ` + console.log( + "%cfoo%cbar", + "color:blue; font-size:1.3em; background:url('http://example.com/test'); position:absolute; top:10px; ", + "color:red; line-height: 1.5; background:\\165rl('http://example.com/test')" + ); + `, + }, + { + keys: ['console.log("%cHello%c|%cWorld")'], + code: ` + console.log( + "%cHello%c|%cWorld", + "color:red", + "", + "color: blue" + ); + `, + }, + { + keys: ["console.group(%cfoo%cbar)", "console.groupEnd(%cfoo%cbar)"], + code: ` + console.group( + "%cfoo%cbar", + "color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px", + "color:red;background:\\165rl('http://example.com/test')"); + console.groupEnd(); + `, + }, + { + keys: [ + "console.groupCollapsed(%cfoo%cbaz)", + "console.groupEnd(%cfoo%cbaz)", + ], + code: ` + console.groupCollapsed( + "%cfoo%cbaz", + "color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px", + "color:red;background:\\165rl('http://example.com/test')"); + console.groupEnd(); + `, + }, + { + keys: ["console.dir({C, M, Y, K})"], + code: "console.dir({cyan: 'C', magenta: 'M', yellow: 'Y', black: 'K'});", + }, + { + keys: [ + "console.count | default: 1", + "console.count | default: 2", + "console.count | test counter: 1", + "console.count | test counter: 2", + "console.count | default: 3", + "console.count | clear", + "console.count | default: 4", + "console.count | test counter: 3", + "console.countReset | test counter: 0", + "console.countReset | counterDoesntExist", + ], + code: ` + console.count(); + console.count(); + console.count("test counter"); + console.count("test counter"); + console.count(); + console.clear(); + console.count(); + console.count("test counter"); + console.countReset("test counter"); + console.countReset("test counter"); + `, + } + ); + return consoleApi; +} diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_stubs_css_message.js b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_css_message.js new file mode 100644 index 000000000000..2b21a7e4ff2a --- /dev/null +++ b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_css_message.js @@ -0,0 +1,99 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +const { + STUBS_UPDATE_ENV, + formatPacket, + formatStub, + formatFile, + getStubFilePath, +} = require("devtools/client/webconsole/test/browser/stub-generator-helpers"); +const { prepareMessage } = require("devtools/client/webconsole/utils/messages"); + +const TEST_URI = + "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html"; + +add_task(async function() { + const isStubsUpdate = env.get(STUBS_UPDATE_ENV) == "true"; + const filePath = getStubFilePath("cssMessage.js", env); + info(`${isStubsUpdate ? "Update" : "Check"} stubs at ${filePath}`); + + const generatedStubs = await generateCssMessageStubs(); + + if (isStubsUpdate) { + await OS.File.writeAtomic(filePath, generatedStubs); + ok(true, `${filePath} was successfully updated`); + return; + } + + const repoStubFileContent = await OS.File.read(filePath, { + encoding: "utf-8", + }); + is(generatedStubs, repoStubFileContent, "stubs file is up to date"); + + if (generatedStubs != repoStubFileContent) { + ok( + false, + "The cssMessage stubs file needs to be updated by running " + + "`mach test devtools/client/webconsole/test/browser/" + + "browser_webconsole_stubs_css_message.js --headless " + + "--setenv WEBCONSOLE_STUBS_UPDATE=true`" + ); + } +}); + +async function generateCssMessageStubs() { + const stubs = { + preparedMessages: [], + packets: [], + }; + + const toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole"); + + for (const code of getCommands()) { + const received = new Promise(resolve => { + /* CSS errors are considered as pageError on the server */ + toolbox.target.activeConsole.on("pageError", function onPacket(packet) { + toolbox.target.activeConsole.off("pageError", onPacket); + info( + "Received css message: pageError " + + JSON.stringify(packet, null, "\t") + ); + + const message = prepareMessage(packet, { getNextId: () => 1 }); + stubs.packets.push(formatPacket(message.messageText, packet)); + stubs.preparedMessages.push(formatStub(message.messageText, packet)); + resolve(); + }); + }); + + await ContentTask.spawn(gBrowser.selectedBrowser, code, function(subCode) { + content.docShell.cssErrorReportingEnabled = true; + const style = content.document.createElement("style"); + style.append(content.document.createTextNode(subCode)); + content.document.body.append(style); + }); + + await received; + } + + await closeTabAndToolbox(); + return formatFile(stubs, "ConsoleMessage"); +} + +function getCommands() { + return [ + ` + p { + such-unknown-property: wow; + } + `, + ` + p { + padding-top: invalid value; + } + `, + ]; +} diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_stubs_evaluation_result.js b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_evaluation_result.js new file mode 100644 index 000000000000..92fd806dafaa --- /dev/null +++ b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_evaluation_result.js @@ -0,0 +1,87 @@ +/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ +/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +const { + STUBS_UPDATE_ENV, + formatPacket, + formatStub, + formatFile, + getStubFilePath, +} = require("devtools/client/webconsole/test/browser/stub-generator-helpers"); + +const TEST_URI = "data:text/html;charset=utf-8,stub generation"; + +add_task(async function() { + const isStubsUpdate = env.get(STUBS_UPDATE_ENV) == "true"; + const filePath = getStubFilePath("evaluationResult.js", env); + info(`${isStubsUpdate ? "Update" : "Check"} stubs at ${filePath}`); + + const generatedStubs = await generateEvaluationResultStubs(); + + if (isStubsUpdate) { + await OS.File.writeAtomic(filePath, generatedStubs); + ok(true, `${filePath} was successfully updated`); + return; + } + + const repoStubFileContent = await OS.File.read(filePath, { + encoding: "utf-8", + }); + is(generatedStubs, repoStubFileContent, "stubs file is up to date"); + + if (generatedStubs != repoStubFileContent) { + ok( + false, + "The evaluationResult stubs file needs to be updated by running " + + "`mach test devtools/client/webconsole/test/browser/" + + "browser_webconsole_stubs_evaluation_result.js --headless " + + "--setenv WEBCONSOLE_STUBS_UPDATE=true`" + ); + } +}); + +async function generateEvaluationResultStubs() { + const stubs = { + preparedMessages: [], + packets: [], + }; + + const toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole"); + + for (const [key, code] of getCommands()) { + const packet = await toolbox.target.activeConsole.evaluateJS(code); + + stubs.packets.push(formatPacket(key, packet)); + stubs.preparedMessages.push(formatStub(key, packet)); + } + + await closeTabAndToolbox(); + return formatFile(stubs, "ConsoleMessage"); +} + +function getCommands() { + const evaluationResultCommands = [ + "new Date(0)", + "asdf()", + "1 + @", + "inspect({a: 1})", + "cd(document)", + "undefined", + ]; + + const evaluationResult = new Map( + evaluationResultCommands.map(cmd => [cmd, cmd]) + ); + evaluationResult.set( + "longString message Error", + `throw new Error("Long error ".repeat(10000))` + ); + + evaluationResult.set(`eval throw ""`, `throw ""`); + evaluationResult.set(`eval throw "tomato"`, `throw "tomato"`); + return evaluationResult; +} diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_stubs_network_event.js b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_network_event.js new file mode 100644 index 000000000000..bc0b1abd86bd --- /dev/null +++ b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_network_event.js @@ -0,0 +1,138 @@ +/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ +/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +const { + STUBS_UPDATE_ENV, + formatPacket, + formatNetworkEventStub, + formatFile, + getStubFilePath, +} = require("devtools/client/webconsole/test/browser/stub-generator-helpers"); + +const TEST_URI = + "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-network-event.html"; + +add_task(async function() { + const isStubsUpdate = env.get(STUBS_UPDATE_ENV) == "true"; + const filePath = getStubFilePath("networkEvent.js", env); + info(`${isStubsUpdate ? "Update" : "Check"} stubs at ${filePath}`); + + const generatedStubs = await generateNetworkEventStubs(); + + if (isStubsUpdate) { + await OS.File.writeAtomic(filePath, generatedStubs); + ok(true, `${filePath} was successfully updated`); + return; + } + + const repoStubFileContent = await OS.File.read(filePath, { + encoding: "utf-8", + }); + is(generatedStubs, repoStubFileContent, "stubs file is up to date"); + + if (generatedStubs != repoStubFileContent) { + ok( + false, + "The network event stubs file needs to be updated by running " + + "`mach test devtools/client/webconsole/test/browser/" + + "browser_webconsole_stubs_network_event.js --headless " + + "--setenv WEBCONSOLE_STUBS_UPDATE=true`" + ); + } +}); + +async function generateNetworkEventStubs() { + const stubs = { + preparedMessages: [], + packets: [], + }; + + const toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole"); + const { ui } = toolbox.getCurrentPanel().hud; + + for (const [key, code] of getCommands()) { + const onNetwork = new Promise(resolve => { + toolbox.target.activeConsole.once("networkEvent", function onNetworkEvent( + res + ) { + stubs.packets.push(formatPacket(key, res)); + stubs.preparedMessages.push(formatNetworkEventStub(key, res)); + toolbox.target.activeConsole.off("networkEvent", onNetworkEvent); + resolve(); + }); + }); + + const onNetworkUpdate = new Promise(resolve => { + ui.once("network-message-updated", function onNetworkUpdated(res) { + const updateKey = `${key} update`; + // We cannot ensure the form of the network update packet, some properties + // might be in another order than in the original packet. + // Hand-picking only what we need should prevent this. + const packet = { + networkInfo: { + _type: res.networkInfo._type, + actor: res.networkInfo.actor, + request: res.networkInfo.request, + response: res.networkInfo.response, + totalTime: res.networkInfo.totalTime, + }, + }; + + stubs.packets.push(formatPacket(updateKey, packet)); + stubs.preparedMessages.push(formatNetworkEventStub(updateKey, res)); + resolve(); + }); + }); + + await ContentTask.spawn(gBrowser.selectedBrowser, code, function(subCode) { + console.log("subCode", subCode); + const script = content.document.createElement("script"); + script.append( + content.document.createTextNode(`function triggerPacket() {${subCode}}`) + ); + content.document.body.append(script); + content.wrappedJSObject.triggerPacket(); + script.remove(); + }); + + await Promise.all([onNetwork, onNetworkUpdate]); + } + + await closeTabAndToolbox(); + return formatFile(stubs, "NetworkEventMessage"); +} + +function getCommands() { + const networkEvent = new Map(); + + networkEvent.set( + "GET request", + ` +let i = document.createElement("img"); +i.src = "/inexistent.html"; +` + ); + + networkEvent.set( + "XHR GET request", + ` +const xhr = new XMLHttpRequest(); +xhr.open("GET", "/inexistent.html"); +xhr.send(); +` + ); + + networkEvent.set( + "XHR POST request", + ` +const xhr = new XMLHttpRequest(); +xhr.open("POST", "/inexistent.html"); +xhr.send(); +` + ); + return networkEvent; +} diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_stubs_page_error.js b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_page_error.js new file mode 100644 index 000000000000..decc1bd1a023 --- /dev/null +++ b/devtools/client/webconsole/test/browser/browser_webconsole_stubs_page_error.js @@ -0,0 +1,115 @@ +/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ +/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +const { + STUBS_UPDATE_ENV, + formatPacket, + formatStub, + formatFile, + getStubFilePath, +} = require("devtools/client/webconsole/test/browser/stub-generator-helpers"); + +const TEST_URI = + "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html"; + +add_task(async function() { + const isStubsUpdate = env.get(STUBS_UPDATE_ENV) == "true"; + const filePath = getStubFilePath("pageError.js", env); + info(`${isStubsUpdate ? "Update" : "Check"} stubs at ${filePath}`); + + const generatedStubs = await generatePageErrorStubs(); + + if (isStubsUpdate) { + await OS.File.writeAtomic(filePath, generatedStubs); + ok(true, `${filePath} was successfully updated`); + return; + } + + const repoStubFileContent = await OS.File.read(filePath, { + encoding: "utf-8", + }); + + is(generatedStubs, repoStubFileContent, "stubs file is up to date"); + + if (generatedStubs != repoStubFileContent) { + ok( + false, + "The pageError stubs file needs to be updated by running " + + "`mach test devtools/client/webconsole/test/browser/" + + "browser_webconsole_stubs_page_error.js --headless " + + "--setenv WEBCONSOLE_STUBS_UPDATE=true`" + ); + } +}); + +async function generatePageErrorStubs() { + const stubs = { + preparedMessages: [], + packets: [], + }; + + const toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole"); + + for (const [key, code] of getCommands()) { + const onPageError = toolbox.target.activeConsole.once("pageError"); + + // On e10s, the exception is triggered in child process + // and is ignored by test harness + // expectUncaughtException should be called for each uncaught exception. + if (!Services.appinfo.browserTabsRemoteAutostart) { + expectUncaughtException(); + } + + await ContentTask.spawn(gBrowser.selectedBrowser, code, function(subCode) { + const script = content.document.createElement("script"); + script.append(content.document.createTextNode(subCode)); + content.document.body.append(script); + script.remove(); + }); + + const packet = await onPageError; + stubs.packets.push(formatPacket(key, packet)); + stubs.preparedMessages.push(formatStub(key, packet)); + } + + await closeTabAndToolbox(); + return formatFile(stubs, "ConsoleMessage"); +} + +function getCommands() { + const pageError = new Map(); + + pageError.set( + "ReferenceError: asdf is not defined", + ` + function bar() { + asdf() + } + function foo() { + bar() + } + + foo() +` + ); + + pageError.set( + "SyntaxError: redeclaration of let a", + ` + let a, a; +` + ); + + pageError.set( + "TypeError longString message", + `throw new Error("Long error ".repeat(10000))` + ); + + pageError.set(`throw ""`, `throw ""`); + pageError.set(`throw "tomato"`, `throw "tomato"`); + return pageError; +} diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_filters_changed.js b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_filters_changed.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_filters_changed.js rename to devtools/client/webconsole/test/browser/browser_webconsole_telemetry_filters_changed.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_js_errors.js b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_js_errors.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_js_errors.js rename to devtools/client/webconsole/test/browser/browser_webconsole_telemetry_js_errors.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_jump_to_definition.js b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_jump_to_definition.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_jump_to_definition.js rename to devtools/client/webconsole/test/browser/browser_webconsole_telemetry_jump_to_definition.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_object_expanded.js b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_object_expanded.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_object_expanded.js rename to devtools/client/webconsole/test/browser/browser_webconsole_telemetry_object_expanded.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_persist_toggle_changed.js b/devtools/client/webconsole/test/browser/browser_webconsole_telemetry_persist_toggle_changed.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_telemetry_persist_toggle_changed.js rename to devtools/client/webconsole/test/browser/browser_webconsole_telemetry_persist_toggle_changed.js diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js b/devtools/client/webconsole/test/browser/browser_webconsole_time_methods.js similarity index 98% rename from devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js rename to devtools/client/webconsole/test/browser/browser_webconsole_time_methods.js index c0967c4a4d51..feb555c0f951 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js +++ b/devtools/client/webconsole/test/browser/browser_webconsole_time_methods.js @@ -9,7 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + - "test/mochitest/test-time-methods.html"; + "test/browser/test-time-methods.html"; const TEST_URI2 = "data:text/html;charset=utf-8, + diff --git a/devtools/client/webconsole/test/mochitest/test-csp-violation-frame-ancestor-parent.html^headers^ b/devtools/client/webconsole/test/browser/test-csp-violation-frame-ancestor-parent.html^headers^ similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-csp-violation-frame-ancestor-parent.html^headers^ rename to devtools/client/webconsole/test/browser/test-csp-violation-frame-ancestor-parent.html^headers^ diff --git a/devtools/client/webconsole/test/mochitest/test-csp-violation-inline.html b/devtools/client/webconsole/test/browser/test-csp-violation-inline.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-csp-violation-inline.html rename to devtools/client/webconsole/test/browser/test-csp-violation-inline.html diff --git a/devtools/client/webconsole/test/mochitest/test-csp-violation-inline.html^headers^ b/devtools/client/webconsole/test/browser/test-csp-violation-inline.html^headers^ similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-csp-violation-inline.html^headers^ rename to devtools/client/webconsole/test/browser/test-csp-violation-inline.html^headers^ diff --git a/devtools/client/webconsole/test/mochitest/test-csp-violation.html b/devtools/client/webconsole/test/browser/test-csp-violation.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-csp-violation.html rename to devtools/client/webconsole/test/browser/test-csp-violation.html diff --git a/devtools/client/webconsole/test/mochitest/test-cspro.html b/devtools/client/webconsole/test/browser/test-cspro.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-cspro.html rename to devtools/client/webconsole/test/browser/test-cspro.html diff --git a/devtools/client/webconsole/test/mochitest/test-cspro.html^headers^ b/devtools/client/webconsole/test/browser/test-cspro.html^headers^ similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-cspro.html^headers^ rename to devtools/client/webconsole/test/browser/test-cspro.html^headers^ diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html b/devtools/client/webconsole/test/browser/test-css-message.html similarity index 100% rename from devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html rename to devtools/client/webconsole/test/browser/test-css-message.html diff --git a/devtools/client/webconsole/test/mochitest/test-cu-reporterror.js b/devtools/client/webconsole/test/browser/test-cu-reporterror.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-cu-reporterror.js rename to devtools/client/webconsole/test/browser/test-cu-reporterror.js diff --git a/devtools/client/webconsole/test/mochitest/test-data.json b/devtools/client/webconsole/test/browser/test-data.json similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-data.json rename to devtools/client/webconsole/test/browser/test-data.json diff --git a/devtools/client/webconsole/test/mochitest/test-data.json^headers^ b/devtools/client/webconsole/test/browser/test-data.json^headers^ similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-data.json^headers^ rename to devtools/client/webconsole/test/browser/test-data.json^headers^ diff --git a/devtools/client/webconsole/test/mochitest/test-duplicate-error.html b/devtools/client/webconsole/test/browser/test-duplicate-error.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-duplicate-error.html rename to devtools/client/webconsole/test/browser/test-duplicate-error.html diff --git a/devtools/client/webconsole/test/mochitest/test-dynamic-import.html b/devtools/client/webconsole/test/browser/test-dynamic-import.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-dynamic-import.html rename to devtools/client/webconsole/test/browser/test-dynamic-import.html diff --git a/devtools/client/webconsole/test/mochitest/test-dynamic-import.js b/devtools/client/webconsole/test/browser/test-dynamic-import.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-dynamic-import.js rename to devtools/client/webconsole/test/browser/test-dynamic-import.js diff --git a/devtools/client/webconsole/test/mochitest/test-error-worker.html b/devtools/client/webconsole/test/browser/test-error-worker.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-error-worker.html rename to devtools/client/webconsole/test/browser/test-error-worker.html diff --git a/devtools/client/webconsole/test/mochitest/test-error-worker.js b/devtools/client/webconsole/test/browser/test-error-worker.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-error-worker.js rename to devtools/client/webconsole/test/browser/test-error-worker.js diff --git a/devtools/client/webconsole/test/mochitest/test-error-worker2.js b/devtools/client/webconsole/test/browser/test-error-worker2.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-error-worker2.js rename to devtools/client/webconsole/test/browser/test-error-worker2.js diff --git a/devtools/client/webconsole/test/mochitest/test-error.html b/devtools/client/webconsole/test/browser/test-error.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-error.html rename to devtools/client/webconsole/test/browser/test-error.html diff --git a/devtools/client/webconsole/test/mochitest/test-eval-error.html b/devtools/client/webconsole/test/browser/test-eval-error.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-eval-error.html rename to devtools/client/webconsole/test/browser/test-eval-error.html diff --git a/devtools/client/webconsole/test/mochitest/test-eval-in-stackframe.html b/devtools/client/webconsole/test/browser/test-eval-in-stackframe.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-eval-in-stackframe.html rename to devtools/client/webconsole/test/browser/test-eval-in-stackframe.html diff --git a/devtools/client/webconsole/test/mochitest/test-eval-sources.html b/devtools/client/webconsole/test/browser/test-eval-sources.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-eval-sources.html rename to devtools/client/webconsole/test/browser/test-eval-sources.html diff --git a/devtools/client/webconsole/test/mochitest/test-evaluate-worker.html b/devtools/client/webconsole/test/browser/test-evaluate-worker.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-evaluate-worker.html rename to devtools/client/webconsole/test/browser/test-evaluate-worker.html diff --git a/devtools/client/webconsole/test/mochitest/test-evaluate-worker.js b/devtools/client/webconsole/test/browser/test-evaluate-worker.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-evaluate-worker.js rename to devtools/client/webconsole/test/browser/test-evaluate-worker.js diff --git a/devtools/client/webconsole/test/mochitest/test-external-script-errors.html b/devtools/client/webconsole/test/browser/test-external-script-errors.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-external-script-errors.html rename to devtools/client/webconsole/test/browser/test-external-script-errors.html diff --git a/devtools/client/webconsole/test/mochitest/test-external-script-errors.js b/devtools/client/webconsole/test/browser/test-external-script-errors.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-external-script-errors.js rename to devtools/client/webconsole/test/browser/test-external-script-errors.js diff --git a/devtools/client/webconsole/test/mochitest/test-iframe-child.html b/devtools/client/webconsole/test/browser/test-iframe-child.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-iframe-child.html rename to devtools/client/webconsole/test/browser/test-iframe-child.html diff --git a/devtools/client/webconsole/test/mochitest/test-iframe-insecure-form-action.html b/devtools/client/webconsole/test/browser/test-iframe-insecure-form-action.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-iframe-insecure-form-action.html rename to devtools/client/webconsole/test/browser/test-iframe-insecure-form-action.html diff --git a/devtools/client/webconsole/test/mochitest/test-iframe-parent.html b/devtools/client/webconsole/test/browser/test-iframe-parent.html similarity index 60% rename from devtools/client/webconsole/test/mochitest/test-iframe-parent.html rename to devtools/client/webconsole/test/browser/test-iframe-parent.html index b217ddfeb616..6025dcf24cbb 100644 --- a/devtools/client/webconsole/test/mochitest/test-iframe-parent.html +++ b/devtools/client/webconsole/test/browser/test-iframe-parent.html @@ -8,17 +8,17 @@

test for bug 989025 - iframe parent

- + + document.querySelector("button").addEventListener("click", throwError); + diff --git a/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud-iframe.html b/devtools/client/webconsole/test/browser/test-iframe-wrong-hud-iframe.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud-iframe.html rename to devtools/client/webconsole/test/browser/test-iframe-wrong-hud-iframe.html diff --git a/devtools/client/webconsole/test/browser/test-iframe-wrong-hud.html b/devtools/client/webconsole/test/browser/test-iframe-wrong-hud.html new file mode 100644 index 000000000000..cbb3f26d24d2 --- /dev/null +++ b/devtools/client/webconsole/test/browser/test-iframe-wrong-hud.html @@ -0,0 +1,13 @@ + + + + + WebConsole test: iframe associated to the wrong HUD + + + +

WebConsole test: iframe associated to the wrong HUD.

+ + + diff --git a/devtools/client/webconsole/test/mochitest/test-iframe1.html b/devtools/client/webconsole/test/browser/test-iframe1.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-iframe1.html rename to devtools/client/webconsole/test/browser/test-iframe1.html diff --git a/devtools/client/webconsole/test/mochitest/test-iframe2.html b/devtools/client/webconsole/test/browser/test-iframe2.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-iframe2.html rename to devtools/client/webconsole/test/browser/test-iframe2.html diff --git a/devtools/client/webconsole/test/mochitest/test-iframe3.html b/devtools/client/webconsole/test/browser/test-iframe3.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-iframe3.html rename to devtools/client/webconsole/test/browser/test-iframe3.html diff --git a/devtools/client/webconsole/test/mochitest/test-image.png b/devtools/client/webconsole/test/browser/test-image.png similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-image.png rename to devtools/client/webconsole/test/browser/test-image.png diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning-inner.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html rename to devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning-inner.html diff --git a/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning-nested1.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning-nested1.html new file mode 100644 index 000000000000..2b3b8240b987 --- /dev/null +++ b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning-nested1.html @@ -0,0 +1,13 @@ + + + + + Bug 752559 - print warning to error console when iframe sandbox + is being used ineffectively + + + + + + diff --git a/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning-nested2.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning-nested2.html new file mode 100644 index 000000000000..3545901a2c8a --- /dev/null +++ b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning-nested2.html @@ -0,0 +1,13 @@ + + + + + Bug 752559 - print warning to error console when iframe sandbox + is being used ineffectively + + + + + + diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning0.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning0.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning0.html rename to devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning0.html diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning1.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning1.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning1.html rename to devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning1.html diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning2.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning2.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning2.html rename to devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning2.html diff --git a/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning3.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning3.html new file mode 100644 index 000000000000..0080d5a3d38a --- /dev/null +++ b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning3.html @@ -0,0 +1,13 @@ + + + + + Bug 752559 - print warning to error console when iframe sandbox + is being used ineffectively (allow-scripts, allow-same-origin) + + + + + + diff --git a/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning4.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning4.html new file mode 100644 index 000000000000..4b968a4d755c --- /dev/null +++ b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning4.html @@ -0,0 +1,13 @@ + + + + + Bug 752559 - print warning to error console when iframe sandbox + is being used ineffectively (allow-scripts, allow-same-origin, nested) + + + + + + diff --git a/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning5.html b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning5.html new file mode 100644 index 000000000000..35fe7c16eec8 --- /dev/null +++ b/devtools/client/webconsole/test/browser/test-ineffective-iframe-sandbox-warning5.html @@ -0,0 +1,13 @@ + + + + + Bug 752559 - print warning to error console when iframe sandbox + is being used ineffectively (nested, allow-scripts, allow-same-origin) + + + + + + diff --git a/devtools/client/webconsole/test/browser/test-insecure-frame.html b/devtools/client/webconsole/test/browser/test-insecure-frame.html new file mode 100644 index 000000000000..1f3662d77331 --- /dev/null +++ b/devtools/client/webconsole/test/browser/test-insecure-frame.html @@ -0,0 +1,14 @@ + + + + + + + +

iframe 1

+

This frame is served with an insecure password field.

+ + + diff --git a/devtools/client/webconsole/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html b/devtools/client/webconsole/test/browser/test-insecure-passwords-about-blank-web-console-warning.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html rename to devtools/client/webconsole/test/browser/test-insecure-passwords-about-blank-web-console-warning.html diff --git a/devtools/client/webconsole/test/mochitest/test-insecure-passwords-web-console-warning.html b/devtools/client/webconsole/test/browser/test-insecure-passwords-web-console-warning.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-insecure-passwords-web-console-warning.html rename to devtools/client/webconsole/test/browser/test-insecure-passwords-web-console-warning.html diff --git a/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-frame.html b/devtools/client/webconsole/test/browser/test-inspect-cross-domain-objects-frame.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-frame.html rename to devtools/client/webconsole/test/browser/test-inspect-cross-domain-objects-frame.html diff --git a/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-top.html b/devtools/client/webconsole/test/browser/test-inspect-cross-domain-objects-top.html similarity index 72% rename from devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-top.html rename to devtools/client/webconsole/test/browser/test-inspect-cross-domain-objects-top.html index 109d343de018..f1c8a4fe54ea 100644 --- a/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-top.html +++ b/devtools/client/webconsole/test/browser/test-inspect-cross-domain-objects-top.html @@ -4,11 +4,11 @@ Web Console test for bug 869003 + - http://creativecommons.org/publicdomain/zero/1.0/ -->

Make sure users can inspect objects from cross-domain iframes.

Top window.

- + diff --git a/devtools/client/webconsole/test/mochitest/test-local-session-storage.html b/devtools/client/webconsole/test/browser/test-local-session-storage.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-local-session-storage.html rename to devtools/client/webconsole/test/browser/test-local-session-storage.html diff --git a/devtools/client/webconsole/test/mochitest/test-location-debugger-link-console-log.js b/devtools/client/webconsole/test/browser/test-location-debugger-link-console-log.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-location-debugger-link-console-log.js rename to devtools/client/webconsole/test/browser/test-location-debugger-link-console-log.js diff --git a/devtools/client/webconsole/test/mochitest/test-location-debugger-link-errors.js b/devtools/client/webconsole/test/browser/test-location-debugger-link-errors.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-location-debugger-link-errors.js rename to devtools/client/webconsole/test/browser/test-location-debugger-link-errors.js diff --git a/devtools/client/webconsole/test/mochitest/test-location-debugger-link.html b/devtools/client/webconsole/test/browser/test-location-debugger-link.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-location-debugger-link.html rename to devtools/client/webconsole/test/browser/test-location-debugger-link.html diff --git a/devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-1.css b/devtools/client/webconsole/test/browser/test-location-styleeditor-link-1.css similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-1.css rename to devtools/client/webconsole/test/browser/test-location-styleeditor-link-1.css diff --git a/devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-2.css b/devtools/client/webconsole/test/browser/test-location-styleeditor-link-2.css similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-2.css rename to devtools/client/webconsole/test/browser/test-location-styleeditor-link-2.css diff --git a/devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-minified.css b/devtools/client/webconsole/test/browser/test-location-styleeditor-link-minified.css similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-minified.css rename to devtools/client/webconsole/test/browser/test-location-styleeditor-link-minified.css diff --git a/devtools/client/webconsole/test/mochitest/test-location-styleeditor-link.html b/devtools/client/webconsole/test/browser/test-location-styleeditor-link.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-location-styleeditor-link.html rename to devtools/client/webconsole/test/browser/test-location-styleeditor-link.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.html b/devtools/client/webconsole/test/browser/test-message-categories-canvas-css.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.html rename to devtools/client/webconsole/test/browser/test-message-categories-canvas-css.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.js b/devtools/client/webconsole/test/browser/test-message-categories-canvas-css.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.js rename to devtools/client/webconsole/test/browser/test-message-categories-canvas-css.js diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css b/devtools/client/webconsole/test/browser/test-message-categories-css-loader.css similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css rename to devtools/client/webconsole/test/browser/test-message-categories-css-loader.css diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css^headers^ b/devtools/client/webconsole/test/browser/test-message-categories-css-loader.css^headers^ similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css^headers^ rename to devtools/client/webconsole/test/browser/test-message-categories-css-loader.css^headers^ diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.html b/devtools/client/webconsole/test/browser/test-message-categories-css-loader.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.html rename to devtools/client/webconsole/test/browser/test-message-categories-css-loader.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.css b/devtools/client/webconsole/test/browser/test-message-categories-css-parser.css similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.css rename to devtools/client/webconsole/test/browser/test-message-categories-css-parser.css diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.html b/devtools/client/webconsole/test/browser/test-message-categories-css-parser.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.html rename to devtools/client/webconsole/test/browser/test-message-categories-css-parser.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.html b/devtools/client/webconsole/test/browser/test-message-categories-empty-getelementbyid.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.html rename to devtools/client/webconsole/test/browser/test-message-categories-empty-getelementbyid.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.js b/devtools/client/webconsole/test/browser/test-message-categories-empty-getelementbyid.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.js rename to devtools/client/webconsole/test/browser/test-message-categories-empty-getelementbyid.js diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-html.html b/devtools/client/webconsole/test/browser/test-message-categories-html.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-html.html rename to devtools/client/webconsole/test/browser/test-message-categories-html.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-image.html b/devtools/client/webconsole/test/browser/test-message-categories-image.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-image.html rename to devtools/client/webconsole/test/browser/test-message-categories-image.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-image.jpg b/devtools/client/webconsole/test/browser/test-message-categories-image.jpg similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-image.jpg rename to devtools/client/webconsole/test/browser/test-message-categories-image.jpg diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-imagemap.html b/devtools/client/webconsole/test/browser/test-message-categories-imagemap.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-imagemap.html rename to devtools/client/webconsole/test/browser/test-message-categories-imagemap.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.html b/devtools/client/webconsole/test/browser/test-message-categories-malformedxml-external.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.html rename to devtools/client/webconsole/test/browser/test-message-categories-malformedxml-external.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.xml b/devtools/client/webconsole/test/browser/test-message-categories-malformedxml-external.xml similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.xml rename to devtools/client/webconsole/test/browser/test-message-categories-malformedxml-external.xml diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml.xhtml b/devtools/client/webconsole/test/browser/test-message-categories-malformedxml.xhtml similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml.xhtml rename to devtools/client/webconsole/test/browser/test-message-categories-malformedxml.xhtml diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-svg.xhtml b/devtools/client/webconsole/test/browser/test-message-categories-svg.xhtml similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-svg.xhtml rename to devtools/client/webconsole/test/browser/test-message-categories-svg.xhtml diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-workers.html b/devtools/client/webconsole/test/browser/test-message-categories-workers.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-workers.html rename to devtools/client/webconsole/test/browser/test-message-categories-workers.html diff --git a/devtools/client/webconsole/test/mochitest/test-message-categories-workers.js b/devtools/client/webconsole/test/browser/test-message-categories-workers.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-message-categories-workers.js rename to devtools/client/webconsole/test/browser/test-message-categories-workers.js diff --git a/devtools/client/webconsole/test/mochitest/test-mixedcontent-securityerrors.html b/devtools/client/webconsole/test/browser/test-mixedcontent-securityerrors.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-mixedcontent-securityerrors.html rename to devtools/client/webconsole/test/browser/test-mixedcontent-securityerrors.html diff --git a/devtools/client/webconsole/test/mochitest/test-navigate-to-parse-error.html b/devtools/client/webconsole/test/browser/test-navigate-to-parse-error.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-navigate-to-parse-error.html rename to devtools/client/webconsole/test/browser/test-navigate-to-parse-error.html diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html b/devtools/client/webconsole/test/browser/test-network-event.html similarity index 100% rename from devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html rename to devtools/client/webconsole/test/browser/test-network-event.html diff --git a/devtools/client/webconsole/test/mochitest/test-network-exceptions.html b/devtools/client/webconsole/test/browser/test-network-exceptions.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-network-exceptions.html rename to devtools/client/webconsole/test/browser/test-network-exceptions.html diff --git a/devtools/client/webconsole/test/mochitest/test-network-request.html b/devtools/client/webconsole/test/browser/test-network-request.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-network-request.html rename to devtools/client/webconsole/test/browser/test-network-request.html diff --git a/devtools/client/webconsole/test/mochitest/test-network.html b/devtools/client/webconsole/test/browser/test-network.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-network.html rename to devtools/client/webconsole/test/browser/test-network.html diff --git a/devtools/client/webconsole/test/browser/test-non-javascript-mime-worker.html b/devtools/client/webconsole/test/browser/test-non-javascript-mime-worker.html new file mode 100644 index 000000000000..beed438a2f76 --- /dev/null +++ b/devtools/client/webconsole/test/browser/test-non-javascript-mime-worker.html @@ -0,0 +1,25 @@ + + + + + Web Console test for script with non-JavaScript MIME type + + + + +

Web Console test for Worker and importScripts() inside Worker with non-JavaScript MIME type.

+ + diff --git a/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.html b/devtools/client/webconsole/test/browser/test-non-javascript-mime.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-non-javascript-mime.html rename to devtools/client/webconsole/test/browser/test-non-javascript-mime.html diff --git a/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js b/devtools/client/webconsole/test/browser/test-non-javascript-mime.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js rename to devtools/client/webconsole/test/browser/test-non-javascript-mime.js diff --git a/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js^headers^ b/devtools/client/webconsole/test/browser/test-non-javascript-mime.js^headers^ similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js^headers^ rename to devtools/client/webconsole/test/browser/test-non-javascript-mime.js^headers^ diff --git a/devtools/client/webconsole/test/mochitest/test-primitive-stacktrace.html b/devtools/client/webconsole/test/browser/test-primitive-stacktrace.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-primitive-stacktrace.html rename to devtools/client/webconsole/test/browser/test-primitive-stacktrace.html diff --git a/devtools/client/webconsole/test/mochitest/test-reopen-closed-tab.html b/devtools/client/webconsole/test/browser/test-reopen-closed-tab.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-reopen-closed-tab.html rename to devtools/client/webconsole/test/browser/test-reopen-closed-tab.html diff --git a/devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.html b/devtools/client/webconsole/test/browser/test-sourcemap-error-01.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.html rename to devtools/client/webconsole/test/browser/test-sourcemap-error-01.html diff --git a/devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.js b/devtools/client/webconsole/test/browser/test-sourcemap-error-01.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.js rename to devtools/client/webconsole/test/browser/test-sourcemap-error-01.js diff --git a/devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.html b/devtools/client/webconsole/test/browser/test-sourcemap-error-02.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.html rename to devtools/client/webconsole/test/browser/test-sourcemap-error-02.html diff --git a/devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.js b/devtools/client/webconsole/test/browser/test-sourcemap-error-02.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.js rename to devtools/client/webconsole/test/browser/test-sourcemap-error-02.js diff --git a/devtools/client/webconsole/test/mochitest/test-stacktrace-location-debugger-link.html b/devtools/client/webconsole/test/browser/test-stacktrace-location-debugger-link.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-stacktrace-location-debugger-link.html rename to devtools/client/webconsole/test/browser/test-stacktrace-location-debugger-link.html diff --git a/devtools/client/webconsole/test/mochitest/test-subresource-security-error.html b/devtools/client/webconsole/test/browser/test-subresource-security-error.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-subresource-security-error.html rename to devtools/client/webconsole/test/browser/test-subresource-security-error.html diff --git a/devtools/client/webconsole/test/mochitest/test-subresource-security-error.js b/devtools/client/webconsole/test/browser/test-subresource-security-error.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-subresource-security-error.js rename to devtools/client/webconsole/test/browser/test-subresource-security-error.js diff --git a/devtools/client/webconsole/test/mochitest/test-subresource-security-error.js^headers^ b/devtools/client/webconsole/test/browser/test-subresource-security-error.js^headers^ similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-subresource-security-error.js^headers^ rename to devtools/client/webconsole/test/browser/test-subresource-security-error.js^headers^ diff --git a/devtools/client/webconsole/test/mochitest/test-time-methods.html b/devtools/client/webconsole/test/browser/test-time-methods.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-time-methods.html rename to devtools/client/webconsole/test/browser/test-time-methods.html diff --git a/devtools/client/webconsole/test/mochitest/test-trackingprotection-securityerrors.html b/devtools/client/webconsole/test/browser/test-trackingprotection-securityerrors.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-trackingprotection-securityerrors.html rename to devtools/client/webconsole/test/browser/test-trackingprotection-securityerrors.html diff --git a/devtools/client/webconsole/test/mochitest/test-warning-groups.html b/devtools/client/webconsole/test/browser/test-warning-groups.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-warning-groups.html rename to devtools/client/webconsole/test/browser/test-warning-groups.html diff --git a/devtools/client/webconsole/test/mochitest/test-webconsole-error-observer.html b/devtools/client/webconsole/test/browser/test-webconsole-error-observer.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-webconsole-error-observer.html rename to devtools/client/webconsole/test/browser/test-webconsole-error-observer.html diff --git a/devtools/client/webconsole/test/mochitest/test-websocket.html b/devtools/client/webconsole/test/browser/test-websocket.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-websocket.html rename to devtools/client/webconsole/test/browser/test-websocket.html diff --git a/devtools/client/webconsole/test/mochitest/test-websocket.js b/devtools/client/webconsole/test/browser/test-websocket.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/test-websocket.js rename to devtools/client/webconsole/test/browser/test-websocket.js diff --git a/devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html b/devtools/client/webconsole/test/browser/test_console_csp_ignore_reflected_xss_message.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html rename to devtools/client/webconsole/test/browser/test_console_csp_ignore_reflected_xss_message.html diff --git a/devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html^headers^ b/devtools/client/webconsole/test/browser/test_console_csp_ignore_reflected_xss_message.html^headers^ similarity index 100% rename from devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html^headers^ rename to devtools/client/webconsole/test/browser/test_console_csp_ignore_reflected_xss_message.html^headers^ diff --git a/devtools/client/webconsole/test/mochitest/test_hpkp-invalid-headers.sjs b/devtools/client/webconsole/test/browser/test_hpkp-invalid-headers.sjs similarity index 100% rename from devtools/client/webconsole/test/mochitest/test_hpkp-invalid-headers.sjs rename to devtools/client/webconsole/test/browser/test_hpkp-invalid-headers.sjs diff --git a/devtools/client/webconsole/test/mochitest/test_hsts-invalid-headers.sjs b/devtools/client/webconsole/test/browser/test_hsts-invalid-headers.sjs similarity index 100% rename from devtools/client/webconsole/test/mochitest/test_hsts-invalid-headers.sjs rename to devtools/client/webconsole/test/browser/test_hsts-invalid-headers.sjs diff --git a/devtools/client/webconsole/test/mochitest/test_jsterm_screenshot_command.html b/devtools/client/webconsole/test/browser/test_jsterm_screenshot_command.html similarity index 100% rename from devtools/client/webconsole/test/mochitest/test_jsterm_screenshot_command.html rename to devtools/client/webconsole/test/browser/test_jsterm_screenshot_command.html diff --git a/devtools/client/webconsole/test/mochitest/testscript.js b/devtools/client/webconsole/test/browser/testscript.js similarity index 100% rename from devtools/client/webconsole/test/mochitest/testscript.js rename to devtools/client/webconsole/test/browser/testscript.js diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser.ini b/devtools/client/webconsole/test/fixtures/stub-generators/browser.ini deleted file mode 100644 index 0e0198646233..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser.ini +++ /dev/null @@ -1,28 +0,0 @@ -[DEFAULT] -tags = devtools -subsuite = devtools -support-files = - head.js - !/devtools/client/shared/test/shared-head.js - !/devtools/client/shared/test/telemetry-test-helpers.js - ../stubs/* - test-console-api.html - test-css-message.html - test-network-event.html - -[browser_webconsole_check_stubs_console_api.js] -[browser_webconsole_check_stubs_css_message.js] -[browser_webconsole_check_stubs_evaluation_result.js] -[browser_webconsole_check_stubs_network_event.js] -[browser_webconsole_check_stubs_page_error.js] -skip-if = (os == 'win' && os_version == '10.0' && bits == 64 && ccov) #Bug 1559605 -[browser_webconsole_update_stubs_console_api.js] -skip-if=true # This is only used to update stubs. It is not an actual test. -[browser_webconsole_update_stubs_css_message.js] -skip-if=true # This is only used to update stubs. It is not an actual test. -[browser_webconsole_update_stubs_evaluation_result.js] -skip-if=true # This is only used to update stubs. It is not an actual test. -[browser_webconsole_update_stubs_network_event.js] -skip-if=true # This is only used to update stubs. It is not an actual test. -[browser_webconsole_update_stubs_page_error.js] -skip-if=true # This is only used to update stubs. It is not an actual test. diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js deleted file mode 100644 index 8c874eadb814..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const generatedStubs = await generateConsoleApiStubs(); - - const repoStubFilePath = getTestFilePath("../stubs/consoleApi.js"); - const repoStubFileContent = await OS.File.read(repoStubFilePath, { - encoding: "utf-8", - }); - - if (generatedStubs != repoStubFileContent) { - ok( - false, - "The consoleApi stubs file needs to be updated by running " + - "`mach test devtools/client/webconsole/test/fixtures/" + - "stub-generators/browser_webconsole_update_stubs_console_api.js`" - ); - } else { - ok(true, "The consoleApi stubs file is up to date"); - } -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js deleted file mode 100644 index 3c6630634201..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const generatedStubs = await generateCssMessageStubs(); - - const repoStubFilePath = getTestFilePath("../stubs/cssMessage.js"); - const repoStubFileContent = await OS.File.read(repoStubFilePath, { - encoding: "utf-8", - }); - - if (generatedStubs != repoStubFileContent) { - ok( - false, - "The cssMessage stubs file needs to be updated by running " + - "`mach test devtools/client/webconsole/test/fixtures/" + - "stub-generators/browser_webconsole_update_stubs_css_message.js`" - ); - } else { - ok(true, "The cssMessage stubs file is up to date"); - } -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js deleted file mode 100644 index 5a37994c7295..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const generatedStubs = await generateEvaluationResultStubs(); - - const repoStubFilePath = getTestFilePath("../stubs/evaluationResult.js"); - const repoStubFileContent = await OS.File.read(repoStubFilePath, { - encoding: "utf-8", - }); - - if (generatedStubs != repoStubFileContent) { - ok( - false, - "The evaluationResult stubs file needs to be updated by running " + - "`mach test devtools/client/webconsole/test/fixtures/" + - "stub-generators/browser_webconsole_update_stubs_evaluation_result.js`" - ); - } else { - ok(true, "The evaluationResult stubs file is up to date"); - } -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js deleted file mode 100644 index 4756534f40b4..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const generatedStubs = await generateNetworkEventStubs(); - - const repoStubFilePath = getTestFilePath("../stubs/networkEvent.js"); - const repoStubFileContent = await OS.File.read(repoStubFilePath, { - encoding: "utf-8", - }); - - is( - generatedStubs, - repoStubFileContent, - "Generated stub has the expected content" - ); - if (generatedStubs != repoStubFileContent) { - ok( - false, - "The networkEvent stubs file needs to be updated by running " + - "`mach test devtools/client/webconsole/test/fixtures/" + - "stub-generators/browser_webconsole_update_stubs_network_event.js`" - ); - } else { - ok(true, "The networkEvent stubs file is up to date"); - } -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js deleted file mode 100644 index f2b1f788a6f9..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const generatedStubs = await generatePageErrorStubs(); - - const repoStubFilePath = getTestFilePath("../stubs/pageError.js"); - const repoStubFileContent = await OS.File.read(repoStubFilePath, { - encoding: "utf-8", - }); - - if (generatedStubs != repoStubFileContent) { - ok( - false, - "The pageError stubs file needs to be updated by running " + - "`mach test devtools/client/webconsole/test/fixtures/" + - "stub-generators/browser_webconsole_update_stubs_page_error.js`" - ); - } else { - ok(true, "The pageError stubs file is up to date"); - } -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js deleted file mode 100644 index dc50616ae192..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const fileContent = await generateConsoleApiStubs(); - const filePath = OS.Path.join(`${BASE_PATH}/stubs`, "consoleApi.js"); - await OS.File.writeAtomic(filePath, fileContent); - ok(true, "Make the test not fail"); -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js deleted file mode 100644 index 0159f8591662..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js +++ /dev/null @@ -1,11 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const fileContent = await generateCssMessageStubs(); - const filePath = OS.Path.join(`${BASE_PATH}/stubs`, "cssMessage.js"); - await OS.File.writeAtomic(filePath, fileContent); - ok(true, "Make the test not fail"); -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js deleted file mode 100644 index f73b5259c5f2..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const fileContent = await generateEvaluationResultStubs(); - const filePath = OS.Path.join(`${BASE_PATH}/stubs`, "evaluationResult.js"); - await OS.File.writeAtomic(filePath, fileContent); - ok(true, "Make the test not fail"); -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js deleted file mode 100644 index 9a840433d7e6..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const fileContent = await generateNetworkEventStubs(); - const filePath = OS.Path.join(`${BASE_PATH}/stubs/networkEvent.js`); - await OS.File.writeAtomic(filePath, fileContent); - ok(true, "Make the test not fail"); -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js deleted file mode 100644 index 1ea7568fd556..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -add_task(async function() { - const fileContent = await generatePageErrorStubs(); - const filePath = OS.Path.join(`${BASE_PATH}/stubs`, "pageError.js"); - await OS.File.writeAtomic(filePath, fileContent); - ok(true, "Make the test not fail"); -}); diff --git a/devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js b/devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js deleted file mode 100644 index 59d8e669c24a..000000000000 --- a/devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js +++ /dev/null @@ -1,326 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -// Console API - -const consoleApiCommands = [ - "console.log('foobar', 'test')", - "console.log(undefined)", - "console.warn('danger, will robinson!')", - "console.log(NaN)", - "console.log(null)", - "console.log('\u9f2c')", - "console.clear()", - "console.count('bar')", - "console.assert(false, {message: 'foobar'})", - "console.log('hello \\nfrom \\rthe \\\"string world!')", - "console.log('\xFA\u1E47\u0129\xE7\xF6d\xEA \u021B\u0115\u0219\u0165')", - "console.dirxml(window)", - "console.log('myarray', ['red', 'green', 'blue'])", - "console.log('myregex', /a.b.c/)", - "console.table(['red', 'green', 'blue']);", - "console.log('myobject', {red: 'redValue', green: 'greenValue', blue: 'blueValue'});", - "console.debug('debug message');", - "console.info('info message');", - "console.error('error message');", -]; - -const consoleApi = new Map( - consoleApiCommands.map(cmd => [cmd, { keys: [cmd], code: cmd }]) -); - -consoleApi.set("console.log('mymap')", { - keys: ["console.log('mymap')"], - code: ` -var map = new Map(); -map.set("key1", "value1"); -map.set("key2", "value2"); -console.log('mymap', map); -`, -}); - -consoleApi.set("console.log('myset')", { - keys: ["console.log('myset')"], - code: ` -console.log('myset', new Set(["a", "b"])); -`, -}); - -consoleApi.set("console.trace()", { - keys: ["console.trace()"], - code: ` -function testStacktraceFiltering() { - console.trace() -} -function foo() { - testStacktraceFiltering() -} - -foo() -`, -}); - -consoleApi.set("console.trace('bar', {'foo': 'bar'}, [1,2,3])", { - keys: ["console.trace('bar', {'foo': 'bar'}, [1,2,3])"], - code: ` -function testStacktraceWithLog() { - console.trace('bar', {'foo': 'bar'}, [1,2,3]) -} -function foo() { - testStacktraceWithLog() -} - -foo() -`, -}); - -consoleApi.set("console.time('bar')", { - keys: [ - "console.time('bar')", - "timerAlreadyExists", - "console.timeLog('bar') - 1", - "console.timeLog('bar') - 2", - "console.timeEnd('bar')", - "timeEnd.timerDoesntExist", - "timeLog.timerDoesntExist", - ], - code: ` -console.time("bar"); -console.time("bar"); -console.timeLog("bar"); -console.timeLog("bar", "second call", {state: 1}); -console.timeEnd("bar"); -console.timeEnd("bar"); -console.timeLog("bar"); -`, -}); - -consoleApi.set("console.table('bar')", { - keys: ["console.table('bar')"], - code: ` -console.table('bar'); -`, -}); - -consoleApi.set("console.table(['a', 'b', 'c'])", { - keys: ["console.table(['a', 'b', 'c'])"], - code: ` -console.table(['a', 'b', 'c']); -`, -}); - -consoleApi.set("console.group('bar')", { - keys: ["console.group('bar')", "console.groupEnd('bar')"], - code: ` -console.group("bar"); -console.groupEnd(); -`, -}); - -consoleApi.set("console.groupCollapsed('foo')", { - keys: ["console.groupCollapsed('foo')", "console.groupEnd('foo')"], - code: ` -console.groupCollapsed("foo"); -console.groupEnd(); -`, -}); - -consoleApi.set("console.group()", { - keys: ["console.group()", "console.groupEnd()"], - code: ` -console.group(); -console.groupEnd(); -`, -}); - -consoleApi.set("console.log(%cfoobar)", { - keys: ["console.log(%cfoobar)"], - code: ` -console.log( - "%cfoo%cbar", - "color:blue; font-size:1.3em; background:url('http://example.com/test'); position:absolute; top:10px; ", - "color:red; line-height: 1.5; background:\\165rl('http://example.com/test')" -); -`, -}); - -consoleApi.set('console.log("%cHello%c|%cWorld")', { - keys: ['console.log("%cHello%c|%cWorld")'], - code: ` - console.log( - "%cHello%c|%cWorld", - "color:red", - "", - "color: blue" - ); -`, -}); - -consoleApi.set("console.group(%cfoo%cbar)", { - keys: ["console.group(%cfoo%cbar)", "console.groupEnd(%cfoo%cbar)"], - code: ` -console.group( - "%cfoo%cbar", - "color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px", - "color:red;background:\\165rl('http://example.com/test')"); -console.groupEnd(); -`, -}); - -consoleApi.set("console.groupCollapsed(%cfoo%cbaz)", { - keys: ["console.groupCollapsed(%cfoo%cbaz)", "console.groupEnd(%cfoo%cbaz)"], - code: ` -console.groupCollapsed( - "%cfoo%cbaz", - "color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px", - "color:red;background:\\165rl('http://example.com/test')"); -console.groupEnd(); -`, -}); - -consoleApi.set("console.dir({C, M, Y, K})", { - keys: ["console.dir({C, M, Y, K})"], - code: "console.dir({cyan: 'C', magenta: 'M', yellow: 'Y', black: 'K'});", -}); - -consoleApi.set("console.count", { - keys: [ - "console.count | default: 1", - "console.count | default: 2", - "console.count | test counter: 1", - "console.count | test counter: 2", - "console.count | default: 3", - "console.count | clear", - "console.count | default: 4", - "console.count | test counter: 3", - "console.countReset | test counter: 0", - "console.countReset | counterDoesntExist", - ], - code: ` - console.count(); - console.count(); - console.count("test counter"); - console.count("test counter"); - console.count(); - console.clear(); - console.count(); - console.count("test counter"); - console.countReset("test counter"); - console.countReset("test counter"); -`, -}); - -// CSS messages -const cssMessage = new Map(); - -cssMessage.set( - "Unknown property", - ` -p { - such-unknown-property: wow; -} -` -); - -cssMessage.set( - "Invalid property value", - ` -p { - padding-top: invalid value; -} -` -); - -// Evaluation Result -const evaluationResultCommands = [ - "new Date(0)", - "asdf()", - "1 + @", - "inspect({a: 1})", - "cd(document)", - "undefined", -]; - -const evaluationResult = new Map( - evaluationResultCommands.map(cmd => [cmd, cmd]) -); -evaluationResult.set( - "longString message Error", - `throw new Error("Long error ".repeat(10000))` -); - -evaluationResult.set(`eval throw ""`, `throw ""`); -evaluationResult.set(`eval throw "tomato"`, `throw "tomato"`); - -// Network Event - -const networkEvent = new Map(); - -networkEvent.set("GET request", { - keys: ["GET request"], - code: ` -let i = document.createElement("img"); -i.src = "inexistent.html"; -`, -}); - -networkEvent.set("XHR GET request", { - keys: ["XHR GET request"], - code: ` -const xhr = new XMLHttpRequest(); -xhr.open("GET", "inexistent.html"); -xhr.send(); -`, -}); - -networkEvent.set("XHR POST request", { - keys: ["XHR POST request"], - code: ` -const xhr = new XMLHttpRequest(); -xhr.open("POST", "inexistent.html"); -xhr.send(); -`, -}); - -// Page Error - -const pageError = new Map(); - -pageError.set( - "ReferenceError: asdf is not defined", - ` - function bar() { - asdf() - } - function foo() { - bar() - } - - foo() -` -); - -pageError.set( - "SyntaxError: redeclaration of let a", - ` - let a, a; -` -); - -pageError.set( - "TypeError longString message", - `throw new Error("Long error ".repeat(10000))` -); - -pageError.set(`throw ""`, `throw ""`); -pageError.set(`throw "tomato"`, `throw "tomato"`); - -module.exports = { - consoleApi, - cssMessage, - evaluationResult, - networkEvent, - pageError, -}; diff --git a/devtools/client/webconsole/test/mochitest/test-csp-violation-frame-ancestor-parent.html b/devtools/client/webconsole/test/mochitest/test-csp-violation-frame-ancestor-parent.html deleted file mode 100644 index a0c9afbd5532..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-csp-violation-frame-ancestor-parent.html +++ /dev/null @@ -1,21 +0,0 @@ - - - CSP frame-ancestors Violation Test - - - - - - - diff --git a/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud.html b/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud.html deleted file mode 100644 index 6a02ea351faa..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - WebConsole test: iframe associated to the wrong HUD - - - -

WebConsole test: iframe associated to the wrong HUD.

- - - diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html deleted file mode 100644 index 30f9140133a6..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Bug 752559 - print warning to error console when iframe sandbox - is being used ineffectively - - - - - - diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html deleted file mode 100644 index b42548e57b83..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Bug 752559 - print warning to error console when iframe sandbox - is being used ineffectively - - - - - - diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning3.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning3.html deleted file mode 100644 index 193709d988de..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning3.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Bug 752559 - print warning to error console when iframe sandbox - is being used ineffectively (allow-scripts, allow-same-origin) - - - - - - diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning4.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning4.html deleted file mode 100644 index ec84184cb8a2..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning4.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Bug 752559 - print warning to error console when iframe sandbox - is being used ineffectively (allow-scripts, allow-same-origin, nested) - - - - - - diff --git a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning5.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning5.html deleted file mode 100644 index a923a163e5f0..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning5.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Bug 752559 - print warning to error console when iframe sandbox - is being used ineffectively (nested, allow-scripts, allow-same-origin) - - - - - - diff --git a/devtools/client/webconsole/test/mochitest/test-insecure-frame.html b/devtools/client/webconsole/test/mochitest/test-insecure-frame.html deleted file mode 100644 index 23281caeb366..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-insecure-frame.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - -

iframe 1

-

This frame is served with an insecure password field.

- - - diff --git a/devtools/client/webconsole/test/mochitest/test-non-javascript-mime-worker.html b/devtools/client/webconsole/test/mochitest/test-non-javascript-mime-worker.html deleted file mode 100644 index 01a2f22a6c39..000000000000 --- a/devtools/client/webconsole/test/mochitest/test-non-javascript-mime-worker.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Web Console test for script with non-JavaScript MIME type - - - - -

Web Console test for Worker and importScripts() inside Worker with non-JavaScript MIME type.

- - diff --git a/devtools/client/webconsole/test/moz.build b/devtools/client/webconsole/test/moz.build index e91e7e245232..abc68fb8b237 100644 --- a/devtools/client/webconsole/test/moz.build +++ b/devtools/client/webconsole/test/moz.build @@ -4,12 +4,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. BROWSER_CHROME_MANIFESTS += [ - 'fixtures/stub-generators/browser.ini', - 'mochitest/browser.ini', + 'browser/browser.ini', ] DIRS += [ - 'fixtures' + 'node', + 'browser' ] MOCHITEST_CHROME_MANIFESTS += [ @@ -17,5 +17,5 @@ MOCHITEST_CHROME_MANIFESTS += [ ] XPCSHELL_TESTS_MANIFESTS += [ - 'unit/xpcshell.ini' + 'xpcshell/xpcshell.ini' ] diff --git a/devtools/client/webconsole/test/.eslintrc.mocha.js b/devtools/client/webconsole/test/node/.eslintrc.mocha.js similarity index 100% rename from devtools/client/webconsole/test/.eslintrc.mocha.js rename to devtools/client/webconsole/test/node/.eslintrc.mocha.js diff --git a/devtools/client/webconsole/test/components/.eslintrc.js b/devtools/client/webconsole/test/node/components/.eslintrc.js similarity index 100% rename from devtools/client/webconsole/test/components/.eslintrc.js rename to devtools/client/webconsole/test/node/components/.eslintrc.js diff --git a/devtools/client/webconsole/test/components/console-api-call.log-messages.test.js b/devtools/client/webconsole/test/node/components/console-api-call.log-messages.test.js similarity index 98% rename from devtools/client/webconsole/test/components/console-api-call.log-messages.test.js rename to devtools/client/webconsole/test/node/components/console-api-call.log-messages.test.js index cd0a3020d952..ac72b62f1e62 100644 --- a/devtools/client/webconsole/test/components/console-api-call.log-messages.test.js +++ b/devtools/client/webconsole/test/node/components/console-api-call.log-messages.test.js @@ -8,7 +8,7 @@ const { render } = require("enzyme"); // React const { createFactory } = require("devtools/client/shared/vendor/react"); -const { setupStore } = require("devtools/client/webconsole/test/helpers"); +const { setupStore } = require("devtools/client/webconsole/test/node/helpers"); const Provider = createFactory(require("react-redux").Provider); // Components under test. @@ -17,7 +17,7 @@ const ConsoleApiCall = createFactory( ); const { prepareMessage } = require("devtools/client/webconsole/utils/messages"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); describe("ConsoleAPICall component:", () => { describe("Services.console.logStringMessage", () => { diff --git a/devtools/client/webconsole/test/components/console-api-call.test.js b/devtools/client/webconsole/test/node/components/console-api-call.test.js similarity index 99% rename from devtools/client/webconsole/test/components/console-api-call.test.js rename to devtools/client/webconsole/test/node/components/console-api-call.test.js index 3e14d74bbb6e..16bdce6f4529 100644 --- a/devtools/client/webconsole/test/components/console-api-call.test.js +++ b/devtools/client/webconsole/test/node/components/console-api-call.test.js @@ -10,7 +10,7 @@ const sinon = require("sinon"); // React const { createFactory } = require("devtools/client/shared/vendor/react"); const Provider = createFactory(require("react-redux").Provider); -const { setupStore } = require("devtools/client/webconsole/test/helpers"); +const { setupStore } = require("devtools/client/webconsole/test/node/helpers"); // Components under test. const ConsoleApiCall = createFactory( @@ -28,8 +28,8 @@ const { prepareMessage } = require("devtools/client/webconsole/utils/messages"); // Test fakes. const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); describe("ConsoleAPICall component:", () => { describe("console.log", () => { @@ -684,7 +684,7 @@ describe("ConsoleAPICall component:", () => { ); expect(wrapper.find(".message-body").text()).toBe( - "Window http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html" + "Window http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html" ); }); }); diff --git a/devtools/client/webconsole/test/components/console-output.test.js b/devtools/client/webconsole/test/node/components/console-output.test.js similarity index 97% rename from devtools/client/webconsole/test/components/console-output.test.js rename to devtools/client/webconsole/test/node/components/console-output.test.js index cb2cc2b40d95..6e2c8df62ba8 100644 --- a/devtools/client/webconsole/test/components/console-output.test.js +++ b/devtools/client/webconsole/test/node/components/console-output.test.js @@ -11,8 +11,8 @@ const Provider = createFactory(require("react-redux").Provider); const ConsoleOutput = createFactory( require("devtools/client/webconsole/components/Output/ConsoleOutput") ); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); -const { setupStore } = require("devtools/client/webconsole/test/helpers"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); +const { setupStore } = require("devtools/client/webconsole/test/node/helpers"); const { initialize } = require("devtools/client/webconsole/actions/ui"); const { getInitialMessageCountForViewport, diff --git a/devtools/client/webconsole/test/components/css-warning.test.js b/devtools/client/webconsole/test/node/components/css-warning.test.js similarity index 94% rename from devtools/client/webconsole/test/components/css-warning.test.js rename to devtools/client/webconsole/test/node/components/css-warning.test.js index b70608fe0c4c..dd2a0f789f88 100644 --- a/devtools/client/webconsole/test/components/css-warning.test.js +++ b/devtools/client/webconsole/test/node/components/css-warning.test.js @@ -10,7 +10,7 @@ const sinon = require("sinon"); // React const { createFactory } = require("devtools/client/shared/vendor/react"); const Provider = createFactory(require("react-redux").Provider); -const { setupStore } = require("devtools/client/webconsole/test/helpers"); +const { setupStore } = require("devtools/client/webconsole/test/node/helpers"); // Components under test. const CSSWarning = require("devtools/client/webconsole/components/Output/message-types/CSSWarning"); @@ -22,8 +22,8 @@ const { // Test fakes. const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); describe("CSSWarning component:", () => { it("renders", () => { @@ -56,7 +56,7 @@ describe("CSSWarning component:", () => { // There should be a location. const locationLink = wrapper.find(`.message-location`); expect(locationLink.length).toBe(1); - expect(locationLink.text()).toBe("test-css-message.html:3:25"); + expect(locationLink.text()).toBe("test-css-message.html:3:27"); }); it("closes an open message when the collapse button is clicked", () => { diff --git a/devtools/client/webconsole/test/components/evaluation-result.test.js b/devtools/client/webconsole/test/node/components/evaluation-result.test.js similarity index 98% rename from devtools/client/webconsole/test/components/evaluation-result.test.js rename to devtools/client/webconsole/test/node/components/evaluation-result.test.js index 1a94e2c5d2dd..917d1066e80c 100644 --- a/devtools/client/webconsole/test/components/evaluation-result.test.js +++ b/devtools/client/webconsole/test/node/components/evaluation-result.test.js @@ -10,7 +10,7 @@ const sinon = require("sinon"); // React const { createFactory } = require("devtools/client/shared/vendor/react"); const Provider = createFactory(require("react-redux").Provider); -const { setupStore } = require("devtools/client/webconsole/test/helpers"); +const { setupStore } = require("devtools/client/webconsole/test/node/helpers"); // Components under test. const EvaluationResult = createFactory( @@ -23,8 +23,8 @@ const { // Test fakes. const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); describe("EvaluationResult component:", () => { it.skip("renders a grip result", () => { diff --git a/devtools/client/webconsole/test/components/filter-bar.test.js b/devtools/client/webconsole/test/node/components/filter-bar.test.js similarity index 98% rename from devtools/client/webconsole/test/components/filter-bar.test.js rename to devtools/client/webconsole/test/node/components/filter-bar.test.js index c61dfe1a918d..0aac69e78508 100644 --- a/devtools/client/webconsole/test/components/filter-bar.test.js +++ b/devtools/client/webconsole/test/node/components/filter-bar.test.js @@ -29,8 +29,8 @@ const { setupStore, prefsService, clearPrefs, -} = require("devtools/client/webconsole/test/helpers"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/helpers"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); function getFilterBar(overrides = {}) { return FilterBar({ diff --git a/devtools/client/webconsole/test/components/filter-button.test.js b/devtools/client/webconsole/test/node/components/filter-button.test.js similarity index 100% rename from devtools/client/webconsole/test/components/filter-button.test.js rename to devtools/client/webconsole/test/node/components/filter-button.test.js diff --git a/devtools/client/webconsole/test/components/filter-checkbox.test.js b/devtools/client/webconsole/test/node/components/filter-checkbox.test.js similarity index 100% rename from devtools/client/webconsole/test/components/filter-checkbox.test.js rename to devtools/client/webconsole/test/node/components/filter-checkbox.test.js diff --git a/devtools/client/webconsole/test/components/message-container.test.js b/devtools/client/webconsole/test/node/components/message-container.test.js similarity index 95% rename from devtools/client/webconsole/test/components/message-container.test.js rename to devtools/client/webconsole/test/node/components/message-container.test.js index 0b9f86378136..e9fd8074b2ac 100644 --- a/devtools/client/webconsole/test/components/message-container.test.js +++ b/devtools/client/webconsole/test/node/components/message-container.test.js @@ -21,8 +21,8 @@ const PageError = require("devtools/client/webconsole/components/Output/message- // Test fakes. const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); describe("MessageContainer component:", () => { it("pipes data to children as expected", () => { diff --git a/devtools/client/webconsole/test/components/message-icon.test.js b/devtools/client/webconsole/test/node/components/message-icon.test.js similarity index 100% rename from devtools/client/webconsole/test/components/message-icon.test.js rename to devtools/client/webconsole/test/node/components/message-icon.test.js diff --git a/devtools/client/webconsole/test/components/message-location.test.js b/devtools/client/webconsole/test/node/components/message-location.test.js similarity index 95% rename from devtools/client/webconsole/test/components/message-location.test.js rename to devtools/client/webconsole/test/node/components/message-location.test.js index bd25887ac85c..08c164820c95 100644 --- a/devtools/client/webconsole/test/components/message-location.test.js +++ b/devtools/client/webconsole/test/node/components/message-location.test.js @@ -7,7 +7,7 @@ const expect = require("expect"); const { mount } = require("enzyme"); const sinon = require("sinon"); const { createFactory } = require("devtools/client/shared/vendor/react"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); let { MessageContainer, @@ -17,7 +17,7 @@ MessageContainer = createFactory(MessageContainer); // Test fakes. const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); describe("Message - location element", () => { it("Calls onViewSourceInDebugger when clicked", () => { diff --git a/devtools/client/webconsole/test/components/message-repeat.test.js b/devtools/client/webconsole/test/node/components/message-repeat.test.js similarity index 100% rename from devtools/client/webconsole/test/components/message-repeat.test.js rename to devtools/client/webconsole/test/node/components/message-repeat.test.js diff --git a/devtools/client/webconsole/test/components/message-types-aria.test.js b/devtools/client/webconsole/test/node/components/message-types-aria.test.js similarity index 94% rename from devtools/client/webconsole/test/components/message-types-aria.test.js rename to devtools/client/webconsole/test/node/components/message-types-aria.test.js index a9f638de3ff8..08ceb8607819 100644 --- a/devtools/client/webconsole/test/components/message-types-aria.test.js +++ b/devtools/client/webconsole/test/node/components/message-types-aria.test.js @@ -23,8 +23,8 @@ const { ConsoleCommand } = require("devtools/client/webconsole/types"); // Test fakes. const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); describe("message types component ARIA:", () => { describe("ConsoleAPICall", () => { diff --git a/devtools/client/webconsole/test/components/network-event-message.test.js b/devtools/client/webconsole/test/node/components/network-event-message.test.js similarity index 95% rename from devtools/client/webconsole/test/components/network-event-message.test.js rename to devtools/client/webconsole/test/node/components/network-event-message.test.js index 07228d5270cc..afcbf2cfac8b 100644 --- a/devtools/client/webconsole/test/components/network-event-message.test.js +++ b/devtools/client/webconsole/test/node/components/network-event-message.test.js @@ -20,11 +20,10 @@ const { // Test fakes. const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); -const EXPECTED_URL = - "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html"; +const EXPECTED_URL = "http://example.com/inexistent.html"; const EXPECTED_STATUS = /\[HTTP\/\d\.\d \d+ [A-Za-z ]+ \d+ms\]/; describe("NetworkEventMessage component:", () => { diff --git a/devtools/client/webconsole/test/components/page-error.test.js b/devtools/client/webconsole/test/node/components/page-error.test.js similarity index 98% rename from devtools/client/webconsole/test/components/page-error.test.js rename to devtools/client/webconsole/test/node/components/page-error.test.js index bedfdb8e7d86..094d600e28fc 100644 --- a/devtools/client/webconsole/test/components/page-error.test.js +++ b/devtools/client/webconsole/test/node/components/page-error.test.js @@ -10,7 +10,7 @@ const sinon = require("sinon"); // React const { createFactory } = require("devtools/client/shared/vendor/react"); const Provider = createFactory(require("react-redux").Provider); -const { setupStore } = require("devtools/client/webconsole/test/helpers"); +const { setupStore } = require("devtools/client/webconsole/test/node/helpers"); const { prepareMessage } = require("devtools/client/webconsole/utils/messages"); // Components under test. @@ -27,8 +27,8 @@ const { const { stubPackets, stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); describe("PageError component:", () => { it("renders", () => { diff --git a/devtools/client/webconsole/test/components/warning-group.test.js b/devtools/client/webconsole/test/node/components/warning-group.test.js similarity index 96% rename from devtools/client/webconsole/test/components/warning-group.test.js rename to devtools/client/webconsole/test/node/components/warning-group.test.js index d24e08fa3f94..71b8ae13a451 100644 --- a/devtools/client/webconsole/test/components/warning-group.test.js +++ b/devtools/client/webconsole/test/node/components/warning-group.test.js @@ -20,8 +20,8 @@ const { // Test fakes. const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); -const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); +const serviceContainer = require("devtools/client/webconsole/test/node/fixtures/serviceContainer"); const mockMessage = ConsoleMessage({ messageText: "this is a warning group", source: MESSAGE_SOURCE.CONSOLE_FRONTEND, diff --git a/devtools/client/webconsole/test/components/webconsole-wrapper.test.js b/devtools/client/webconsole/test/node/components/webconsole-wrapper.test.js similarity index 96% rename from devtools/client/webconsole/test/components/webconsole-wrapper.test.js rename to devtools/client/webconsole/test/node/components/webconsole-wrapper.test.js index c058cbc41187..1077793dd752 100644 --- a/devtools/client/webconsole/test/components/webconsole-wrapper.test.js +++ b/devtools/client/webconsole/test/node/components/webconsole-wrapper.test.js @@ -8,14 +8,14 @@ const expect = require("expect"); const { stubPackets, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); const { getFirstMessage, getLastMessage, getMessageAt, getPrivatePacket, getWebConsoleUiMock, -} = require("devtools/client/webconsole/test/helpers"); +} = require("devtools/client/webconsole/test/node/helpers"); const WebConsoleWrapper = require("devtools/client/webconsole/webconsole-wrapper"); const { messagesAdd } = require("devtools/client/webconsole/actions/messages"); diff --git a/devtools/client/webconsole/test/fixtures/.eslintrc.js b/devtools/client/webconsole/test/node/fixtures/.eslintrc.js similarity index 66% rename from devtools/client/webconsole/test/fixtures/.eslintrc.js rename to devtools/client/webconsole/test/node/fixtures/.eslintrc.js index 698ae9181a0a..677cbb4243df 100644 --- a/devtools/client/webconsole/test/fixtures/.eslintrc.js +++ b/devtools/client/webconsole/test/node/fixtures/.eslintrc.js @@ -2,5 +2,5 @@ module.exports = { // Extend from the shared list of defined globals for mochitests. - "extends": "../../../../.eslintrc.mochitests.js" + "extends": "../../../../../.eslintrc.mochitests.js" }; diff --git a/devtools/client/webconsole/test/fixtures/L10n.js b/devtools/client/webconsole/test/node/fixtures/L10n.js similarity index 100% rename from devtools/client/webconsole/test/fixtures/L10n.js rename to devtools/client/webconsole/test/node/fixtures/L10n.js diff --git a/devtools/client/webconsole/test/fixtures/LocalizationHelper.js b/devtools/client/webconsole/test/node/fixtures/LocalizationHelper.js similarity index 89% rename from devtools/client/webconsole/test/fixtures/LocalizationHelper.js rename to devtools/client/webconsole/test/node/fixtures/LocalizationHelper.js index 4fd72084c779..4537e134e8da 100644 --- a/devtools/client/webconsole/test/fixtures/LocalizationHelper.js +++ b/devtools/client/webconsole/test/node/fixtures/LocalizationHelper.js @@ -3,7 +3,7 @@ "use strict"; -const LocalizationHelper = require("devtools/client/webconsole/test/fixtures/L10n"); +const LocalizationHelper = require("devtools/client/webconsole/test/node/fixtures/L10n"); module.exports = { LocalizationHelper, diff --git a/devtools/client/webconsole/test/fixtures/PluralForm.js b/devtools/client/webconsole/test/node/fixtures/PluralForm.js similarity index 100% rename from devtools/client/webconsole/test/fixtures/PluralForm.js rename to devtools/client/webconsole/test/node/fixtures/PluralForm.js diff --git a/devtools/client/webconsole/test/fixtures/WebConsoleUtils.js b/devtools/client/webconsole/test/node/fixtures/WebConsoleUtils.js similarity index 75% rename from devtools/client/webconsole/test/fixtures/WebConsoleUtils.js rename to devtools/client/webconsole/test/node/fixtures/WebConsoleUtils.js index 2b64b7e79049..17714bee64c2 100644 --- a/devtools/client/webconsole/test/fixtures/WebConsoleUtils.js +++ b/devtools/client/webconsole/test/node/fixtures/WebConsoleUtils.js @@ -3,7 +3,7 @@ "use strict"; -const L10n = require("devtools/client/webconsole/test/fixtures/L10n"); +const L10n = require("devtools/client/webconsole/test/node/fixtures/L10n"); const Utils = { L10n, diff --git a/devtools/client/webconsole/test/fixtures/async-storage.js b/devtools/client/webconsole/test/node/fixtures/async-storage.js similarity index 100% rename from devtools/client/webconsole/test/fixtures/async-storage.js rename to devtools/client/webconsole/test/node/fixtures/async-storage.js diff --git a/devtools/client/webconsole/test/fixtures/moz.build b/devtools/client/webconsole/test/node/fixtures/moz.build similarity index 91% rename from devtools/client/webconsole/test/fixtures/moz.build rename to devtools/client/webconsole/test/node/fixtures/moz.build index ff41d6c80557..7aa2354a170f 100644 --- a/devtools/client/webconsole/test/fixtures/moz.build +++ b/devtools/client/webconsole/test/node/fixtures/moz.build @@ -4,6 +4,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ - 'stub-generators', 'stubs' ] diff --git a/devtools/client/webconsole/test/fixtures/serviceContainer.js b/devtools/client/webconsole/test/node/fixtures/serviceContainer.js similarity index 100% rename from devtools/client/webconsole/test/fixtures/serviceContainer.js rename to devtools/client/webconsole/test/node/fixtures/serviceContainer.js diff --git a/devtools/client/webconsole/test/fixtures/stubs/consoleApi.js b/devtools/client/webconsole/test/node/fixtures/stubs/consoleApi.js similarity index 74% rename from devtools/client/webconsole/test/fixtures/stubs/consoleApi.js rename to devtools/client/webconsole/test/node/fixtures/stubs/consoleApi.js index 3ed61f8a151b..0779bfc68fa2 100644 --- a/devtools/client/webconsole/test/fixtures/stubs/consoleApi.js +++ b/devtools/client/webconsole/test/node/fixtures/stubs/consoleApi.js @@ -28,10 +28,10 @@ stubPreparedMessages.set(`console.log('foobar', 'test')`, new ConsoleMessage({ "foobar", "test" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foobar\",\"test\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foobar\",\"test\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -64,10 +64,10 @@ stubPreparedMessages.set(`console.log(undefined)`, new ConsoleMessage({ "type": "undefined" } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -98,10 +98,10 @@ stubPreparedMessages.set(`console.warn('danger, will robinson!')`, new ConsoleMe "parameters": [ "danger, will robinson!" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":null,\"parameters\":[\"danger, will robinson!\"],\"source\":\"console-api\",\"type\":\"warn\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":null,\"parameters\":[\"danger, will robinson!\"],\"source\":\"console-api\",\"type\":\"warn\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -134,10 +134,10 @@ stubPreparedMessages.set(`console.log(NaN)`, new ConsoleMessage({ "type": "NaN" } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"NaN\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"NaN\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -170,10 +170,10 @@ stubPreparedMessages.set(`console.log(null)`, new ConsoleMessage({ "type": "null" } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"null\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"null\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -204,10 +204,10 @@ stubPreparedMessages.set(`console.log('鼬')`, new ConsoleMessage({ "parameters": [ "鼬" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"鼬\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"鼬\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -238,10 +238,10 @@ stubPreparedMessages.set(`console.clear()`, new ConsoleMessage({ "parameters": [ "Console was cleared." ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -270,10 +270,10 @@ stubPreparedMessages.set(`console.count('bar')`, new ConsoleMessage({ "category": null, "messageText": "bar: 1", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -327,18 +327,18 @@ stubPreparedMessages.set(`console.assert(false, {message: 'foobar'})`, new Conso } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source33\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj30\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"message\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"foobar\"}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"assert\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":[{\"columnNumber\":35,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"functionName\":\"triggerPacket\",\"lineNumber\":1,\"sourceId\":159}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source33\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj30\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"message\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"foobar\"}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"assert\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":[{\"columnNumber\":35,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"functionName\":\"triggerPacket\",\"lineNumber\":1,\"sourceId\":159}]}", "stacktrace": [ { "columnNumber": 35, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "lineNumber": 1, "sourceId": 159 } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source33", "line": 1, "column": 35 @@ -369,10 +369,10 @@ stubPreparedMessages.set(`console.log('hello \nfrom \rthe \"string world!')`, ne "parameters": [ "hello \nfrom \rthe \"string world!" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"hello \\nfrom \\rthe \\\"string world!\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"hello \\nfrom \\rthe \\\"string world!\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -403,10 +403,10 @@ stubPreparedMessages.set(`console.log('úṇĩçödê țĕșť')`, new ConsoleMe "parameters": [ "úṇĩçödê țĕșť" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"úṇĩçödê țĕșť\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"úṇĩçödê țĕșť\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -445,14 +445,14 @@ stubPreparedMessages.set(`console.dirxml(window)`, new ConsoleMessage({ "ownPropertyLength": 830, "preview": { "kind": "ObjectWithURL", - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html" + "url": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html" } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj31\",\"class\":\"Window\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":830,\"preview\":{\"kind\":\"ObjectWithURL\",\"url\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\"}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj31\",\"class\":\"Window\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":830,\"preview\":{\"kind\":\"ObjectWithURL\",\"url\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\"}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -501,10 +501,10 @@ stubPreparedMessages.set(`console.log('myarray', ['red', 'green', 'blue'])`, new } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myarray\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj32\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"red\",\"green\",\"blue\"]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myarray\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj32\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"red\",\"green\",\"blue\"]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -545,10 +545,10 @@ stubPreparedMessages.set(`console.log('myregex', /a.b.c/)`, new ConsoleMessage({ "displayString": "/a.b.c/" } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myregex\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj33\",\"class\":\"RegExp\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"displayString\":\"/a.b.c/\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myregex\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj33\",\"class\":\"RegExp\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"displayString\":\"/a.b.c/\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -596,10 +596,10 @@ stubPreparedMessages.set(`console.table(['red', 'green', 'blue']);`, new Console } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj34\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"red\",\"green\",\"blue\"]}}],\"source\":\"console-api\",\"type\":\"table\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj34\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"red\",\"green\",\"blue\"]}}],\"source\":\"console-api\",\"type\":\"table\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -666,10 +666,10 @@ stubPreparedMessages.set(`console.log('myobject', {red: 'redValue', green: 'gree } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myobject\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj35\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":3,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"red\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"redValue\"},\"green\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"greenValue\"},\"blue\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"blueValue\"}},\"ownSymbols\":[],\"ownPropertiesLength\":3,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myobject\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj35\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":3,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"red\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"redValue\"},\"green\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"greenValue\"},\"blue\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"blueValue\"}},\"ownSymbols\":[],\"ownPropertiesLength\":3,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -700,10 +700,10 @@ stubPreparedMessages.set(`console.debug('debug message');`, new ConsoleMessage({ "parameters": [ "debug message" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"debug\",\"messageText\":null,\"parameters\":[\"debug message\"],\"source\":\"console-api\",\"type\":\"debug\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"debug\",\"messageText\":null,\"parameters\":[\"debug message\"],\"source\":\"console-api\",\"type\":\"debug\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -734,10 +734,10 @@ stubPreparedMessages.set(`console.info('info message');`, new ConsoleMessage({ "parameters": [ "info message" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"info\",\"messageText\":null,\"parameters\":[\"info message\"],\"source\":\"console-api\",\"type\":\"info\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"info\",\"messageText\":null,\"parameters\":[\"info message\"],\"source\":\"console-api\",\"type\":\"info\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -768,18 +768,18 @@ stubPreparedMessages.set(`console.error('error message');`, new ConsoleMessage({ "parameters": [ "error message" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source33\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[\"error message\"],\"source\":\"console-api\",\"type\":\"error\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":[{\"columnNumber\":35,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"functionName\":\"triggerPacket\",\"lineNumber\":1,\"sourceId\":159}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source33\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[\"error message\"],\"source\":\"console-api\",\"type\":\"error\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":[{\"columnNumber\":35,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"functionName\":\"triggerPacket\",\"lineNumber\":1,\"sourceId\":159}]}", "stacktrace": [ { "columnNumber": 35, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "lineNumber": 1, "sourceId": 159 } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source33", "line": 1, "column": 35 @@ -833,13 +833,13 @@ stubPreparedMessages.set(`console.log('mymap')`, new ConsoleMessage({ } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source50\",\"line\":5,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"mymap\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Map\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"kind\":\"MapLike\",\"size\":2,\"entries\":[[\"key1\",\"value1\"],[\"key2\",\"value2\"]]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source50\",\"line\":5,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"mymap\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Map\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"kind\":\"MapLike\",\"size\":2,\"entries\":[[\"key1\",\"value1\"],[\"key2\",\"value2\"]]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source50", "line": 5, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -884,13 +884,13 @@ stubPreparedMessages.set(`console.log('myset')`, new ConsoleMessage({ } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myset\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj37\",\"class\":\"Set\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"kind\":\"ArrayLike\",\"length\":2,\"items\":[\"a\",\"b\"]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myset\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj37\",\"class\":\"Set\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"kind\":\"ArrayLike\",\"length\":2,\"items\":[\"a\",\"b\"]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -916,35 +916,35 @@ stubPreparedMessages.set(`console.trace()`, new ConsoleMessage({ "category": null, "messageText": null, "parameters": [], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source55\",\"line\":3,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[],\"source\":\"console-api\",\"type\":\"trace\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":[{\"columnNumber\":11,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"functionName\":\"testStacktraceFiltering\",\"lineNumber\":3,\"sourceId\":193},{\"columnNumber\":26,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"functionName\":\"foo\",\"lineNumber\":6,\"sourceId\":193},{\"columnNumber\":4,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"functionName\":\"triggerPacket\",\"lineNumber\":9,\"sourceId\":193}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source55\",\"line\":3,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[],\"source\":\"console-api\",\"type\":\"trace\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":[{\"columnNumber\":13,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"functionName\":\"testStacktraceFiltering\",\"lineNumber\":3,\"sourceId\":193},{\"columnNumber\":28,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"functionName\":\"foo\",\"lineNumber\":6,\"sourceId\":193},{\"columnNumber\":6,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"functionName\":\"triggerPacket\",\"lineNumber\":9,\"sourceId\":193}]}", "stacktrace": [ { - "columnNumber": 11, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 13, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "testStacktraceFiltering", "lineNumber": 3, "sourceId": 193 }, { - "columnNumber": 26, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 28, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "foo", "lineNumber": 6, "sourceId": 193 }, { - "columnNumber": 4, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 6, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "lineNumber": 9, "sourceId": 193 } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source55", "line": 3, - "column": 11 + "column": 13 }, "groupId": null, "errorMessageName": null, @@ -1014,35 +1014,35 @@ stubPreparedMessages.set(`console.trace('bar', {'foo': 'bar'}, [1,2,3])`, new Co } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source56\",\"line\":3,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj35\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"foo\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"bar\"}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}},{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[1,2,3]}}],\"source\":\"console-api\",\"type\":\"trace\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":[{\"columnNumber\":11,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"functionName\":\"testStacktraceWithLog\",\"lineNumber\":3,\"sourceId\":195},{\"columnNumber\":24,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"functionName\":\"foo\",\"lineNumber\":6,\"sourceId\":193},{\"columnNumber\":4,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"functionName\":\"triggerPacket\",\"lineNumber\":9,\"sourceId\":193}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source56\",\"line\":3,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj35\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"foo\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"bar\"}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}},{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[1,2,3]}}],\"source\":\"console-api\",\"type\":\"trace\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":[{\"columnNumber\":13,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"functionName\":\"testStacktraceWithLog\",\"lineNumber\":3,\"sourceId\":195},{\"columnNumber\":26,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"functionName\":\"foo\",\"lineNumber\":6,\"sourceId\":193},{\"columnNumber\":6,\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"functionName\":\"triggerPacket\",\"lineNumber\":9,\"sourceId\":193}]}", "stacktrace": [ { - "columnNumber": 11, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 13, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "testStacktraceWithLog", "lineNumber": 3, "sourceId": 195 }, { - "columnNumber": 24, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 26, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "foo", "lineNumber": 6, "sourceId": 193 }, { - "columnNumber": 4, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 6, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "lineNumber": 9, "sourceId": 193 } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source56", "line": 3, - "column": 11 + "column": 13 }, "groupId": null, "errorMessageName": null, @@ -1068,13 +1068,13 @@ stubPreparedMessages.set(`console.time('bar')`, new ConsoleMessage({ "category": null, "messageText": null, "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"nullMessage\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"nullMessage\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1100,13 +1100,13 @@ stubPreparedMessages.set(`timerAlreadyExists`, new ConsoleMessage({ "category": null, "messageText": "Timer “bar” already exists.", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":3,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” already exists.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"time\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":3,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” already exists.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"time\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 3, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1134,13 +1134,13 @@ stubPreparedMessages.set(`console.timeLog('bar') - 1`, new ConsoleMessage({ "parameters": [ "bar: 1ms" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":4,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar: 1ms\"],\"source\":\"console-api\",\"type\":\"timeLog\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":4,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar: 1ms\"],\"source\":\"console-api\",\"type\":\"timeLog\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 4, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1193,13 +1193,13 @@ stubPreparedMessages.set(`console.timeLog('bar') - 2`, new ConsoleMessage({ } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source50\",\"line\":5,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar: 1ms\",\"second call\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj34\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"state\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":1}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"timeLog\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source50\",\"line\":5,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar: 1ms\",\"second call\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj34\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"state\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":1}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"timeLog\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source50", "line": 5, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1225,13 +1225,13 @@ stubPreparedMessages.set(`console.timeEnd('bar')`, new ConsoleMessage({ "category": null, "messageText": "bar: 1.21ms - timer ended", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":6,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1.21ms - timer ended\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":6,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1.21ms - timer ended\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 6, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1257,13 +1257,13 @@ stubPreparedMessages.set(`timeEnd.timerDoesntExist`, new ConsoleMessage({ "category": null, "messageText": "Timer “bar” doesn’t exist.", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":7,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":7,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 7, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1289,13 +1289,13 @@ stubPreparedMessages.set(`timeLog.timerDoesntExist`, new ConsoleMessage({ "category": null, "messageText": "Timer “bar” doesn’t exist.", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":8,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeLog\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":8,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeLog\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 8, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1323,13 +1323,13 @@ stubPreparedMessages.set(`console.table('bar')`, new ConsoleMessage({ "parameters": [ "bar" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1374,13 +1374,13 @@ stubPreparedMessages.set(`console.table(['a', 'b', 'c'])`, new ConsoleMessage({ } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj39\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"a\",\"b\",\"c\"]}}],\"source\":\"console-api\",\"type\":\"table\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj39\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"a\",\"b\",\"c\"]}}],\"source\":\"console-api\",\"type\":\"table\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1408,13 +1408,13 @@ stubPreparedMessages.set(`console.group('bar')`, new ConsoleMessage({ "parameters": [ "bar" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1440,13 +1440,13 @@ stubPreparedMessages.set(`console.groupEnd('bar')`, new ConsoleMessage({ "category": null, "messageText": null, "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":3,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":3,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 3, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1474,13 +1474,13 @@ stubPreparedMessages.set(`console.groupCollapsed('foo')`, new ConsoleMessage({ "parameters": [ "foo" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1506,13 +1506,13 @@ stubPreparedMessages.set(`console.groupEnd('foo')`, new ConsoleMessage({ "category": null, "messageText": null, "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":3,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":3,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 3, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1540,13 +1540,13 @@ stubPreparedMessages.set(`console.group()`, new ConsoleMessage({ "parameters": [ "" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1572,13 +1572,13 @@ stubPreparedMessages.set(`console.groupEnd()`, new ConsoleMessage({ "category": null, "messageText": null, "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":3,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":3,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 3, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1607,13 +1607,13 @@ stubPreparedMessages.set(`console.log(%cfoobar)`, new ConsoleMessage({ "foo", "bar" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:blue; font-size:1.3em; background:url('http://example.com/test'); position:absolute; top:10px; \",\"color:red; line-height: 1.5; background:url('http://example.com/test')\"],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:blue; font-size:1.3em; background:url('http://example.com/test'); position:absolute; top:10px; \",\"color:red; line-height: 1.5; background:url('http://example.com/test')\"],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1646,13 +1646,13 @@ stubPreparedMessages.set(`console.log("%cHello%c|%cWorld")`, new ConsoleMessage( "|", "World" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source68\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Hello\",\"|\",\"World\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:red\",\"\",\"color: blue\"],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source68\",\"line\":2,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Hello\",\"|\",\"World\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:red\",\"\",\"color: blue\"],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source68", "line": 2, - "column": 11 + "column": 13 }, "groupId": null, "errorMessageName": null, @@ -1685,13 +1685,13 @@ stubPreparedMessages.set(`console.group(%cfoo%cbar)`, new ConsoleMessage({ "foo", "bar" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1720,13 +1720,13 @@ stubPreparedMessages.set(`console.groupEnd(%cfoo%cbar)`, new ConsoleMessage({ "category": null, "messageText": null, "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":6,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":6,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 6, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1755,13 +1755,13 @@ stubPreparedMessages.set(`console.groupCollapsed(%cfoo%cbaz)`, new ConsoleMessag "foo", "baz" ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"baz\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source52\",\"line\":2,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"baz\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source52", "line": 2, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1790,13 +1790,13 @@ stubPreparedMessages.set(`console.groupEnd(%cfoo%cbaz)`, new ConsoleMessage({ "category": null, "messageText": null, "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":6,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source59\",\"line\":6,\"column\":11},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source59", "line": 6, - "column": 9 + "column": 11 }, "groupId": null, "errorMessageName": null, @@ -1865,10 +1865,10 @@ stubPreparedMessages.set(`console.dir({C, M, Y, K})`, new ConsoleMessage({ } } ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"cyan\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"C\"},\"magenta\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"M\"},\"yellow\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"Y\"},\"black\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"K\"}},\"ownSymbols\":[],\"ownPropertiesLength\":4,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"dir\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"line\":1,\"column\":35},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"cyan\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"C\"},\"magenta\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"M\"},\"yellow\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"Y\"},\"black\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"K\"}},\"ownSymbols\":[],\"ownPropertiesLength\":4,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"dir\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "line": 1, "column": 35 @@ -1897,13 +1897,13 @@ stubPreparedMessages.set(`console.count | default: 1`, new ConsoleMessage({ "category": null, "messageText": "default: 1", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":2,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":2,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 2, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -1929,13 +1929,13 @@ stubPreparedMessages.set(`console.count | default: 2`, new ConsoleMessage({ "category": null, "messageText": "default: 2", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":3,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":3,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 3, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -1961,13 +1961,13 @@ stubPreparedMessages.set(`console.count | test counter: 1`, new ConsoleMessage({ "category": null, "messageText": "test counter: 1", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":4,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":4,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 4, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -1993,13 +1993,13 @@ stubPreparedMessages.set(`console.count | test counter: 2`, new ConsoleMessage({ "category": null, "messageText": "test counter: 2", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":5,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":5,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 5, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -2025,13 +2025,13 @@ stubPreparedMessages.set(`console.count | default: 3`, new ConsoleMessage({ "category": null, "messageText": "default: 3", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":6,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":6,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 6, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -2059,13 +2059,13 @@ stubPreparedMessages.set(`console.count | clear`, new ConsoleMessage({ "parameters": [ "Console was cleared." ], - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":7,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":7,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 7, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -2091,13 +2091,13 @@ stubPreparedMessages.set(`console.count | default: 4`, new ConsoleMessage({ "category": null, "messageText": "default: 4", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":8,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 4\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":8,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 4\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 8, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -2123,13 +2123,13 @@ stubPreparedMessages.set(`console.count | test counter: 3`, new ConsoleMessage({ "category": null, "messageText": "test counter: 3", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":9,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":9,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 9, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -2155,13 +2155,13 @@ stubPreparedMessages.set(`console.countReset | test counter: 0`, new ConsoleMess "category": null, "messageText": "test counter: 0", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":10,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 0\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":10,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 0\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 10, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -2187,13 +2187,13 @@ stubPreparedMessages.set(`console.countReset | counterDoesntExist`, new ConsoleM "category": null, "messageText": "Counter “test counter” doesn’t exist.", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":11,\"column\":13},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Counter “test counter” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source73\",\"line\":11,\"column\":15},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Counter “test counter” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source73", "line": 11, - "column": 13 + "column": 15 }, "groupId": null, "errorMessageName": null, @@ -2217,7 +2217,7 @@ stubPackets.set(`console.log('foobar', 'test')`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2247,7 +2247,7 @@ stubPackets.set(`console.log(undefined)`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2275,7 +2275,7 @@ stubPackets.set(`console.warn('danger, will robinson!')`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "warn", @@ -2305,7 +2305,7 @@ stubPackets.set(`console.log(NaN)`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2335,7 +2335,7 @@ stubPackets.set(`console.log(null)`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2363,7 +2363,7 @@ stubPackets.set(`console.log('鼬')`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2389,7 +2389,7 @@ stubPackets.set(`console.clear()`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "clear", @@ -2420,7 +2420,7 @@ stubPackets.set(`console.count('bar')`, { "count": 1, "label": "bar" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "count", @@ -2471,7 +2471,7 @@ stubPackets.set(`console.assert(false, {message: 'foobar'})`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "assert", @@ -2485,7 +2485,7 @@ stubPackets.set(`console.assert(false, {message: 'foobar'})`, { "stacktrace": [ { "columnNumber": 35, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "lineNumber": 1, "sourceId": 159 @@ -2508,7 +2508,7 @@ stubPackets.set(`console.log('hello \nfrom \rthe \"string world!')`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2536,7 +2536,7 @@ stubPackets.set(`console.log('úṇĩçödê țĕșť')`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2569,14 +2569,14 @@ stubPackets.set(`console.dirxml(window)`, { "ownPropertyLength": 830, "preview": { "kind": "ObjectWithURL", - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html" + "url": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html" } } ], "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "dirxml", @@ -2622,7 +2622,7 @@ stubPackets.set(`console.log('myarray', ['red', 'green', 'blue'])`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2660,7 +2660,7 @@ stubPackets.set(`console.log('myregex', /a.b.c/)`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2705,7 +2705,7 @@ stubPackets.set(`console.table(['red', 'green', 'blue']);`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "table", @@ -2769,7 +2769,7 @@ stubPackets.set(`console.log('myobject', {red: 'redValue', green: 'greenValue', "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2797,7 +2797,7 @@ stubPackets.set(`console.debug('debug message');`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "debug", @@ -2825,7 +2825,7 @@ stubPackets.set(`console.info('info message');`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "info", @@ -2853,7 +2853,7 @@ stubPackets.set(`console.error('error message');`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "error", @@ -2867,7 +2867,7 @@ stubPackets.set(`console.error('error message');`, { "stacktrace": [ { "columnNumber": 35, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "lineNumber": 1, "sourceId": 159 @@ -2911,9 +2911,9 @@ stubPackets.set(`console.log('mymap')`, { } ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2956,9 +2956,9 @@ stubPackets.set(`console.log('myset')`, { } ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -2982,9 +2982,9 @@ stubPackets.set(`console.trace()`, { "addonId": "", "arguments": [], "chromeContext": false, - "columnNumber": 11, + "columnNumber": 13, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "testStacktraceFiltering", "groupName": "", "level": "trace", @@ -2996,22 +2996,22 @@ stubPackets.set(`console.trace()`, { "timer": null, "stacktrace": [ { - "columnNumber": 11, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 13, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "testStacktraceFiltering", "lineNumber": 3, "sourceId": 193 }, { - "columnNumber": 26, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 28, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "foo", "lineNumber": 6, "sourceId": 193 }, { - "columnNumber": 4, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 6, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "lineNumber": 9, "sourceId": 193 @@ -3075,9 +3075,9 @@ stubPackets.set(`console.trace('bar', {'foo': 'bar'}, [1,2,3])`, { } ], "chromeContext": false, - "columnNumber": 11, + "columnNumber": 13, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "testStacktraceWithLog", "groupName": "", "level": "trace", @@ -3089,22 +3089,22 @@ stubPackets.set(`console.trace('bar', {'foo': 'bar'}, [1,2,3])`, { "timer": null, "stacktrace": [ { - "columnNumber": 11, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 13, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "testStacktraceWithLog", "lineNumber": 3, "sourceId": 195 }, { - "columnNumber": 24, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 26, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "foo", "lineNumber": 6, "sourceId": 193 }, { - "columnNumber": 4, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "columnNumber": 6, + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "lineNumber": 9, "sourceId": 193 @@ -3126,9 +3126,9 @@ stubPackets.set(`console.time('bar')`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "time", @@ -3156,9 +3156,9 @@ stubPackets.set(`timerAlreadyExists`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "time", @@ -3187,9 +3187,9 @@ stubPackets.set(`console.timeLog('bar') - 1`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "timeLog", @@ -3243,9 +3243,9 @@ stubPackets.set(`console.timeLog('bar') - 2`, { } ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "timeLog", @@ -3274,9 +3274,9 @@ stubPackets.set(`console.timeEnd('bar')`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "timeEnd", @@ -3305,9 +3305,9 @@ stubPackets.set(`timeEnd.timerDoesntExist`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "timeEnd", @@ -3336,9 +3336,9 @@ stubPackets.set(`timeLog.timerDoesntExist`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "timeLog", @@ -3367,9 +3367,9 @@ stubPackets.set(`console.table('bar')`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "table", @@ -3412,9 +3412,9 @@ stubPackets.set(`console.table(['a', 'b', 'c'])`, { } ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "table", @@ -3440,9 +3440,9 @@ stubPackets.set(`console.group('bar')`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "bar", "level": "group", @@ -3466,9 +3466,9 @@ stubPackets.set(`console.groupEnd('bar')`, { "addonId": "", "arguments": [], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "bar", "level": "groupEnd", @@ -3494,9 +3494,9 @@ stubPackets.set(`console.groupCollapsed('foo')`, { "foo" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "foo", "level": "groupCollapsed", @@ -3520,9 +3520,9 @@ stubPackets.set(`console.groupEnd('foo')`, { "addonId": "", "arguments": [], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "foo", "level": "groupEnd", @@ -3546,9 +3546,9 @@ stubPackets.set(`console.group()`, { "addonId": "", "arguments": [], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "group", @@ -3572,9 +3572,9 @@ stubPackets.set(`console.groupEnd()`, { "addonId": "", "arguments": [], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "groupEnd", @@ -3601,9 +3601,9 @@ stubPackets.set(`console.log(%cfoobar)`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -3634,9 +3634,9 @@ stubPackets.set(`console.log("%cHello%c|%cWorld")`, { "World" ], "chromeContext": false, - "columnNumber": 11, + "columnNumber": 13, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "log", @@ -3667,9 +3667,9 @@ stubPackets.set(`console.group(%cfoo%cbar)`, { "bar" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "foo bar", "level": "group", @@ -3696,9 +3696,9 @@ stubPackets.set(`console.groupEnd(%cfoo%cbar)`, { "addonId": "", "arguments": [], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "foo bar", "level": "groupEnd", @@ -3725,9 +3725,9 @@ stubPackets.set(`console.groupCollapsed(%cfoo%cbaz)`, { "baz" ], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "foo baz", "level": "groupCollapsed", @@ -3754,9 +3754,9 @@ stubPackets.set(`console.groupEnd(%cfoo%cbaz)`, { "addonId": "", "arguments": [], "chromeContext": false, - "columnNumber": 9, + "columnNumber": 11, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "foo baz", "level": "groupEnd", @@ -3825,7 +3825,7 @@ stubPackets.set(`console.dir({C, M, Y, K})`, { "chromeContext": false, "columnNumber": 35, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "dir", @@ -3851,12 +3851,12 @@ stubPackets.set(`console.count | default: 1`, { "default" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "count": 1, "label": "default" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "count", @@ -3882,12 +3882,12 @@ stubPackets.set(`console.count | default: 2`, { "default" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "count": 2, "label": "default" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "count", @@ -3913,12 +3913,12 @@ stubPackets.set(`console.count | test counter: 1`, { "test counter" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "count": 1, "label": "test counter" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "count", @@ -3944,12 +3944,12 @@ stubPackets.set(`console.count | test counter: 2`, { "test counter" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "count": 2, "label": "test counter" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "count", @@ -3975,12 +3975,12 @@ stubPackets.set(`console.count | default: 3`, { "default" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "count": 3, "label": "default" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "count", @@ -4004,9 +4004,9 @@ stubPackets.set(`console.count | clear`, { "addonId": "", "arguments": [], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": null, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "clear", @@ -4032,12 +4032,12 @@ stubPackets.set(`console.count | default: 4`, { "default" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "count": 4, "label": "default" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "count", @@ -4063,12 +4063,12 @@ stubPackets.set(`console.count | test counter: 3`, { "test counter" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "count": 3, "label": "test counter" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "count", @@ -4094,12 +4094,12 @@ stubPackets.set(`console.countReset | test counter: 0`, { "test counter" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "count": 0, "label": "test counter" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "countReset", @@ -4125,12 +4125,12 @@ stubPackets.set(`console.countReset | counterDoesntExist`, { "test counter" ], "chromeContext": false, - "columnNumber": 13, + "columnNumber": 15, "counter": { "error": "counterDoesntExist", "label": "test counter" }, - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "functionName": "triggerPacket", "groupName": "", "level": "countReset", diff --git a/devtools/client/webconsole/test/fixtures/stubs/cssMessage.js b/devtools/client/webconsole/test/node/fixtures/stubs/cssMessage.js similarity index 76% rename from devtools/client/webconsole/test/fixtures/stubs/cssMessage.js rename to devtools/client/webconsole/test/node/fixtures/stubs/cssMessage.js index f14386e0f95b..c8fbec21376e 100644 --- a/devtools/client/webconsole/test/fixtures/stubs/cssMessage.js +++ b/devtools/client/webconsole/test/node/fixtures/stubs/cssMessage.js @@ -25,13 +25,13 @@ stubPreparedMessages.set(`Unknown property ‘such-unknown-property’. Declara "category": "CSS Parser", "messageText": "Unknown property ‘such-unknown-property’. Declaration dropped.", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html\",\"sourceId\":null,\"line\":3,\"column\":25},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Unknown property ‘such-unknown-property’. Declaration dropped.\",\"parameters\":null,\"source\":\"css\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html\",\"sourceId\":null,\"line\":3,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Unknown property ‘such-unknown-property’. Declaration dropped.\",\"parameters\":null,\"source\":\"css\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html", "sourceId": null, "line": 3, - "column": 25 + "column": 27 }, "groupId": null, "errorMessageName": "", @@ -56,13 +56,13 @@ stubPreparedMessages.set(`Error in parsing value for ‘padding-top’. Declara "category": "CSS Parser", "messageText": "Error in parsing value for ‘padding-top’. Declaration dropped.", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html\",\"sourceId\":null,\"line\":3,\"column\":16},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Error in parsing value for ‘padding-top’. Declaration dropped.\",\"parameters\":null,\"source\":\"css\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":null}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html\",\"sourceId\":null,\"line\":3,\"column\":18},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Error in parsing value for ‘padding-top’. Declaration dropped.\",\"parameters\":null,\"source\":\"css\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":null}", "stacktrace": null, "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html", "sourceId": null, "line": 3, - "column": 16 + "column": 18 }, "groupId": null, "errorMessageName": "", @@ -79,11 +79,11 @@ stubPackets.set(`Unknown property ‘such-unknown-property’. Declaration drop "pageError": { "errorMessage": "Unknown property ‘such-unknown-property’. Declaration dropped.", "errorMessageName": "", - "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html", + "sourceName": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html", "sourceId": null, "lineText": "", "lineNumber": 3, - "columnNumber": 25, + "columnNumber": 27, "category": "CSS Parser", "innerWindowID": 15032385539, "timeStamp": 1479159920406, @@ -106,11 +106,11 @@ stubPackets.set(`Error in parsing value for ‘padding-top’. Declaration drop "pageError": { "errorMessage": "Error in parsing value for ‘padding-top’. Declaration dropped.", "errorMessageName": "", - "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html", + "sourceName": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html", "sourceId": null, "lineText": "", "lineNumber": 3, - "columnNumber": 16, + "columnNumber": 18, "category": "CSS Parser", "innerWindowID": 15032385539, "timeStamp": 1479159920465, diff --git a/devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js b/devtools/client/webconsole/test/node/fixtures/stubs/evaluationResult.js similarity index 100% rename from devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js rename to devtools/client/webconsole/test/node/fixtures/stubs/evaluationResult.js diff --git a/devtools/client/webconsole/test/fixtures/stubs/index.js b/devtools/client/webconsole/test/node/fixtures/stubs/index.js similarity index 100% rename from devtools/client/webconsole/test/fixtures/stubs/index.js rename to devtools/client/webconsole/test/node/fixtures/stubs/index.js diff --git a/devtools/client/webconsole/test/fixtures/stubs/moz.build b/devtools/client/webconsole/test/node/fixtures/stubs/moz.build similarity index 100% rename from devtools/client/webconsole/test/fixtures/stubs/moz.build rename to devtools/client/webconsole/test/node/fixtures/stubs/moz.build diff --git a/devtools/client/webconsole/test/fixtures/stubs/networkEvent.js b/devtools/client/webconsole/test/node/fixtures/stubs/networkEvent.js similarity index 68% rename from devtools/client/webconsole/test/fixtures/stubs/networkEvent.js rename to devtools/client/webconsole/test/node/fixtures/stubs/networkEvent.js index 7dad15884443..ea87b35ca4ef 100644 --- a/devtools/client/webconsole/test/fixtures/stubs/networkEvent.js +++ b/devtools/client/webconsole/test/node/fixtures/stubs/networkEvent.js @@ -18,7 +18,7 @@ stubPreparedMessages.set("GET request", new NetworkEventMessage({ "level": "log", "isXHR": false, "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "GET" }, "response": {}, @@ -31,19 +31,19 @@ stubPreparedMessages.set("GET request", new NetworkEventMessage({ "securityInfo": null, "requestHeadersFromUploadStream": null, "private": false, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "urlDetails": { "baseNameWithQuery": "inexistent.html", "host": "example.com", "scheme": "http", - "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "unicodeUrl": "http://example.com/inexistent.html", "isLocal": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html" + "url": "http://example.com/inexistent.html" }, "method": "GET", "cause": { "type": "img", - "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html", + "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-network-event.html", "stacktraceAvailable": true } })); @@ -53,7 +53,7 @@ stubPreparedMessages.set("GET request update", new NetworkEventMessage({ "actor": "server1.conn0.child1/netEvent30", "level": "log", "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "GET", "headersSize": 489 }, @@ -78,14 +78,14 @@ stubPreparedMessages.set("GET request update", new NetworkEventMessage({ "openedOnce": false, "securityInfo": null, "requestHeadersFromUploadStream": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "urlDetails": { "baseNameWithQuery": "inexistent.html", "host": "example.com", "scheme": "http", - "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "unicodeUrl": "http://example.com/inexistent.html", "isLocal": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html" + "url": "http://example.com/inexistent.html" }, "method": "GET" })); @@ -95,7 +95,7 @@ stubPreparedMessages.set("XHR GET request", new NetworkEventMessage({ "level": "log", "isXHR": true, "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "GET" }, "response": {}, @@ -108,19 +108,19 @@ stubPreparedMessages.set("XHR GET request", new NetworkEventMessage({ "securityInfo": null, "requestHeadersFromUploadStream": null, "private": false, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "urlDetails": { "baseNameWithQuery": "inexistent.html", "host": "example.com", "scheme": "http", - "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "unicodeUrl": "http://example.com/inexistent.html", "isLocal": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html" + "url": "http://example.com/inexistent.html" }, "method": "GET", "cause": { "type": "xhr", - "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html", + "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-network-event.html", "stacktraceAvailable": true } })); @@ -130,7 +130,7 @@ stubPreparedMessages.set("XHR GET request update", new NetworkEventMessage({ "actor": "server1.conn0.child1/netEvent31", "level": "log", "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "GET", "headersSize": 489 }, @@ -155,14 +155,14 @@ stubPreparedMessages.set("XHR GET request update", new NetworkEventMessage({ "openedOnce": false, "securityInfo": null, "requestHeadersFromUploadStream": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "urlDetails": { "baseNameWithQuery": "inexistent.html", "host": "example.com", "scheme": "http", - "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "unicodeUrl": "http://example.com/inexistent.html", "isLocal": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html" + "url": "http://example.com/inexistent.html" }, "method": "GET" })); @@ -172,7 +172,7 @@ stubPreparedMessages.set("XHR POST request", new NetworkEventMessage({ "level": "log", "isXHR": true, "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "POST" }, "response": {}, @@ -185,19 +185,19 @@ stubPreparedMessages.set("XHR POST request", new NetworkEventMessage({ "securityInfo": null, "requestHeadersFromUploadStream": null, "private": false, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "urlDetails": { "baseNameWithQuery": "inexistent.html", "host": "example.com", "scheme": "http", - "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "unicodeUrl": "http://example.com/inexistent.html", "isLocal": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html" + "url": "http://example.com/inexistent.html" }, "method": "POST", "cause": { "type": "xhr", - "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html", + "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-network-event.html", "stacktraceAvailable": true } })); @@ -207,7 +207,7 @@ stubPreparedMessages.set("XHR POST request update", new NetworkEventMessage({ "actor": "server1.conn0.child1/netEvent32", "level": "log", "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "POST", "headersSize": 509 }, @@ -232,14 +232,14 @@ stubPreparedMessages.set("XHR POST request update", new NetworkEventMessage({ "openedOnce": false, "securityInfo": null, "requestHeadersFromUploadStream": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "urlDetails": { "baseNameWithQuery": "inexistent.html", "host": "example.com", "scheme": "http", - "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "unicodeUrl": "http://example.com/inexistent.html", "isLocal": null, - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html" + "url": "http://example.com/inexistent.html" }, "method": "POST" })); @@ -250,13 +250,13 @@ stubPackets.set(`GET request`, { "discardRequestBody": true, "discardResponseBody": true, "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "GET" }, "isXHR": false, "cause": { "type": "img", - "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html", + "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-network-event.html", "stacktraceAvailable": true }, "response": {}, @@ -274,7 +274,7 @@ stubPackets.set(`GET request update`, { "_type": "NetworkEvent", "actor": "server1.conn0.child1/netEvent30", "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "GET", "headersSize": 489 }, @@ -301,13 +301,13 @@ stubPackets.set(`XHR GET request`, { "discardRequestBody": true, "discardResponseBody": true, "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "GET" }, "isXHR": true, "cause": { "type": "xhr", - "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html", + "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-network-event.html", "stacktraceAvailable": true }, "response": {}, @@ -325,7 +325,7 @@ stubPackets.set(`XHR GET request update`, { "_type": "NetworkEvent", "actor": "server1.conn0.child1/netEvent31", "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "GET", "headersSize": 489 }, @@ -352,13 +352,13 @@ stubPackets.set(`XHR POST request`, { "discardRequestBody": true, "discardResponseBody": true, "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "POST" }, "isXHR": true, "cause": { "type": "xhr", - "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html", + "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-network-event.html", "stacktraceAvailable": true }, "response": {}, @@ -376,7 +376,7 @@ stubPackets.set(`XHR POST request update`, { "_type": "NetworkEvent", "actor": "server1.conn0.child1/netEvent32", "request": { - "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html", + "url": "http://example.com/inexistent.html", "method": "POST", "headersSize": 509 }, diff --git a/devtools/client/webconsole/test/fixtures/stubs/pageError.js b/devtools/client/webconsole/test/node/fixtures/stubs/pageError.js similarity index 73% rename from devtools/client/webconsole/test/fixtures/stubs/pageError.js rename to devtools/client/webconsole/test/node/fixtures/stubs/pageError.js index 3057d071c047..b8df81e41953 100644 --- a/devtools/client/webconsole/test/fixtures/stubs/pageError.js +++ b/devtools/client/webconsole/test/node/fixtures/stubs/pageError.js @@ -25,24 +25,24 @@ stubPreparedMessages.set(`ReferenceError: asdf is not defined`, new ConsoleMessa "category": "content javascript", "messageText": "ReferenceError: asdf is not defined", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":null,\"line\":3,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"lineNumber\":3,\"columnNumber\":5,\"functionName\":\"bar\"},{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"lineNumber\":6,\"columnNumber\":8,\"functionName\":\"foo\"},{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"lineNumber\":9,\"columnNumber\":6,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":null,\"line\":3,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"lineNumber\":3,\"columnNumber\":5,\"functionName\":\"bar\"},{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"lineNumber\":6,\"columnNumber\":8,\"functionName\":\"foo\"},{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source25\",\"lineNumber\":9,\"columnNumber\":6,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", "stacktrace": [ { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "lineNumber": 3, "columnNumber": 5, "functionName": "bar" }, { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "lineNumber": 6, "columnNumber": 8, "functionName": "foo" }, { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "lineNumber": 9, "columnNumber": 6, @@ -64,7 +64,7 @@ stubPreparedMessages.set(`ReferenceError: asdf is not defined`, new ConsoleMessa } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "line": 3, "column": 5 @@ -93,7 +93,7 @@ stubPreparedMessages.set(`SyntaxError: redeclaration of let a`, new ConsoleMessa "category": "content javascript", "messageText": "SyntaxError: redeclaration of let a", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":null,\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: redeclaration of let a\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":null,\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: redeclaration of let a\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", "stacktrace": [ { "filename": "resource://testing-common/content-task.js line 62 > eval", @@ -111,7 +111,7 @@ stubPreparedMessages.set(`SyntaxError: redeclaration of let a`, new ConsoleMessa } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "line": 2, "column": 9 @@ -125,7 +125,7 @@ stubPreparedMessages.set(`SyntaxError: redeclaration of let a`, new ConsoleMessa { "messageBody": "Previously declared at line 2, column 6", "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "line": 2, "column": 6 @@ -155,10 +155,10 @@ stubPreparedMessages.set(`TypeError longString message`, new ConsoleMessage({ "actor": "server1.conn0.child1/longString30" }, "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source26\",\"line\":1,\"column\":7},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":{\"type\":\"longString\",\"initial\":\"Error: Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Lon\",\"length\":110007,\"actor\":\"server1.conn0.child1/longString30\"},\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source26\",\"lineNumber\":1,\"columnNumber\":7,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source26\",\"line\":1,\"column\":7},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":{\"type\":\"longString\",\"initial\":\"Error: Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Lon\",\"length\":110007,\"actor\":\"server1.conn0.child1/longString30\"},\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source26\",\"lineNumber\":1,\"columnNumber\":7,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", "stacktrace": [ { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source26", "lineNumber": 1, "columnNumber": 7, @@ -180,7 +180,7 @@ stubPreparedMessages.set(`TypeError longString message`, new ConsoleMessage({ } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source26", "line": 1, "column": 7 @@ -208,10 +208,10 @@ stubPreparedMessages.set(`throw ""`, new ConsoleMessage({ "category": "content javascript", "messageText": "uncaught exception: ", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":null,\"line\":1,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"uncaught exception: \",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source24\",\"lineNumber\":1,\"columnNumber\":1,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":null,\"line\":1,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"uncaught exception: \",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source24\",\"lineNumber\":1,\"columnNumber\":1,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", "stacktrace": [ { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source24", "lineNumber": 1, "columnNumber": 1, @@ -233,7 +233,7 @@ stubPreparedMessages.set(`throw ""`, new ConsoleMessage({ } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "line": 1, "column": 1 @@ -261,10 +261,10 @@ stubPreparedMessages.set(`throw "tomato"`, new ConsoleMessage({ "category": "content javascript", "messageText": "uncaught exception: tomato", "parameters": null, - "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":null,\"line\":1,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"uncaught exception: tomato\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source24\",\"lineNumber\":1,\"columnNumber\":1,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", + "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":null,\"line\":1,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"uncaught exception: tomato\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false,\"stacktrace\":[{\"filename\":\"http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html\",\"sourceId\":\"server1.conn0.child1/source24\",\"lineNumber\":1,\"columnNumber\":1,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js line 62 > eval\",\"sourceId\":null,\"lineNumber\":10,\"columnNumber\":29,\"functionName\":null},{\"filename\":\"resource://testing-common/content-task.js\",\"sourceId\":null,\"lineNumber\":63,\"columnNumber\":29,\"functionName\":null}]}", "stacktrace": [ { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source24", "lineNumber": 1, "columnNumber": 1, @@ -286,7 +286,7 @@ stubPreparedMessages.set(`throw "tomato"`, new ConsoleMessage({ } ], "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "line": 1, "column": 1 @@ -307,7 +307,7 @@ stubPackets.set(`ReferenceError: asdf is not defined`, { "errorMessage": "ReferenceError: asdf is not defined", "errorMessageName": "JSMSG_NOT_DEFINED", "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default", - "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "sourceName": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "lineText": "", "lineNumber": 3, @@ -323,21 +323,21 @@ stubPackets.set(`ReferenceError: asdf is not defined`, { "private": false, "stacktrace": [ { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "lineNumber": 3, "columnNumber": 5, "functionName": "bar" }, { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "lineNumber": 6, "columnNumber": 8, "functionName": "foo" }, { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source25", "lineNumber": 9, "columnNumber": 6, @@ -371,7 +371,7 @@ stubPackets.set(`SyntaxError: redeclaration of let a`, { "errorMessage": "SyntaxError: redeclaration of let a", "errorMessageName": "JSMSG_REDECLARED_VAR", "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Redeclared_parameter?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default", - "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "sourceName": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "lineText": " let a, a;", "lineNumber": 2, @@ -405,7 +405,7 @@ stubPackets.set(`SyntaxError: redeclaration of let a`, { { "messageBody": "Previously declared at line 2, column 6", "frame": { - "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "source": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "line": 2, "column": 6 @@ -428,7 +428,7 @@ stubPackets.set(`TypeError longString message`, { "actor": "server1.conn0.child1/longString30" }, "errorMessageName": "", - "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "sourceName": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source26", "lineText": "", "lineNumber": 1, @@ -444,7 +444,7 @@ stubPackets.set(`TypeError longString message`, { "private": false, "stacktrace": [ { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source26", "lineNumber": 1, "columnNumber": 7, @@ -477,7 +477,7 @@ stubPackets.set(`throw ""`, { "pageError": { "errorMessage": "uncaught exception: ", "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION", - "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "sourceName": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "lineText": "", "lineNumber": 1, @@ -493,7 +493,7 @@ stubPackets.set(`throw ""`, { "private": false, "stacktrace": [ { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source24", "lineNumber": 1, "columnNumber": 1, @@ -526,7 +526,7 @@ stubPackets.set(`throw "tomato"`, { "pageError": { "errorMessage": "uncaught exception: tomato", "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION", - "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "sourceName": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": null, "lineText": "", "lineNumber": 1, @@ -542,7 +542,7 @@ stubPackets.set(`throw "tomato"`, { "private": false, "stacktrace": [ { - "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html", + "filename": "http://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html", "sourceId": "server1.conn0.child1/source24", "lineNumber": 1, "columnNumber": 1, diff --git a/devtools/client/webconsole/test/helpers.js b/devtools/client/webconsole/test/node/helpers.js similarity index 98% rename from devtools/client/webconsole/test/helpers.js rename to devtools/client/webconsole/test/node/helpers.js index 96632fab9609..84f272fc6e76 100644 --- a/devtools/client/webconsole/test/helpers.js +++ b/devtools/client/webconsole/test/node/helpers.js @@ -10,7 +10,7 @@ const { } = require("devtools/client/webconsole/utils/id-generator"); const { stubPackets, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); const { getAllMessagesById, } = require("devtools/client/webconsole/selectors/messages"); diff --git a/devtools/client/webconsole/test/middleware/.eslintrc.js b/devtools/client/webconsole/test/node/middleware/.eslintrc.js similarity index 100% rename from devtools/client/webconsole/test/middleware/.eslintrc.js rename to devtools/client/webconsole/test/node/middleware/.eslintrc.js diff --git a/devtools/client/webconsole/test/middleware/debounce.test.js b/devtools/client/webconsole/test/node/middleware/debounce.test.js similarity index 100% rename from devtools/client/webconsole/test/middleware/debounce.test.js rename to devtools/client/webconsole/test/node/middleware/debounce.test.js diff --git a/devtools/client/webconsole/test/mocha-test-setup.js b/devtools/client/webconsole/test/node/mocha-test-setup.js similarity index 94% rename from devtools/client/webconsole/test/mocha-test-setup.js rename to devtools/client/webconsole/test/node/mocha-test-setup.js index 841067689a19..9eac33c673a4 100644 --- a/devtools/client/webconsole/test/mocha-test-setup.js +++ b/devtools/client/webconsole/test/node/mocha-test-setup.js @@ -5,7 +5,7 @@ "use strict"; -const mcRoot = `${__dirname}/../../../../`; +const mcRoot = `${__dirname}/../../../../../`; const getModule = mcPath => `module.exports = require("${mcRoot}${mcPath}");`; const { @@ -39,7 +39,7 @@ global.loader = { if (path === "devtools/shared/async-storage") { global[ name - ] = require("devtools/client/webconsole/test/fixtures/async-storage"); + ] = require("devtools/client/webconsole/test/node/fixtures/async-storage"); } const excluded = [ "Debugger", @@ -112,10 +112,12 @@ requireHacker.global_hook("default", (path, module) => { switch (path) { case "devtools/shared/l10n": return getModule( - "devtools/client/webconsole/test/fixtures/LocalizationHelper" + "devtools/client/webconsole/test/node/fixtures/LocalizationHelper" ); case "devtools/shared/plural-form": - return getModule("devtools/client/webconsole/test/fixtures/PluralForm"); + return getModule( + "devtools/client/webconsole/test/node/fixtures/PluralForm" + ); case "Services": case "Services.default": return `module.exports = require("devtools-modules/src/Services")`; diff --git a/devtools/client/webconsole/test/node/moz.build b/devtools/client/webconsole/test/node/moz.build new file mode 100644 index 000000000000..74acdd3634fe --- /dev/null +++ b/devtools/client/webconsole/test/node/moz.build @@ -0,0 +1,8 @@ +# vim: set filetype=python: +# 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/. + +DIRS += [ + 'fixtures' +] \ No newline at end of file diff --git a/devtools/client/webconsole/test/package.json b/devtools/client/webconsole/test/node/package.json similarity index 75% rename from devtools/client/webconsole/test/package.json rename to devtools/client/webconsole/test/node/package.json index a35bcaf4242d..fa49324aa3cb 100644 --- a/devtools/client/webconsole/test/package.json +++ b/devtools/client/webconsole/test/node/package.json @@ -14,8 +14,8 @@ " * Finally we require mocha-test-setup where we configure Enzyme and", " intercept require() calls with require-hacker and modify them if needed." ], - "test": "mocha \"./{,@(components|middleware|store|utils)/**/}*.test.js\" -r mock-local-storage -r jsdom-global/register -r ./mocha-test-setup.js", - "test-ci": "mocha \"./{,@(components|middleware|store|utils)/**/}*.test.js\" -r mock-local-storage -r jsdom-global/register -r ./mocha-test-setup.js --reporter json" + "test": "mocha \"./{,!(node_modules)/**}/*.test.js\" -r mock-local-storage -r jsdom-global/register -r ./mocha-test-setup.js", + "test-ci": "mocha \"./{,!(node_modules)/**}/*.test.js\" -r mock-local-storage -r jsdom-global/register -r ./mocha-test-setup.js --reporter json" }, "dependencies": { "devtools-modules": "0.0.37", diff --git a/devtools/client/webconsole/test/store/.eslintrc.js b/devtools/client/webconsole/test/node/store/.eslintrc.js similarity index 100% rename from devtools/client/webconsole/test/store/.eslintrc.js rename to devtools/client/webconsole/test/node/store/.eslintrc.js diff --git a/devtools/client/webconsole/test/store/filters.test.js b/devtools/client/webconsole/test/node/store/filters.test.js similarity index 98% rename from devtools/client/webconsole/test/store/filters.test.js rename to devtools/client/webconsole/test/node/store/filters.test.js index e2a6537fbc29..dd531afed86c 100644 --- a/devtools/client/webconsole/test/store/filters.test.js +++ b/devtools/client/webconsole/test/node/store/filters.test.js @@ -17,14 +17,14 @@ const { const { setupStore, getFiltersPrefs, -} = require("devtools/client/webconsole/test/helpers"); +} = require("devtools/client/webconsole/test/node/helpers"); const { FILTERS, PREFS } = require("devtools/client/webconsole/constants"); const { stubPackets, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); describe("Filtering", () => { let store; diff --git a/devtools/client/webconsole/test/store/hidden-messages.test.js b/devtools/client/webconsole/test/node/store/hidden-messages.test.js similarity index 98% rename from devtools/client/webconsole/test/store/hidden-messages.test.js rename to devtools/client/webconsole/test/node/store/hidden-messages.test.js index e338ef0575d5..7beab9636119 100644 --- a/devtools/client/webconsole/test/store/hidden-messages.test.js +++ b/devtools/client/webconsole/test/node/store/hidden-messages.test.js @@ -9,11 +9,11 @@ const actions = require("devtools/client/webconsole/actions/index"); const { getFilteredMessagesCount, } = require("devtools/client/webconsole/selectors/messages"); -const { setupStore } = require("devtools/client/webconsole/test/helpers"); +const { setupStore } = require("devtools/client/webconsole/test/node/helpers"); const { FILTERS } = require("devtools/client/webconsole/constants"); const { stubPackets, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); describe("Filtering - Hidden messages", () => { let store; diff --git a/devtools/client/webconsole/test/store/messages.test.js b/devtools/client/webconsole/test/node/store/messages.test.js similarity index 99% rename from devtools/client/webconsole/test/store/messages.test.js rename to devtools/client/webconsole/test/node/store/messages.test.js index 1f0e4f1e408b..87a17987f263 100644 --- a/devtools/client/webconsole/test/store/messages.test.js +++ b/devtools/client/webconsole/test/node/store/messages.test.js @@ -23,11 +23,11 @@ const { getMessageAt, setupActions, setupStore, -} = require("devtools/client/webconsole/test/helpers"); +} = require("devtools/client/webconsole/test/node/helpers"); const { stubPackets, stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); const { MESSAGE_TYPE } = require("devtools/client/webconsole/constants"); const expect = require("expect"); diff --git a/devtools/client/webconsole/test/store/network-messages.test.js b/devtools/client/webconsole/test/node/store/network-messages.test.js similarity index 94% rename from devtools/client/webconsole/test/store/network-messages.test.js rename to devtools/client/webconsole/test/node/store/network-messages.test.js index 17b3431bd01a..0b60654a4796 100644 --- a/devtools/client/webconsole/test/store/network-messages.test.js +++ b/devtools/client/webconsole/test/node/store/network-messages.test.js @@ -9,10 +9,10 @@ const { setupActions, setupStore, clonePacket, -} = require("devtools/client/webconsole/test/helpers"); +} = require("devtools/client/webconsole/test/node/helpers"); const { stubPackets, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); const expect = require("expect"); diff --git a/devtools/client/webconsole/test/store/private-messages.test.js b/devtools/client/webconsole/test/node/store/private-messages.test.js similarity index 97% rename from devtools/client/webconsole/test/store/private-messages.test.js rename to devtools/client/webconsole/test/node/store/private-messages.test.js index dd9f47f22f8a..c2e5c03843a7 100644 --- a/devtools/client/webconsole/test/store/private-messages.test.js +++ b/devtools/client/webconsole/test/node/store/private-messages.test.js @@ -21,10 +21,10 @@ const { getWebConsoleUiMock, setupActions, setupStore, -} = require("devtools/client/webconsole/test/helpers"); +} = require("devtools/client/webconsole/test/node/helpers"); const { stubPackets, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); const expect = require("expect"); diff --git a/devtools/client/webconsole/test/store/release-actors.test.js b/devtools/client/webconsole/test/node/store/release-actors.test.js similarity index 97% rename from devtools/client/webconsole/test/store/release-actors.test.js rename to devtools/client/webconsole/test/node/store/release-actors.test.js index 40ebf6423708..48e061854143 100644 --- a/devtools/client/webconsole/test/store/release-actors.test.js +++ b/devtools/client/webconsole/test/node/store/release-actors.test.js @@ -8,11 +8,11 @@ const { getWebConsoleUiMock, setupActions, setupStore, -} = require("devtools/client/webconsole/test/helpers"); +} = require("devtools/client/webconsole/test/node/helpers"); const { stubPackets, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); const expect = require("expect"); describe("Release actor enhancer:", () => { diff --git a/devtools/client/webconsole/test/store/search.test.js b/devtools/client/webconsole/test/node/store/search.test.js similarity index 99% rename from devtools/client/webconsole/test/store/search.test.js rename to devtools/client/webconsole/test/node/store/search.test.js index 23c44f2e9ee1..66630617ea39 100644 --- a/devtools/client/webconsole/test/store/search.test.js +++ b/devtools/client/webconsole/test/node/store/search.test.js @@ -9,7 +9,7 @@ const actions = require("devtools/client/webconsole/actions/index"); const { getVisibleMessages, } = require("devtools/client/webconsole/selectors/messages"); -const { setupStore } = require("devtools/client/webconsole/test/helpers"); +const { setupStore } = require("devtools/client/webconsole/test/node/helpers"); describe("Searching in grips", () => { let store; diff --git a/devtools/client/webconsole/test/store/ui.test.js b/devtools/client/webconsole/test/node/store/ui.test.js similarity index 97% rename from devtools/client/webconsole/test/store/ui.test.js rename to devtools/client/webconsole/test/node/store/ui.test.js index c16b80a945ec..ab6015000184 100644 --- a/devtools/client/webconsole/test/store/ui.test.js +++ b/devtools/client/webconsole/test/node/store/ui.test.js @@ -10,11 +10,11 @@ const { setupStore, getFirstMessage, getLastMessage, -} = require("devtools/client/webconsole/test/helpers"); +} = require("devtools/client/webconsole/test/node/helpers"); const { stubPackets, stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); describe("Testing UI", () => { let store; diff --git a/devtools/client/webconsole/test/utils/.eslintrc.js b/devtools/client/webconsole/test/node/utils/.eslintrc.js similarity index 100% rename from devtools/client/webconsole/test/utils/.eslintrc.js rename to devtools/client/webconsole/test/node/utils/.eslintrc.js diff --git a/devtools/client/webconsole/test/utils/getRepeatId.test.js b/devtools/client/webconsole/test/node/utils/getRepeatId.test.js similarity index 96% rename from devtools/client/webconsole/test/utils/getRepeatId.test.js rename to devtools/client/webconsole/test/node/utils/getRepeatId.test.js index 348152cbaaab..6d728107f8a2 100644 --- a/devtools/client/webconsole/test/utils/getRepeatId.test.js +++ b/devtools/client/webconsole/test/node/utils/getRepeatId.test.js @@ -5,7 +5,7 @@ const { getRepeatId } = require("devtools/client/webconsole/utils/messages"); const { stubPreparedMessages, -} = require("devtools/client/webconsole/test/fixtures/stubs/index"); +} = require("devtools/client/webconsole/test/node/fixtures/stubs/index"); const expect = require("expect"); diff --git a/devtools/client/webconsole/test/unit/.eslintrc.js b/devtools/client/webconsole/test/xpcshell/.eslintrc.js similarity index 100% rename from devtools/client/webconsole/test/unit/.eslintrc.js rename to devtools/client/webconsole/test/xpcshell/.eslintrc.js diff --git a/devtools/client/webconsole/test/unit/test_webconsole_l10n.js b/devtools/client/webconsole/test/xpcshell/test_webconsole_l10n.js similarity index 100% rename from devtools/client/webconsole/test/unit/test_webconsole_l10n.js rename to devtools/client/webconsole/test/xpcshell/test_webconsole_l10n.js diff --git a/devtools/client/webconsole/test/unit/xpcshell.ini b/devtools/client/webconsole/test/xpcshell/xpcshell.ini similarity index 100% rename from devtools/client/webconsole/test/unit/xpcshell.ini rename to devtools/client/webconsole/test/xpcshell/xpcshell.ini diff --git a/devtools/server/tests/unit/test_objectgrips-21.js b/devtools/server/tests/unit/test_objectgrips-21.js index c354e50257f5..3d2749e970a2 100644 --- a/devtools/server/tests/unit/test_objectgrips-21.js +++ b/devtools/server/tests/unit/test_objectgrips-21.js @@ -57,7 +57,7 @@ const defaults = { }; // Obtaining a CPOW here does not seem possible, so the CPOW test is in -// devtools/client/webconsole/test/browser_console.js +// devtools/client/webconsole/test/browser/browser_console.js // The following tests use a system principal debuggee. const systemPrincipalTests = [