--- a/.eslintignore
+++ b/.eslintignore
@@ -123,17 +123,17 @@ devtools/client/shared/widgets/*.jsm
devtools/client/storage/test/*.html
!devtools/client/storage/test/storage-cookies.html
!devtools/client/storage/test/storage-overflow.html
!devtools/client/storage/test/storage-search.html
!devtools/client/storage/test/storage-unsecured-iframe.html
!devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html
devtools/client/webaudioeditor/**
devtools/client/webconsole/old/net/**
-!devtools/client/webconsole/new-console-output/test/mochitest/**
+!devtools/client/webconsole/test/mochitest/**
devtools/client/webconsole/old/test/**
devtools/client/webconsole/old/webconsole.js
devtools/client/webide/**
!devtools/client/webide/components/webideCli.js
devtools/server/tests/browser/storage-*.html
!devtools/server/tests/browser/storage-unsecured-iframe.html
devtools/server/tests/browser/stylesheets-nested-iframes.html
devtools/server/tests/unit/xpcshell_debugging_script.js
@@ -177,18 +177,18 @@ devtools/client/sourceeditor/test/cm_mod
devtools/client/sourceeditor/test/codemirror/*
devtools/server/actors/utils/automation-timeline.js
# Ignore devtools files testing sourcemaps / code style
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/new-console-output/test/mochitest/code_bundle_nosource.js
-devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_invalidmap.js
+devtools/client/webconsole/test/mochitest/code_bundle_nosource.js
+devtools/client/webconsole/test/mochitest/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
# dom/ exclusions
dom/abort/**
dom/animation/**
dom/archivereader/**
--- a/devtools/client/.eslintrc.js
+++ b/devtools/client/.eslintrc.js
@@ -1,11 +1,12 @@
"use strict";
module.exports = {
+ "env": { "browser": true },
"globals": {
"define": true,
},
"rules": {
// See bug 1288147, the devtools front-end wants to be able to run in
// content privileged windows, where ownerGlobal doesn't exist.
"mozilla/use-ownerGlobal": "off",
}
--- a/devtools/client/shared/webpack/shims/jsterm-stub.js
+++ b/devtools/client/shared/webpack/shims/jsterm-stub.js
@@ -1,15 +1,15 @@
/* 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/. */
"use strict";
-const { ConsoleCommand } = require("devtools/client/webconsole/new-console-output/types");
+const { ConsoleCommand } = require("devtools/client/webconsole/types");
function JSTerm(webConsoleFrame) {
this.hud = webConsoleFrame;
this.hudId = this.hud.hudId;
this.historyLoaded = new Promise(r => {
r();
});
}
--- a/devtools/client/webconsole/README.md
+++ b/devtools/client/webconsole/README.md
@@ -3,18 +3,19 @@
The WebConsole (webconsole) shows you all the console API calls made by scripts and alerts
you when javascript errors are thrown by a script.
It can also display network logs, and you can evaluate expressions using the console
input, a.k.a. JsTerm. You can read more about it on [MDN](https://developer.mozilla.org/en-US/docs/Tools/Web_Console)
to learn all the features and how to use the tool.
## Old / New frontend
-The current console used in the toolbox is called the new frontend, and the code lives in
-the `new-console-output/` folder. The old console code is mainly located in `webconsole.js`.
+The current console used in the toolbox is called the new frontend, and the code lives at
+the root of the `devtools/client/webconsole/` folder.
+The old console code is located in the `devtools/client/webconsole/old` folder.
Both frontends use the same code for the console input, also called JsTerm (see `jsterm.js`).
The old frontend is still used for the Browser Console, but is planned to be removed in the
near future (see Bug 1381834).
## Run WebConsole in DevTools panel
If you want to build the WebConsole inside of the DevTools toolbox (Firefox Devtools Panels),
follow the [simple Firefox build](http://docs.firefox-dev.tools/getting-started/build.html)
@@ -78,24 +79,23 @@ Changes to those modules need to be done
Then, a new version of the modified package need to be released on npm so the version number
can be updated in WebConsole's `package.json`. Some modules have a release process,
look for `RELEASE.md` file in the module folder, or ask a maintainer if you are
unsure about the release process.
## Code Structure
Top level files are used to launch the WebConsole inside of the DevTools toolbox or run in
-the browser tab (experimental). The WebConsole source is mainly located in the
-`new-console-output/` folder, the same code base is used to run in both environments.
+the browser tab (experimental). The same code base is used to run in both environments.
### Run inside of the DevTools toolbox
Files used to run the WebConsole inside of the DevTools toolbox.
-* `new-console-output/main.js` called by devtools toolbox to launch the WebConsole panel.
+* `main.js` called by devtools toolbox to launch the WebConsole panel.
* `webconsole.html` panel UI and launch scripts.
### Run in the browser tab (experimental)
Files used to run the WebConsole in the browser tab
* `bin/` files to launch test server.
* `configs/` dev configs.
@@ -106,19 +106,19 @@ Files used to run the WebConsole in the
To run in the browser tab, the WebConsole needs to get some dependencies from npm module.
Check `package.json` to see all dependencies. Check `webpack.config.js` to find the module alias,
and check [devtools-core](https://github.com/devtools-html/devtools-core) packages to dive
into actual modules used by the WebConsole and other Devtools.
### UI
The WebConsole UI is built using [React](http://docs.firefox-dev.tools/frontend/react.html)
-components (in `new-console-output/components/`).
+components (in `components/`).
-The React application is rendered from `new-console-output/new-console-output-wrapper.js`.
+The React application is rendered from `new-console-output-wrapper.js`.
It contains 3 top components:
* **ConsoleOutput** (in `ConsoleOutput.js`) is the component where messages are rendered.
* **FilterBar** (in `FilterBar.js`) is the component for the filter bars (filter input and toggle buttons).
* **SideBar** (in `SideBar.js`) is the component that render the sidebar where objects can be placed in.
We prefer stateless component (defined by function) instead of stateful component
(defined by class) unless the component has to maintain its internal state.
@@ -143,9 +143,9 @@ The redux state is a plain javascript ob
prefs,
// Interface state (filter bar visible, sidebar visible, …)
ui,
}
```
### Tests
-[See new-console-output/test/README.md](new-console-output/test/README.md)
\ No newline at end of file
+[See test/README.md](test/README.md)
\ No newline at end of file
rename from devtools/client/webconsole/new-console-output/actions/filters.js
rename to devtools/client/webconsole/actions/filters.js
--- a/devtools/client/webconsole/new-console-output/actions/filters.js
+++ b/devtools/client/webconsole/actions/filters.js
@@ -1,27 +1,27 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* 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/. */
"use strict";
-const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
+const { getAllFilters } = require("devtools/client/webconsole/selectors/filters");
const {
FILTER_TEXT_SET,
FILTER_TOGGLE,
FILTERS_CLEAR,
DEFAULT_FILTERS_RESET,
PREFS,
FILTERS,
DEFAULT_FILTERS,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
function filterTextSet(text) {
return {
type: FILTER_TEXT_SET,
text
};
}
rename from devtools/client/webconsole/new-console-output/actions/index.js
rename to devtools/client/webconsole/actions/index.js
rename from devtools/client/webconsole/new-console-output/actions/messages.js
rename to devtools/client/webconsole/actions/messages.js
--- a/devtools/client/webconsole/new-console-output/actions/messages.js
+++ b/devtools/client/webconsole/actions/messages.js
@@ -3,18 +3,18 @@
/* 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/. */
"use strict";
const {
prepareMessage
-} = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { IdGenerator } = require("devtools/client/webconsole/new-console-output/utils/id-generator");
+} = require("devtools/client/webconsole/utils/messages");
+const { IdGenerator } = require("devtools/client/webconsole/utils/id-generator");
const { batchActions } = require("devtools/client/shared/redux/middleware/debounce");
const {
MESSAGES_ADD,
NETWORK_MESSAGE_UPDATE,
NETWORK_UPDATE_REQUEST,
MESSAGES_CLEAR,
MESSAGE_OPEN,
rename from devtools/client/webconsole/new-console-output/actions/moz.build
rename to devtools/client/webconsole/actions/moz.build
rename from devtools/client/webconsole/new-console-output/actions/ui.js
rename to devtools/client/webconsole/actions/ui.js
--- a/devtools/client/webconsole/new-console-output/actions/ui.js
+++ b/devtools/client/webconsole/actions/ui.js
@@ -1,29 +1,29 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* 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/. */
"use strict";
-const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
-const { getMessage } = require("devtools/client/webconsole/new-console-output/selectors/messages");
+const { getAllUi } = require("devtools/client/webconsole/selectors/ui");
+const { getMessage } = require("devtools/client/webconsole/selectors/messages");
const {
FILTER_BAR_TOGGLE,
INITIALIZE,
PERSIST_TOGGLE,
PREFS,
SELECT_NETWORK_MESSAGE_TAB,
SIDEBAR_CLOSE,
SHOW_OBJECT_IN_SIDEBAR,
TIMESTAMPS_TOGGLE,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
function filterBarToggle(show) {
return (dispatch, getState, {prefsService}) => {
dispatch({
type: FILTER_BAR_TOGGLE,
});
const {filterBarVisible} = getAllUi(getState());
prefsService.setBoolPref(PREFS.UI.FILTER_BAR, filterBarVisible);
rename from devtools/client/webconsole/new-console-output/components/CollapseButton.js
rename to devtools/client/webconsole/components/CollapseButton.js
--- a/devtools/client/webconsole/new-console-output/components/CollapseButton.js
+++ b/devtools/client/webconsole/components/CollapseButton.js
@@ -3,17 +3,17 @@
/* 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/. */
"use strict";
const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
const messageToggleDetails = l10n.getStr("messageToggleDetails");
function CollapseButton(props) {
const {
open,
onClick,
title = messageToggleDetails,
} = props;
rename from devtools/client/webconsole/new-console-output/components/ConsoleOutput.js
rename to devtools/client/webconsole/components/ConsoleOutput.js
--- a/devtools/client/webconsole/new-console-output/components/ConsoleOutput.js
+++ b/devtools/client/webconsole/components/ConsoleOutput.js
@@ -2,33 +2,33 @@
* 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/. */
"use strict";
const { Component, createFactory } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const { connect } = require("devtools/client/shared/redux/visibility-handler-connect");
-const {initialize} = require("devtools/client/webconsole/new-console-output/actions/ui");
+const {initialize} = require("devtools/client/webconsole/actions/ui");
const {
getAllMessagesById,
getAllMessagesUiById,
getAllMessagesTableDataById,
getAllNetworkMessagesUpdateById,
getVisibleMessages,
getAllRepeatById,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const MessageContainer = createFactory(require("devtools/client/webconsole/new-console-output/components/MessageContainer").MessageContainer);
+} = require("devtools/client/webconsole/selectors/messages");
+const MessageContainer = createFactory(require("devtools/client/webconsole/components/MessageContainer").MessageContainer);
const {
MESSAGE_TYPE,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
const {
getInitialMessageCountForViewport
-} = require("devtools/client/webconsole/new-console-output/utils/messages.js");
+} = require("devtools/client/webconsole/utils/messages.js");
class ConsoleOutput extends Component {
static get propTypes() {
return {
initialized: PropTypes.bool.isRequired,
messages: PropTypes.object.isRequired,
messagesUi: PropTypes.array.isRequired,
serviceContainer: PropTypes.shape({
rename from devtools/client/webconsole/new-console-output/components/ConsoleTable.js
rename to devtools/client/webconsole/components/ConsoleTable.js
--- a/devtools/client/webconsole/new-console-output/components/ConsoleTable.js
+++ b/devtools/client/webconsole/components/ConsoleTable.js
@@ -2,20 +2,20 @@
* 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/. */
"use strict";
const { Component, createFactory } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const ObjectClient = require("devtools/shared/client/object-client");
-const actions = require("devtools/client/webconsole/new-console-output/actions/messages");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const actions = require("devtools/client/webconsole/actions/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
const { MODE } = require("devtools/client/shared/components/reps/reps");
-const GripMessageBody = createFactory(require("devtools/client/webconsole/new-console-output/components/GripMessageBody"));
+const GripMessageBody = createFactory(require("devtools/client/webconsole/components/GripMessageBody"));
const TABLE_ROW_MAX_ITEMS = 1000;
const TABLE_COLUMN_MAX_ITEMS = 10;
class ConsoleTable extends Component {
static get propTypes() {
return {
dispatch: PropTypes.func.isRequired,
rename from devtools/client/webconsole/new-console-output/components/FilterBar.js
rename to devtools/client/webconsole/components/FilterBar.js
--- a/devtools/client/webconsole/new-console-output/components/FilterBar.js
+++ b/devtools/client/webconsole/components/FilterBar.js
@@ -2,29 +2,29 @@
* 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/. */
"use strict";
const { Component } = require("devtools/client/shared/vendor/react");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const { connect } = require("devtools/client/shared/vendor/react-redux");
-const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
-const { getFilteredMessagesCount } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { getAllFilters } = require("devtools/client/webconsole/selectors/filters");
+const { getFilteredMessagesCount } = require("devtools/client/webconsole/selectors/messages");
+const { getAllUi } = require("devtools/client/webconsole/selectors/ui");
+const actions = require("devtools/client/webconsole/actions/index");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
const { PluralForm } = require("devtools/shared/plural-form");
const {
DEFAULT_FILTERS,
FILTERS,
} = require("../constants");
-const FilterButton = require("devtools/client/webconsole/new-console-output/components/FilterButton");
-const FilterCheckbox = require("devtools/client/webconsole/new-console-output/components/FilterCheckbox");
+const FilterButton = require("devtools/client/webconsole/components/FilterButton");
+const FilterCheckbox = require("devtools/client/webconsole/components/FilterCheckbox");
class FilterBar extends Component {
static get propTypes() {
return {
dispatch: PropTypes.func.isRequired,
filter: PropTypes.object.isRequired,
serviceContainer: PropTypes.shape({
attachRefToHud: PropTypes.func.isRequired,
rename from devtools/client/webconsole/new-console-output/components/FilterButton.js
rename to devtools/client/webconsole/components/FilterButton.js
--- a/devtools/client/webconsole/new-console-output/components/FilterButton.js
+++ b/devtools/client/webconsole/components/FilterButton.js
@@ -1,16 +1,16 @@
/* 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/. */
"use strict";
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
+const actions = require("devtools/client/webconsole/actions/index");
FilterButton.displayName = "FilterButton";
FilterButton.propTypes = {
label: PropTypes.string.isRequired,
filterKey: PropTypes.string.isRequired,
active: PropTypes.bool.isRequired,
dispatch: PropTypes.func.isRequired,
rename from devtools/client/webconsole/new-console-output/components/FilterCheckbox.js
rename to devtools/client/webconsole/components/FilterCheckbox.js
rename from devtools/client/webconsole/new-console-output/components/GripMessageBody.js
rename to devtools/client/webconsole/components/GripMessageBody.js
--- a/devtools/client/webconsole/new-console-output/components/GripMessageBody.js
+++ b/devtools/client/webconsole/components/GripMessageBody.js
@@ -7,17 +7,17 @@
"use strict";
// React
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const {
MESSAGE_TYPE,
JSTERM_COMMANDS,
} = require("../constants");
-const { getObjectInspector } = require("devtools/client/webconsole/new-console-output/utils/object-inspector");
+const { getObjectInspector } = require("devtools/client/webconsole/utils/object-inspector");
const reps = require("devtools/client/shared/components/reps/reps");
const { MODE } = reps;
GripMessageBody.displayName = "GripMessageBody";
GripMessageBody.propTypes = {
grip: PropTypes.oneOfType([
rename from devtools/client/webconsole/new-console-output/components/Message.js
rename to devtools/client/webconsole/components/Message.js
--- a/devtools/client/webconsole/new-console-output/components/Message.js
+++ b/devtools/client/webconsole/components/Message.js
@@ -6,29 +6,29 @@
"use strict";
// React & Redux
const { Component, createFactory } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const { l10n } =
- require("devtools/client/webconsole/new-console-output/utils/messages");
+ require("devtools/client/webconsole/utils/messages");
const actions =
- require("devtools/client/webconsole/new-console-output/actions/index");
+ require("devtools/client/webconsole/actions/index");
const { MESSAGE_SOURCE, MESSAGE_TYPE } =
- require("devtools/client/webconsole/new-console-output/constants");
+ require("devtools/client/webconsole/constants");
const CollapseButton =
- require("devtools/client/webconsole/new-console-output/components/CollapseButton");
+ require("devtools/client/webconsole/components/CollapseButton");
const { MessageIndent } =
- require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+ require("devtools/client/webconsole/components/MessageIndent");
const MessageIcon =
- require("devtools/client/webconsole/new-console-output/components/MessageIcon");
+ require("devtools/client/webconsole/components/MessageIcon");
const MessageRepeat =
- require("devtools/client/webconsole/new-console-output/components/MessageRepeat");
+ require("devtools/client/webconsole/components/MessageRepeat");
const FrameView = createFactory(require("devtools/client/shared/components/Frame"));
const StackTrace = createFactory(require("devtools/client/shared/components/StackTrace"));
class Message extends Component {
static get propTypes() {
return {
open: PropTypes.bool,
collapsible: PropTypes.bool,
rename from devtools/client/webconsole/new-console-output/components/MessageContainer.js
rename to devtools/client/webconsole/components/MessageContainer.js
--- a/devtools/client/webconsole/new-console-output/components/MessageContainer.js
+++ b/devtools/client/webconsole/components/MessageContainer.js
@@ -8,17 +8,17 @@
// React & Redux
const { Component } = require("devtools/client/shared/vendor/react");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const {
MESSAGE_SOURCE,
MESSAGE_TYPE
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
const componentMap = new Map([
["ConsoleApiCall", require("./message-types/ConsoleApiCall")],
["ConsoleCommand", require("./message-types/ConsoleCommand")],
["DefaultRenderer", require("./message-types/DefaultRenderer")],
["EvaluationResult", require("./message-types/EvaluationResult")],
["NetworkEventMessage", require("./message-types/NetworkEventMessage")],
["PageError", require("./message-types/PageError")]
rename from devtools/client/webconsole/new-console-output/components/MessageIcon.js
rename to devtools/client/webconsole/components/MessageIcon.js
--- a/devtools/client/webconsole/new-console-output/components/MessageIcon.js
+++ b/devtools/client/webconsole/components/MessageIcon.js
@@ -3,17 +3,17 @@
/* 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/. */
"use strict";
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const {l10n} = require("devtools/client/webconsole/new-console-output/utils/messages");
+const {l10n} = require("devtools/client/webconsole/utils/messages");
// Store common icons so they can be used without recreating the element
// during render.
const CONSTANT_ICONS = {
"error": getIconElement("level.error"),
"warn": getIconElement("level.warn"),
"info": getIconElement("level.info"),
"log": getIconElement("level.log"),
rename from devtools/client/webconsole/new-console-output/components/MessageIndent.js
rename to devtools/client/webconsole/components/MessageIndent.js
rename from devtools/client/webconsole/new-console-output/components/MessageRepeat.js
rename to devtools/client/webconsole/components/MessageRepeat.js
--- a/devtools/client/webconsole/new-console-output/components/MessageRepeat.js
+++ b/devtools/client/webconsole/components/MessageRepeat.js
@@ -5,17 +5,17 @@
* 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/. */
"use strict";
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const { PluralForm } = require("devtools/shared/plural-form");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
const messageRepeatsTooltip = l10n.getStr("messageRepeats.tooltip2");
MessageRepeat.displayName = "MessageRepeat";
MessageRepeat.propTypes = {
repeat: PropTypes.number.isRequired
};
rename from devtools/client/webconsole/new-console-output/components/SideBar.js
rename to devtools/client/webconsole/components/SideBar.js
--- a/devtools/client/webconsole/new-console-output/components/SideBar.js
+++ b/devtools/client/webconsole/components/SideBar.js
@@ -2,18 +2,18 @@
* 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/. */
"use strict";
const { Component, createFactory } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const { connect } = require("devtools/client/shared/vendor/react-redux");
-const { getObjectInspector } = require("devtools/client/webconsole/new-console-output/utils/object-inspector");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
+const { getObjectInspector } = require("devtools/client/webconsole/utils/object-inspector");
+const actions = require("devtools/client/webconsole/actions/index");
const SplitBox = createFactory(require("devtools/client/shared/components/splitter/SplitBox"));
const reps = require("devtools/client/shared/components/reps/reps");
const { MODE } = reps;
class SideBar extends Component {
static get propTypes() {
return {
rename from devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall.js
rename to devtools/client/webconsole/components/message-types/ConsoleApiCall.js
--- a/devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall.js
+++ b/devtools/client/webconsole/components/message-types/ConsoleApiCall.js
@@ -5,21 +5,21 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
// React & Redux
const { createFactory } = require("devtools/client/shared/vendor/react");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const GripMessageBody = require("devtools/client/webconsole/new-console-output/components/GripMessageBody");
-const ConsoleTable = createFactory(require("devtools/client/webconsole/new-console-output/components/ConsoleTable"));
-const {isGroupType, l10n} = require("devtools/client/webconsole/new-console-output/utils/messages");
+const GripMessageBody = require("devtools/client/webconsole/components/GripMessageBody");
+const ConsoleTable = createFactory(require("devtools/client/webconsole/components/ConsoleTable"));
+const {isGroupType, l10n} = require("devtools/client/webconsole/utils/messages");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
ConsoleApiCall.displayName = "ConsoleApiCall";
ConsoleApiCall.propTypes = {
dispatch: PropTypes.func.isRequired,
message: PropTypes.object.isRequired,
open: PropTypes.bool,
serviceContainer: PropTypes.object.isRequired,
rename from devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand.js
rename to devtools/client/webconsole/components/message-types/ConsoleCommand.js
--- a/devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand.js
+++ b/devtools/client/webconsole/components/message-types/ConsoleCommand.js
@@ -4,17 +4,17 @@
* 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/. */
"use strict";
// React & Redux
const { createFactory } = require("devtools/client/shared/vendor/react");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
ConsoleCommand.displayName = "ConsoleCommand";
ConsoleCommand.propTypes = {
message: PropTypes.object.isRequired,
timestampsVisible: PropTypes.bool.isRequired,
serviceContainer: PropTypes.object,
};
rename from devtools/client/webconsole/new-console-output/components/message-types/DefaultRenderer.js
rename to devtools/client/webconsole/components/message-types/DefaultRenderer.js
rename from devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult.js
rename to devtools/client/webconsole/components/message-types/EvaluationResult.js
--- a/devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult.js
+++ b/devtools/client/webconsole/components/message-types/EvaluationResult.js
@@ -4,18 +4,18 @@
* 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/. */
"use strict";
// React & Redux
const { createFactory } = require("devtools/client/shared/vendor/react");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
-const GripMessageBody = require("devtools/client/webconsole/new-console-output/components/GripMessageBody");
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
+const GripMessageBody = require("devtools/client/webconsole/components/GripMessageBody");
EvaluationResult.displayName = "EvaluationResult";
EvaluationResult.propTypes = {
dispatch: PropTypes.func.isRequired,
message: PropTypes.object.isRequired,
timestampsVisible: PropTypes.bool.isRequired,
serviceContainer: PropTypes.object,
rename from devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage.js
rename to devtools/client/webconsole/components/message-types/NetworkEventMessage.js
--- a/devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage.js
+++ b/devtools/client/webconsole/components/message-types/NetworkEventMessage.js
@@ -5,19 +5,19 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
// React & Redux
const { createFactory } = require("devtools/client/shared/vendor/react");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
+const actions = require("devtools/client/webconsole/actions/index");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
const TabboxPanel = createFactory(require("devtools/client/netmonitor/src/components/TabboxPanel"));
const { getHTTPStatusCodeURL } = require("devtools/client/netmonitor/src/utils/mdn-utils");
const LEARN_MORE = l10n.getStr("webConsoleMoreInfoLabel");
NetworkEventMessage.displayName = "NetworkEventMessage";
NetworkEventMessage.propTypes = {
message: PropTypes.object.isRequired,
rename from devtools/client/webconsole/new-console-output/components/message-types/PageError.js
rename to devtools/client/webconsole/components/message-types/PageError.js
--- a/devtools/client/webconsole/new-console-output/components/message-types/PageError.js
+++ b/devtools/client/webconsole/components/message-types/PageError.js
@@ -4,17 +4,17 @@
* 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/. */
"use strict";
// React & Redux
const { createFactory } = require("devtools/client/shared/vendor/react");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
PageError.displayName = "PageError";
PageError.propTypes = {
message: PropTypes.object.isRequired,
open: PropTypes.bool,
timestampsVisible: PropTypes.bool.isRequired,
serviceContainer: PropTypes.object,
rename from devtools/client/webconsole/new-console-output/components/message-types/moz.build
rename to devtools/client/webconsole/components/message-types/moz.build
rename from devtools/client/webconsole/new-console-output/components/moz.build
rename to devtools/client/webconsole/components/moz.build
rename from devtools/client/webconsole/new-console-output/constants.js
rename to devtools/client/webconsole/constants.js
--- a/devtools/client/webconsole/jsterm.js
+++ b/devtools/client/webconsole/jsterm.js
@@ -475,17 +475,17 @@ JSTerm.prototype = {
let selectedNodeActor = null;
let inspectorSelection = this.hud.owner.getInspectorSelection();
if (inspectorSelection && inspectorSelection.nodeFront) {
selectedNodeActor = inspectorSelection.nodeFront.actorID;
}
if (this.hud.NEW_CONSOLE_OUTPUT_ENABLED) {
- const { ConsoleCommand } = require("devtools/client/webconsole/new-console-output/types");
+ const { ConsoleCommand } = require("devtools/client/webconsole/types");
let message = new ConsoleCommand({
messageText: executeString,
});
this.hud.proxy.dispatchMessageAdd(message);
} else {
let message = new Messages.Simple(executeString, {
category: "input",
severity: "log",
--- a/devtools/client/webconsole/local-dev/index.js
+++ b/devtools/client/webconsole/local-dev/index.js
@@ -35,17 +35,17 @@ pref("devtools.webconsole.filter.net", f
pref("devtools.webconsole.filter.netxhr", false);
pref("devtools.webconsole.ui.filterbar", false);
pref("devtools.webconsole.inputHistoryCount", 50);
pref("devtools.webconsole.persistlog", false);
pref("devtools.webconsole.timestampMessages", false);
pref("devtools.webconsole.autoMultiline", true);
pref("devtools.webconsole.sidebarToggle", true);
-const NewConsoleOutputWrapper = require("../new-console-output/new-console-output-wrapper");
+const NewConsoleOutputWrapper = require("../new-console-output-wrapper");
const NewWebConsoleFrame = require("../new-webconsole").NewWebConsoleFrame;
// Copied from netmonitor/index.js:
window.addEventListener("DOMContentLoaded", () => {
for (let link of document.head.querySelectorAll("link")) {
link.href = link.href.replace(/(resource|chrome)\:\/\//, "/");
}
rename from devtools/client/webconsole/new-console-output/main.js
rename to devtools/client/webconsole/main.js
--- a/devtools/client/webconsole/new-console-output/main.js
+++ b/devtools/client/webconsole/main.js
@@ -8,15 +8,15 @@
const { BrowserLoader } = ChromeUtils.import("resource://devtools/client/shared/browser-loader.js", {});
this.NewConsoleOutput = function(parentNode, jsterm, toolbox, owner, serviceContainer) {
// Initialize module loader and load all modules of the new inline
// preview feature. The entire code-base doesn't need any extra
// privileges and runs entirely in content scope.
let NewConsoleOutputWrapper = BrowserLoader({
- baseURI: "resource://devtools/client/webconsole/new-console-output/",
+ baseURI: "resource://devtools/client/webconsole/",
window
}).require("./new-console-output-wrapper");
return new NewConsoleOutputWrapper(
parentNode, jsterm, toolbox, owner, serviceContainer);
};
--- a/devtools/client/webconsole/moz.build
+++ b/devtools/client/webconsole/moz.build
@@ -1,22 +1,32 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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 += [
- 'new-console-output',
+ 'actions',
+ 'components',
'old',
+ 'reducers',
+ 'selectors',
+ 'test',
+ 'utils',
]
DevToolsModules(
'console-commands.js',
+ 'constants.js',
'hudservice.js',
'jsterm.js',
+ 'main.js',
+ 'new-console-output-wrapper.js',
'new-webconsole.js',
'panel.js',
+ 'store.js',
+ 'types.js',
'utils.js',
'webconsole-connection-proxy.js',
'webconsole-l10n.js',
)
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Developer Tools: Console')
rename from devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
rename to devtools/client/webconsole/new-console-output-wrapper.js
--- a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+++ b/devtools/client/webconsole/new-console-output-wrapper.js
@@ -3,26 +3,26 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { createElement, createFactory } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const ReactDOM = require("devtools/client/shared/vendor/react-dom");
const { Provider } = require("devtools/client/shared/vendor/react-redux");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { createContextMenu } = require("devtools/client/webconsole/new-console-output/utils/context-menu");
-const { configureStore } = require("devtools/client/webconsole/new-console-output/store");
-const { isPacketPrivate } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { getAllMessagesById, getMessage } = require("devtools/client/webconsole/new-console-output/selectors/messages");
+const actions = require("devtools/client/webconsole/actions/index");
+const { createContextMenu } = require("devtools/client/webconsole/utils/context-menu");
+const { configureStore } = require("devtools/client/webconsole/store");
+const { isPacketPrivate } = require("devtools/client/webconsole/utils/messages");
+const { getAllMessagesById, getMessage } = require("devtools/client/webconsole/selectors/messages");
const EventEmitter = require("devtools/shared/event-emitter");
-const ConsoleOutput = createFactory(require("devtools/client/webconsole/new-console-output/components/ConsoleOutput"));
-const FilterBar = createFactory(require("devtools/client/webconsole/new-console-output/components/FilterBar"));
-const SideBar = createFactory(require("devtools/client/webconsole/new-console-output/components/SideBar"));
+const ConsoleOutput = createFactory(require("devtools/client/webconsole/components/ConsoleOutput"));
+const FilterBar = createFactory(require("devtools/client/webconsole/components/FilterBar"));
+const SideBar = createFactory(require("devtools/client/webconsole/components/SideBar"));
let store = null;
function NewConsoleOutputWrapper(parentNode, jsterm, toolbox, owner, document) {
EventEmitter.decorate(this);
this.parentNode = parentNode;
this.jsterm = jsterm;
deleted file mode 100644
--- a/devtools/client/webconsole/new-console-output/.eslintrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = {
- "env": { "browser": true }
-};
deleted file mode 100644
--- a/devtools/client/webconsole/new-console-output/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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 += [
- 'actions',
- 'components',
- 'reducers',
- 'selectors',
- 'test',
- 'utils',
-]
-
-DevToolsModules(
- 'constants.js',
- 'main.js',
- 'new-console-output-wrapper.js',
- 'store.js',
- 'types.js',
-)
--- a/devtools/client/webconsole/new-webconsole.js
+++ b/devtools/client/webconsole/new-webconsole.js
@@ -10,17 +10,17 @@ const {Utils: WebConsoleUtils} = require
const EventEmitter = require("devtools/shared/event-emitter");
const promise = require("promise");
const defer = require("devtools/shared/defer");
const Services = require("Services");
const { gDevTools } = require("devtools/client/framework/devtools");
const { JSTerm } = require("devtools/client/webconsole/jsterm");
const { WebConsoleConnectionProxy } = require("devtools/client/webconsole/webconsole-connection-proxy");
const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
loader.lazyRequireGetter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm", true);
const ZoomKeys = require("devtools/client/shared/zoom-keys");
const PREF_MESSAGE_TIMESTAMP = "devtools.webconsole.timestampMessages";
const PREF_PERSISTLOG = "devtools.webconsole.persistlog";
const PREF_SIDEBAR_ENABLED = "devtools.webconsole.sidebarToggle";
--- a/devtools/client/webconsole/old/webconsole.xul
+++ b/devtools/client/webconsole/old/webconsole.xul
@@ -21,17 +21,17 @@
fullscreenbutton="true"
title="&window.title;"
windowtype="devtools:webconsole"
width="900" height="350"
persist="screenX screenY width height sizemode">
<script type="application/javascript"
src="chrome://devtools/content/shared/theme-switching.js"/>
<script type="application/javascript"
- src="resource://devtools/client/webconsole/new-console-output/main.js"/>
+ src="resource://devtools/client/webconsole/main.js"/>
<script type="text/javascript" src="chrome://global/content/globalOverlay.js"/>
<script type="text/javascript" src="resource://devtools/client/webconsole/old/net/main.js"/>
<script type="text/javascript"><![CDATA[
function goUpdateConsoleCommands() {
goUpdateCommand("consoleCmd_openURL");
goUpdateCommand("consoleCmd_copyURL");
}
// ]]></script>
rename from devtools/client/webconsole/new-console-output/reducers/filters.js
rename to devtools/client/webconsole/reducers/filters.js
--- a/devtools/client/webconsole/new-console-output/reducers/filters.js
+++ b/devtools/client/webconsole/reducers/filters.js
@@ -1,16 +1,16 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* 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/. */
"use strict";
-const constants = require("devtools/client/webconsole/new-console-output/constants");
+const constants = require("devtools/client/webconsole/constants");
const FilterState = (overrides) => Object.freeze(
cloneState(constants.DEFAULT_FILTERS_VALUES, overrides)
);
function filters(state = FilterState(), action) {
switch (action.type) {
case constants.FILTER_TOGGLE:
rename from devtools/client/webconsole/new-console-output/reducers/index.js
rename to devtools/client/webconsole/reducers/index.js
rename from devtools/client/webconsole/new-console-output/reducers/messages.js
rename to devtools/client/webconsole/reducers/messages.js
--- a/devtools/client/webconsole/new-console-output/reducers/messages.js
+++ b/devtools/client/webconsole/reducers/messages.js
@@ -3,19 +3,19 @@
/* 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/. */
"use strict";
const {
isGroupType,
l10n,
-} = require("devtools/client/webconsole/new-console-output/utils/messages");
+} = require("devtools/client/webconsole/utils/messages");
-const constants = require("devtools/client/webconsole/new-console-output/constants");
+const constants = require("devtools/client/webconsole/constants");
const {
DEFAULT_FILTERS,
FILTERS,
MESSAGE_TYPE,
MESSAGE_SOURCE,
} = constants;
const { getGripPreviewItems } = require("devtools/client/shared/components/reps/reps");
const { getSourceNames } = require("devtools/client/shared/source-utils");
rename from devtools/client/webconsole/new-console-output/reducers/moz.build
rename to devtools/client/webconsole/reducers/moz.build
rename from devtools/client/webconsole/new-console-output/reducers/prefs.js
rename to devtools/client/webconsole/reducers/prefs.js
rename from devtools/client/webconsole/new-console-output/reducers/ui.js
rename to devtools/client/webconsole/reducers/ui.js
--- a/devtools/client/webconsole/new-console-output/reducers/ui.js
+++ b/devtools/client/webconsole/reducers/ui.js
@@ -9,17 +9,17 @@ const {
FILTER_BAR_TOGGLE,
INITIALIZE,
PERSIST_TOGGLE,
SELECT_NETWORK_MESSAGE_TAB,
SIDEBAR_CLOSE,
SHOW_OBJECT_IN_SIDEBAR,
TIMESTAMPS_TOGGLE,
MESSAGES_CLEAR,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
const {
PANELS,
} = require("devtools/client/netmonitor/src/constants");
const UiState = (overrides) => Object.freeze(Object.assign({
filterBarVisible: false,
initialized: false,
rename from devtools/client/webconsole/new-console-output/selectors/filters.js
rename to devtools/client/webconsole/selectors/filters.js
rename from devtools/client/webconsole/new-console-output/selectors/messages.js
rename to devtools/client/webconsole/selectors/messages.js
rename from devtools/client/webconsole/new-console-output/selectors/moz.build
rename to devtools/client/webconsole/selectors/moz.build
rename from devtools/client/webconsole/new-console-output/selectors/prefs.js
rename to devtools/client/webconsole/selectors/prefs.js
rename from devtools/client/webconsole/new-console-output/selectors/ui.js
rename to devtools/client/webconsole/selectors/ui.js
rename from devtools/client/webconsole/new-console-output/store.js
rename to devtools/client/webconsole/store.js
--- a/devtools/client/webconsole/new-console-output/store.js
+++ b/devtools/client/webconsole/store.js
@@ -1,43 +1,43 @@
/* 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/. */
"use strict";
-const {FilterState} = require("devtools/client/webconsole/new-console-output/reducers/filters");
-const {PrefState} = require("devtools/client/webconsole/new-console-output/reducers/prefs");
-const {UiState} = require("devtools/client/webconsole/new-console-output/reducers/ui");
+const {FilterState} = require("devtools/client/webconsole/reducers/filters");
+const {PrefState} = require("devtools/client/webconsole/reducers/prefs");
+const {UiState} = require("devtools/client/webconsole/reducers/ui");
const {
applyMiddleware,
compose,
createStore
} = require("devtools/client/shared/vendor/redux");
const {
BATCH_ACTIONS
} = require("devtools/client/shared/redux/middleware/debounce");
const {
MESSAGE_OPEN,
MESSAGES_ADD,
MESSAGES_CLEAR,
PRIVATE_MESSAGES_CLEAR,
REMOVED_ACTORS_CLEAR,
NETWORK_MESSAGE_UPDATE,
PREFS,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
const { reducers } = require("./reducers/index");
const {
getMessage,
getAllMessagesUiById,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
+} = require("devtools/client/webconsole/selectors/messages");
const DataProvider = require("devtools/client/netmonitor/src/connector/firefox-data-provider");
const {
getAllNetworkMessagesUpdateById,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const {getPrefsService} = require("devtools/client/webconsole/new-console-output/utils/prefs");
+} = require("devtools/client/webconsole/selectors/messages");
+const {getPrefsService} = require("devtools/client/webconsole/utils/prefs");
/**
* Create and configure store for the Console panel. This is the place
* where various enhancers and middleware can be registered.
*/
function configureStore(hud, options = {}) {
const prefsService = getPrefsService(hud);
const {
rename from devtools/client/webconsole/new-console-output/test/.eslintrc.mocha.js
rename to devtools/client/webconsole/test/.eslintrc.mocha.js
rename from devtools/client/webconsole/new-console-output/test/README.md
rename to devtools/client/webconsole/test/README.md
--- a/devtools/client/webconsole/new-console-output/test/README.md
+++ b/devtools/client/webconsole/test/README.md
@@ -1,34 +1,34 @@
# 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.
-Mochitests are located in `devtools/client/webconsole/new-console-output/test/mochitest/` and can be run with the following command:
+Mochitests are located in `devtools/client/webconsole/test/mochitest/` and can be run with the following command:
```sh
-./mach test devtools/client/webconsole/new-console-output/test/mochitest/
+./mach test devtools/client/webconsole/test/mochitest/
```
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.
-These tests are located in `new-console-output/test/components/` and `new-console-output/test/store/`, and can be run with the following command:
+These tests are located in `test/components/` and `test/store/`, and can be run with the following command:
```sh
-devtools/client/webconsole/new-console-output/test/ && npm install && npm test
+devtools/client/webconsole/test/ && npm install && npm test
```
or using yarn with
```sh
-devtools/client/webconsole/new-console-output/test/ && yarn && yarn test
+devtools/client/webconsole/test/ && yarn && yarn test
```
**⚠️️️️️️️️️️ These tests are not ran on CI at the moment. You need to run them manually when working on the console. (See Bug 1312823)**
---
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.
@@ -42,43 +42,43 @@ Stubs are stored in `test/fixtures` dire
See how to generate stubs for Console API calls.
* 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`
Run the generator using `mach` command.
-`./mach test devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js --headless`
+`./mach test devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js --headless`
-This will override `new-console-output/test/fixtures/stubs/consoleApi.js`.
+This will override `test/fixtures/stubs/consoleApi.js`.
## Append new CSS Messages stubs
See how to generate stubs for CSS messages.
* Append new entry into `cssMessage` map into `stub-snippets.js`
* Generate stubs with: `browser_webconsole_check_stubs_css_message.js`
-This will override `new-console-output/test/fixtures/stubs/cssMessage.js`.
+This will override `test/fixtures/stubs/cssMessage.js`.
## Append new Evaluation Result stubs
See how to generate stubs for evaluation results.
* Append new entry into `evaluationResultCommands` map into `stub-snippets.js`
* Generate stubs with: `browser_webconsole_check_stubs_evaluation_result.js`
-This will override `new-console-output/test/fixtures/stubs/evaluationResult.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 `new-console-output/test/fixtures/stubs/networkEvent.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 `new-console-output/test/fixtures/stubs/pageError.js`.
+This will override `test/fixtures/stubs/pageError.js`.
rename from devtools/client/webconsole/new-console-output/test/chrome/.eslintrc.js
rename to devtools/client/webconsole/test/chrome/.eslintrc.js
--- a/devtools/client/webconsole/new-console-output/test/chrome/.eslintrc.js
+++ b/devtools/client/webconsole/test/chrome/.eslintrc.js
@@ -1,6 +1,6 @@
"use strict";
module.exports = {
// Extend from the shared list of defined globals for mochitests.
- "extends": "../../../../../.eslintrc.mochitests.js"
+ "extends": "../../../../.eslintrc.mochitests.js"
};
rename from devtools/client/webconsole/new-console-output/test/chrome/chrome.ini
rename to devtools/client/webconsole/test/chrome/chrome.ini
rename from devtools/client/webconsole/new-console-output/test/chrome/head.js
rename to devtools/client/webconsole/test/chrome/head.js
rename from devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
rename to devtools/client/webconsole/test/chrome/test_render_perf.html
--- a/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
+++ b/devtools/client/webconsole/test/chrome/test_render_perf.html
@@ -20,19 +20,19 @@
// Then open https://perf-html.io and drag the json file printed at the end of this test
const NUM_MESSAGES = 4000;
const NUM_STREAMING = 100;
ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
const Services = browserRequire("Services");
Services.prefs.setIntPref("devtools.hud.loglimit", NUM_MESSAGES);
const NewConsoleOutputWrapper = browserRequire(
- "devtools/client/webconsole/new-console-output/new-console-output-wrapper");
+ "devtools/client/webconsole/new-console-output-wrapper");
const actions =
- browserRequire("devtools/client/webconsole/new-console-output/actions/index");
+ browserRequire("devtools/client/webconsole/actions/index");
const EventEmitter = browserRequire("devtools/shared/event-emitter");
const testPackets = Array.from({length: NUM_MESSAGES}).map((el, id) => ({
"from": "server1.conn4.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"arguments": [
"foobar",
`${id % 2 === 0 ? "Even" : "Odd"} text`,
rename from devtools/client/webconsole/new-console-output/test/components/.eslintrc.js
rename to devtools/client/webconsole/test/components/.eslintrc.js
rename from devtools/client/webconsole/new-console-output/test/components/console-api-call.log-messages.test.js
rename to devtools/client/webconsole/test/components/console-api-call.log-messages.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/console-api-call.log-messages.test.js
+++ b/devtools/client/webconsole/test/components/console-api-call.log-messages.test.js
@@ -5,20 +5,20 @@
// Test utils.
const expect = require("expect");
const { render } = require("enzyme");
// React
const { createFactory } = require("devtools/client/shared/vendor/react");
// Components under test.
-const ConsoleApiCall = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall"));
+const ConsoleApiCall = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleApiCall"));
-const { prepareMessage } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { prepareMessage } = require("devtools/client/webconsole/utils/messages");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
describe("ConsoleAPICall component:", () => {
describe("Services.console.logStringMessage", () => {
it("renders cached logMessage grips", () => {
let message = prepareMessage(cachedLogMessageStubPacket, {getNextId: () => "1"});
const wrapper = render(ConsoleApiCall({ message, serviceContainer }));
expect(wrapper.find(".message-body").text()).toBe("foobar test");
rename from devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
rename to devtools/client/webconsole/test/components/console-api-call.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
+++ b/devtools/client/webconsole/test/components/console-api-call.test.js
@@ -5,30 +5,30 @@
// Test utils.
const expect = require("expect");
const { render, mount } = require("enzyme");
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/new-console-output/test/helpers");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
// Components under test.
-const ConsoleApiCall = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall"));
+const ConsoleApiCall = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleApiCall"));
const {
MESSAGE_OPEN,
MESSAGE_CLOSE,
-} = require("devtools/client/webconsole/new-console-output/constants");
-const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent");
-const {prepareMessage} = require("devtools/client/webconsole/new-console-output/utils/messages");
+} = require("devtools/client/webconsole/constants");
+const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
+const {prepareMessage} = require("devtools/client/webconsole/utils/messages");
// Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
describe("ConsoleAPICall component:", () => {
describe("console.log", () => {
it("renders string grips", () => {
const message = stubPreparedMessages.get("console.log('foobar', 'test')");
const wrapper = render(ConsoleApiCall({ message, serviceContainer }));
expect(wrapper.find(".message-body").text()).toBe("foobar test");
@@ -255,17 +255,17 @@ describe("ConsoleAPICall component:", ()
});
});
describe("console.trace", () => {
it("renders", () => {
const message = stubPreparedMessages.get("console.trace()");
const wrapper = render(ConsoleApiCall({ message, serviceContainer, open: true }));
const filepath = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/fixtures/stub-generators/" +
+ "test/fixtures/stub-generators/" +
"test-console-api.html";
expect(wrapper.find(".message-body").text()).toBe("console.trace()");
const frameLinks = wrapper.find(
`.stack-trace span.frame-link[data-url]`);
expect(frameLinks.length).toBe(3);
@@ -457,17 +457,17 @@ describe("ConsoleAPICall component:", ()
});
describe("console.dirxml", () => {
it("renders", () => {
const message = stubPreparedMessages.get("console.dirxml(window)");
const wrapper = render(ConsoleApiCall({ message, serviceContainer }));
expect(wrapper.find(".message-body").text())
- .toBe("Window http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html");
+ .toBe("Window http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html");
});
});
describe("console.dir", () => {
it("renders", () => {
const message = stubPreparedMessages.get("console.dir({C, M, Y, K})");
const wrapper = render(ConsoleApiCall({ message, serviceContainer }));
rename from devtools/client/webconsole/new-console-output/test/components/console-output.test.js
rename to devtools/client/webconsole/test/components/console-output.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/console-output.test.js
+++ b/devtools/client/webconsole/test/components/console-output.test.js
@@ -4,23 +4,23 @@
const {
createFactory,
} = require("devtools/client/shared/vendor/react");
// Test utils.
const expect = require("expect");
const { render } = require("enzyme");
-const ConsoleOutput = createFactory(require("devtools/client/webconsole/new-console-output/components/ConsoleOutput"));
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const {initialize} = require("devtools/client/webconsole/new-console-output/actions/ui");
+const ConsoleOutput = createFactory(require("devtools/client/webconsole/components/ConsoleOutput"));
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
+const {initialize} = require("devtools/client/webconsole/actions/ui");
const {
getInitialMessageCountForViewport
-} = require("devtools/client/webconsole/new-console-output/utils/messages.js");
+} = require("devtools/client/webconsole/utils/messages.js");
const MESSAGES_NUMBER = 100;
function getDefaultProps(initialized) {
const store = setupStore(
Array.from({length: MESSAGES_NUMBER})
// Alternate message so we don't trigger the repeat mechanism.
.map((_, i) => i % 2 ? "new Date(0)" : "console.log(NaN)")
);
rename from devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js
rename to devtools/client/webconsole/test/components/evaluation-result.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js
+++ b/devtools/client/webconsole/test/components/evaluation-result.test.js
@@ -5,25 +5,25 @@
// Test utils.
const expect = require("expect");
const { render, mount } = require("enzyme");
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/new-console-output/test/helpers");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
// Components under test.
-const EvaluationResult = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult"));
-const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+const EvaluationResult = createFactory(require("devtools/client/webconsole/components/message-types/EvaluationResult"));
+const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
// Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
describe("EvaluationResult component:", () => {
it("renders a grip result", () => {
const message = stubPreparedMessages.get("new Date(0)");
const wrapper = render(EvaluationResult({ message, serviceContainer }));
expect(wrapper.find(".message-body").text()).toBe("Date 1970-01-01T00:00:00.000Z");
rename from devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
rename to devtools/client/webconsole/test/components/filter-bar.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
+++ b/devtools/client/webconsole/test/components/filter-bar.test.js
@@ -5,29 +5,29 @@
const expect = require("expect");
const sinon = require("sinon");
const { render, mount, shallow } = require("enzyme");
const { createFactory } = require("devtools/client/shared/vendor/react");
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const Provider = createFactory(require("react-redux").Provider);
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const FilterButton = require("devtools/client/webconsole/new-console-output/components/FilterButton");
-const FilterBar = createFactory(require("devtools/client/webconsole/new-console-output/components/FilterBar"));
-const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
-const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
+const actions = require("devtools/client/webconsole/actions/index");
+const FilterButton = require("devtools/client/webconsole/components/FilterButton");
+const FilterBar = createFactory(require("devtools/client/webconsole/components/FilterBar"));
+const { getAllUi } = require("devtools/client/webconsole/selectors/ui");
+const { getAllFilters } = require("devtools/client/webconsole/selectors/filters");
const {
MESSAGES_CLEAR,
FILTERS,
PREFS,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
-const { setupStore, prefsService, clearPrefs } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { setupStore, prefsService, clearPrefs } = require("devtools/client/webconsole/test/helpers");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
describe("FilterBar component:", () => {
afterEach(() => {
clearPrefs();
});
it("initial render", () => {
const store = setupStore();
rename from devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
rename to devtools/client/webconsole/test/components/filter-button.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
+++ b/devtools/client/webconsole/test/components/filter-button.test.js
@@ -2,18 +2,18 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const expect = require("expect");
const { render } = require("enzyme");
const { createFactory } = require("devtools/client/shared/vendor/react");
-const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/FilterButton"));
-const { MESSAGE_LEVEL } = require("devtools/client/webconsole/new-console-output/constants");
+const FilterButton = createFactory(require("devtools/client/webconsole/components/FilterButton"));
+const { MESSAGE_LEVEL } = require("devtools/client/webconsole/constants");
describe("FilterButton component:", () => {
const props = {
active: true,
label: "Error",
filterKey: MESSAGE_LEVEL.ERROR,
};
rename from devtools/client/webconsole/new-console-output/test/components/filter-checkbox.test.js
rename to devtools/client/webconsole/test/components/filter-checkbox.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/filter-checkbox.test.js
+++ b/devtools/client/webconsole/test/components/filter-checkbox.test.js
@@ -2,17 +2,17 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const expect = require("expect");
const { render } = require("enzyme");
const { createFactory } = require("devtools/client/shared/vendor/react");
-const FilterCheckbox = createFactory(require("devtools/client/webconsole/new-console-output/components/FilterCheckbox"));
+const FilterCheckbox = createFactory(require("devtools/client/webconsole/components/FilterCheckbox"));
describe("FilterCheckbox component:", () => {
const props = {
label: "test label",
title: "test title",
checked: true,
onChange: () => {},
};
rename from devtools/client/webconsole/new-console-output/test/components/message-container.test.js
rename to devtools/client/webconsole/test/components/message-container.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/message-container.test.js
+++ b/devtools/client/webconsole/test/components/message-container.test.js
@@ -3,25 +3,25 @@
"use strict";
// Test utils.
const expect = require("expect");
const { render } = require("enzyme");
const { createFactory } = require("devtools/client/shared/vendor/react");
// Components under test.
-let { MessageContainer, getMessageComponent } = require("devtools/client/webconsole/new-console-output/components/MessageContainer");
+let { MessageContainer, getMessageComponent } = require("devtools/client/webconsole/components/MessageContainer");
MessageContainer = createFactory(MessageContainer);
-const ConsoleApiCall = require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall");
-const EvaluationResult = require("devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult");
-const PageError = require("devtools/client/webconsole/new-console-output/components/message-types/PageError");
+const ConsoleApiCall = require("devtools/client/webconsole/components/message-types/ConsoleApiCall");
+const EvaluationResult = require("devtools/client/webconsole/components/message-types/EvaluationResult");
+const PageError = require("devtools/client/webconsole/components/message-types/PageError");
// Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
describe("MessageContainer component:", () => {
it("pipes data to children as expected", () => {
const message = stubPreparedMessages.get("console.log('foobar', 'test')");
const rendered = render(MessageContainer({
getMessage: () => message,
serviceContainer
}));
rename from devtools/client/webconsole/new-console-output/test/components/message-icon.test.js
rename to devtools/client/webconsole/test/components/message-icon.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/message-icon.test.js
+++ b/devtools/client/webconsole/test/components/message-icon.test.js
@@ -1,20 +1,20 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const {
MESSAGE_LEVEL,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
const expect = require("expect");
const { render } = require("enzyme");
const { createFactory } = require("devtools/client/shared/vendor/react");
-const MessageIcon = createFactory(require("devtools/client/webconsole/new-console-output/components/MessageIcon"));
+const MessageIcon = createFactory(require("devtools/client/webconsole/components/MessageIcon"));
describe("MessageIcon component:", () => {
it("renders icon based on level", () => {
const rendered = render(MessageIcon({ level: MESSAGE_LEVEL.ERROR }));
expect(rendered.hasClass("icon")).toBe(true);
expect(rendered.attr("title")).toBe("Error");
expect(rendered.attr("aria-live")).toBe("off");
});
rename from devtools/client/webconsole/new-console-output/test/components/message-location.test.js
rename to devtools/client/webconsole/test/components/message-location.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/message-location.test.js
+++ b/devtools/client/webconsole/test/components/message-location.test.js
@@ -2,23 +2,23 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test utils.
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/new-console-output/test/fixtures/serviceContainer");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
-let { MessageContainer } = require("devtools/client/webconsole/new-console-output/components/MessageContainer");
+let { MessageContainer } = require("devtools/client/webconsole/components/MessageContainer");
MessageContainer = createFactory(MessageContainer);
// Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
describe("Message - location element", () => {
it("Calls onViewSourceInDebugger when clicked", () => {
const onViewSourceInDebugger = sinon.spy();
const onViewSource = sinon.spy();
const message = stubPreparedMessages.get("console.log('foobar', 'test')");
const wrapper = mount(MessageContainer({
rename from devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js
rename to devtools/client/webconsole/test/components/message-repeat.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js
+++ b/devtools/client/webconsole/test/components/message-repeat.test.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const expect = require("expect");
const { render } = require("enzyme");
const { createFactory } = require("devtools/client/shared/vendor/react");
-const MessageRepeat = createFactory(require("devtools/client/webconsole/new-console-output/components/MessageRepeat"));
+const MessageRepeat = createFactory(require("devtools/client/webconsole/components/MessageRepeat"));
describe("MessageRepeat component:", () => {
it("renders repeated value correctly", () => {
const rendered = render(MessageRepeat({ repeat: 99 }));
expect(rendered.hasClass("message-repeats")).toBe(true);
expect(rendered.text()).toBe("99");
});
});
rename from devtools/client/webconsole/new-console-output/test/components/message-types-aria.test.js
rename to devtools/client/webconsole/test/components/message-types-aria.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/message-types-aria.test.js
+++ b/devtools/client/webconsole/test/components/message-types-aria.test.js
@@ -3,25 +3,25 @@
"use strict";
// Test utils.
const expect = require("expect");
const { render } = require("enzyme");
const { createFactory } = require("devtools/client/shared/vendor/react");
// Components under test.
-const ConsoleApiCall = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall"));
-const ConsoleCmd = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand"));
-const EvaluationResult = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult"));
+const ConsoleApiCall = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleApiCall"));
+const ConsoleCmd = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleCommand"));
+const EvaluationResult = createFactory(require("devtools/client/webconsole/components/message-types/EvaluationResult"));
-const { ConsoleCommand } = require("devtools/client/webconsole/new-console-output/types");
+const { ConsoleCommand } = require("devtools/client/webconsole/types");
// Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
describe("message types component ARIA:", () => {
describe("ConsoleAPICall", () => {
it("sets aria-live to polite", () => {
const message = stubPreparedMessages.get("console.log('foobar', 'test')");
const wrapper = render(ConsoleApiCall({ message, serviceContainer }));
expect(wrapper.attr("aria-live")).toBe("polite");
});
rename from devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
rename to devtools/client/webconsole/test/components/network-event-message.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
+++ b/devtools/client/webconsole/test/components/network-event-message.test.js
@@ -5,24 +5,24 @@
// Test utils.
const expect = require("expect");
const { render } = require("enzyme");
// React
const { createFactory } = require("devtools/client/shared/vendor/react");
// Components under test.
-const NetworkEventMessage = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage"));
-const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+const NetworkEventMessage = createFactory(require("devtools/client/webconsole/components/message-types/NetworkEventMessage"));
+const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
// Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
-const EXPECTED_URL = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html";
+const EXPECTED_URL = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html";
const EXPECTED_STATUS = /\[HTTP\/\d\.\d \d+ [A-Za-z ]+ \d+ms\]/;
describe("NetworkEventMessage component:", () => {
describe("GET request", () => {
it("renders as expected", () => {
const message = stubPreparedMessages.get("GET request");
const update = stubPreparedMessages.get("GET request update");
const wrapper = render(NetworkEventMessage({
rename from devtools/client/webconsole/new-console-output/test/components/new-console-output-wrapper.test.js
rename to devtools/client/webconsole/test/components/new-console-output-wrapper.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/new-console-output-wrapper.test.js
+++ b/devtools/client/webconsole/test/components/new-console-output-wrapper.test.js
@@ -2,28 +2,28 @@
* 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/. */
"use strict";
// Test utils.
const expect = require("expect");
const { stubPackets } =
- require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+ require("devtools/client/webconsole/test/fixtures/stubs/index");
const {
getFirstMessage,
getLastMessage,
getMessageAt,
getPrivatePacket,
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
+} = require("devtools/client/webconsole/test/helpers");
const NewConsoleOutputWrapper =
- require("devtools/client/webconsole/new-console-output/new-console-output-wrapper");
+ require("devtools/client/webconsole/new-console-output-wrapper");
const { messagesAdd } =
- require("devtools/client/webconsole/new-console-output/actions/messages");
+ require("devtools/client/webconsole/actions/messages");
function getNewConsoleOutputWrapper() {
const jsterm = {
hud: {
proxy: {
releaseActor: () => {}
}
}
rename from devtools/client/webconsole/new-console-output/test/components/page-error.test.js
rename to devtools/client/webconsole/test/components/page-error.test.js
--- a/devtools/client/webconsole/new-console-output/test/components/page-error.test.js
+++ b/devtools/client/webconsole/test/components/page-error.test.js
@@ -5,29 +5,29 @@
// Test utils.
const expect = require("expect");
const { render, mount } = require("enzyme");
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/new-console-output/test/helpers");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
// Components under test.
-const PageError = require("devtools/client/webconsole/new-console-output/components/message-types/PageError");
+const PageError = require("devtools/client/webconsole/components/message-types/PageError");
const {
MESSAGE_OPEN,
MESSAGE_CLOSE,
-} = require("devtools/client/webconsole/new-console-output/constants");
-const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+} = require("devtools/client/webconsole/constants");
+const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
// Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
describe("PageError component:", () => {
it("renders", () => {
const message = stubPreparedMessages.get("ReferenceError: asdf is not defined");
const wrapper = render(PageError({
message,
serviceContainer,
timestampsVisible: true,
rename from devtools/client/webconsole/new-console-output/test/fixtures/.eslintrc.js
rename to devtools/client/webconsole/test/fixtures/.eslintrc.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/.eslintrc.js
+++ b/devtools/client/webconsole/test/fixtures/.eslintrc.js
@@ -1,6 +1,6 @@
"use strict";
module.exports = {
// Extend from the shared list of defined globals for mochitests.
- "extends": "../../../../../.eslintrc.mochitests.js"
+ "extends": "../../../../.eslintrc.mochitests.js"
};
rename from devtools/client/webconsole/new-console-output/test/fixtures/DebuggerClient.js
rename to devtools/client/webconsole/test/fixtures/DebuggerClient.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/L10n.js
rename to devtools/client/webconsole/test/fixtures/L10n.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/LocalizationHelper.js
rename to devtools/client/webconsole/test/fixtures/LocalizationHelper.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/LocalizationHelper.js
+++ b/devtools/client/webconsole/test/fixtures/LocalizationHelper.js
@@ -1,10 +1,10 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const LocalizationHelper = require("devtools/client/webconsole/new-console-output/test/fixtures/L10n");
+const LocalizationHelper = require("devtools/client/webconsole/test/fixtures/L10n");
module.exports = {
LocalizationHelper
};
rename from devtools/client/webconsole/new-console-output/test/fixtures/PluralForm.js
rename to devtools/client/webconsole/test/fixtures/PluralForm.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/WebConsoleUtils.js
rename to devtools/client/webconsole/test/fixtures/WebConsoleUtils.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/WebConsoleUtils.js
+++ b/devtools/client/webconsole/test/fixtures/WebConsoleUtils.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const L10n = require("devtools/client/webconsole/new-console-output/test/fixtures/L10n");
+const L10n = require("devtools/client/webconsole/test/fixtures/L10n");
const Utils = {
L10n,
supportsString: function(s) {
return s;
}
};
rename from devtools/client/webconsole/new-console-output/test/fixtures/moz.build
rename to devtools/client/webconsole/test/fixtures/moz.build
rename from devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer.js
rename to devtools/client/webconsole/test/fixtures/serviceContainer.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser.ini
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser.ini
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js
--- a/devtools/client/webconsole/new-console-output/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
@@ -10,14 +10,14 @@ ChromeUtils.import("resource://gre/modul
add_task(async function() {
let generatedStubs = await generateConsoleApiStubs();
let repoStubFilePath = getTestFilePath("../stubs/consoleApi.js");
let 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/new-console-output/test/fixtures/" +
+ "`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");
}
});
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js
--- a/devtools/client/webconsole/new-console-output/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
@@ -10,14 +10,14 @@ ChromeUtils.import("resource://gre/modul
add_task(async function() {
let generatedStubs = await generateCssMessageStubs();
let repoStubFilePath = getTestFilePath("../stubs/cssMessage.js");
let 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/new-console-output/test/fixtures/" +
+ "`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");
}
});
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js
--- a/devtools/client/webconsole/new-console-output/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
@@ -10,14 +10,14 @@ ChromeUtils.import("resource://gre/modul
add_task(async function() {
let generatedStubs = await generateEvaluationResultStubs();
let repoStubFilePath = getTestFilePath("../stubs/evaluationResult.js");
let 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/new-console-output/test/fixtures/" +
+ "`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");
}
});
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
--- a/devtools/client/webconsole/new-console-output/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
@@ -11,14 +11,14 @@ add_task(async function() {
let generatedStubs = await generateNetworkEventStubs();
let repoStubFilePath = getTestFilePath("../stubs/networkEvent.js");
let 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/new-console-output/test/fixtures/" +
+ "`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");
}
});
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js
--- a/devtools/client/webconsole/new-console-output/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
@@ -10,14 +10,14 @@ ChromeUtils.import("resource://gre/modul
add_task(async function() {
let generatedStubs = await generatePageErrorStubs();
let repoStubFilePath = getTestFilePath("../stubs/pageError.js");
let 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/new-console-output/test/fixtures/" +
+ "`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");
}
});
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/head.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
+++ b/devtools/client/webconsole/test/fixtures/stub-generators/head.js
@@ -1,42 +1,41 @@
/* -*- 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/ */
-/* import-globals-from ../../../../../shared/test/shared-head.js */
+/* import-globals-from ../../../../shared/test/shared-head.js */
/* exported generateConsoleApiStubs, generateCssMessageStubs,
generateEvaluationResultStubs, generateNetworkEventStubs,
generatePageErrorStubs, BASE_PATH */
"use strict";
// shared-head.js handles imports, constants, and utility functions
// Load the shared-head file first.
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
this);
Services.prefs.setBoolPref("devtools.webconsole.new-frontend-enabled", true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref("devtools.webconsole.new-frontend-enabled");
});
-const { PREFS } = require("devtools/client/webconsole/new-console-output/constants");
+const { PREFS } = require("devtools/client/webconsole/constants");
-const { prepareMessage } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index.js");
+const { prepareMessage } = require("devtools/client/webconsole/utils/messages");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index.js");
const {
consoleApi,
cssMessage,
evaluationResult,
networkEvent,
pageError,
-} = require("devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js");
+} = require("devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js");
-const BASE_PATH =
- "../../../../devtools/client/webconsole/new-console-output/test/fixtures";
+const BASE_PATH = "../../../devtools/client/webconsole/test/fixtures";
let cachedPackets = {};
function getCleanedPacket(key, packet) {
if (Object.keys(cachedPackets).includes(key)) {
return cachedPackets[key];
}
@@ -273,33 +272,33 @@ function formatFile(stubs, type) {
"use strict";
/*
* THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
*/
const { ${type} } =
- require("devtools/client/webconsole/new-console-output/types");
+ require("devtools/client/webconsole/types");
let stubPreparedMessages = new Map();
let stubPackets = new Map();
${stubs.preparedMessages.join("\n\n")}
${stubs.packets.join("\n\n")}
module.exports = {
stubPreparedMessages,
stubPackets,
};
`;
}
async function generateConsoleApiStubs() {
- const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html";
+ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html";
// Hiding log messages so we don't get unwanted client/server communication.
Services.prefs.setBoolPref(PREFS.FILTER.LOG, false);
let stubs = {
preparedMessages: [],
packets: [],
};
@@ -343,17 +342,17 @@ async function generateConsoleApiStubs()
Services.prefs.clearUserPref(PREFS.FILTER.LOG);
await closeTabAndToolbox();
return formatFile(stubs, "ConsoleMessage");
}
async function generateCssMessageStubs() {
- const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html";
+ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html";
let stubs = {
preparedMessages: [],
packets: [],
};
let toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
@@ -407,17 +406,17 @@ async function generateEvaluationResultS
stubs.preparedMessages.push(formatStub(key, packet));
}
await closeTabAndToolbox();
return formatFile(stubs, "ConsoleMessage");
}
async function generateNetworkEventStubs() {
- const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html";
+ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html";
let stubs = {
preparedMessages: [],
packets: [],
};
let toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
let {ui} = toolbox.getCurrentPanel().hud;
@@ -477,17 +476,17 @@ async function generateNetworkEventStubs
await Promise.all([onNetwork, onNetworkUpdate]);
}
await closeTabAndToolbox();
return formatFile(stubs, "NetworkEventMessage");
}
async function generatePageErrorStubs() {
- const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html";
+ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html";
let stubs = {
preparedMessages: [],
packets: [],
};
let toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/moz.build
rename to devtools/client/webconsole/test/fixtures/stub-generators/moz.build
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html
rename to devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html
rename to devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html
rename to devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
rename to devtools/client/webconsole/test/fixtures/stubs/consoleApi.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/consoleApi.js
@@ -4,37 +4,37 @@
"use strict";
/*
* THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
*/
const { ConsoleMessage } =
- require("devtools/client/webconsole/new-console-output/types");
+ require("devtools/client/webconsole/types");
let stubPreparedMessages = new Map();
let stubPackets = new Map();
stubPreparedMessages.set(`console.log('foobar', 'test')`, new ConsoleMessage({
"id": "1",
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924471,
"type": "log",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"foobar",
"test"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foobar\",\"test\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foobar\",\"test\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -51,20 +51,20 @@ stubPreparedMessages.set(`console.log(un
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
{
"type": "undefined"
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -79,20 +79,20 @@ stubPreparedMessages.set(`console.warn('
"timeStamp": 1502884924487,
"type": "warn",
"helperType": null,
"level": "warn",
"messageText": null,
"parameters": [
"danger, will robinson!"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":null,\"parameters\":[\"danger, will robinson!\"],\"source\":\"console-api\",\"type\":\"warn\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":null,\"parameters\":[\"danger, will robinson!\"],\"source\":\"console-api\",\"type\":\"warn\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -109,20 +109,20 @@ stubPreparedMessages.set(`console.log(Na
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
{
"type": "NaN"
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"NaN\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"NaN\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -139,20 +139,20 @@ stubPreparedMessages.set(`console.log(nu
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
{
"type": "null"
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"null\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"null\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -167,20 +167,20 @@ stubPreparedMessages.set(`console.log('鼬')`, new ConsoleMessage({
"timeStamp": 1502884924506,
"type": "log",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"鼬"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"鼬\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"鼬\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -195,20 +195,20 @@ stubPreparedMessages.set(`console.clear(
"timeStamp": 1502884924512,
"type": "clear",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"Console was cleared."
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -221,20 +221,20 @@ stubPreparedMessages.set(`console.count(
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924515,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "bar: 1",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -272,27 +272,27 @@ stubPreparedMessages.set(`console.assert
},
"ownSymbols": [],
"ownPropertiesLength": 1,
"ownSymbolsLength": 0,
"safeGetterValues": {}
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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": 27,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"lineNumber": 1
}
],
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -307,20 +307,20 @@ stubPreparedMessages.set(`console.log('h
"timeStamp": 1502884924528,
"type": "log",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"hello \nfrom \rthe \"string world!"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"hello \\nfrom \\rthe \\\"string world!\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"hello \\nfrom \\rthe \\\"string world!\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -335,20 +335,20 @@ stubPreparedMessages.set(`console.log('úṇĩçödê țĕșť')`, new ConsoleMessage({
"timeStamp": 1502884924586,
"type": "log",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"úṇĩçödê țĕșť"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"úṇĩçödê țĕșť\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"úṇĩçödê țĕșť\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -371,24 +371,24 @@ stubPreparedMessages.set(`console.dirxml
"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/new-console-output/test/fixtures/stub-generators/test-console-api.html"
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html"
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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/new-console-output/test/fixtures/stub-generators/test-console-api.html\"}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -421,20 +421,20 @@ stubPreparedMessages.set(`console.log('m
"items": [
"red",
"green",
"blue"
]
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -459,20 +459,20 @@ stubPreparedMessages.set(`console.log('m
"class": "RegExp",
"extensible": true,
"frozen": false,
"sealed": false,
"ownPropertyLength": 1,
"displayString": "/a.b.c/"
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -504,20 +504,20 @@ stubPreparedMessages.set(`console.table(
"items": [
"red",
"green",
"blue"
]
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -568,20 +568,20 @@ stubPreparedMessages.set(`console.log('m
},
"ownSymbols": [],
"ownPropertiesLength": 3,
"ownSymbolsLength": 0,
"safeGetterValues": {}
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -596,20 +596,20 @@ stubPreparedMessages.set(`console.debug(
"timeStamp": 1502884924621,
"type": "debug",
"helperType": null,
"level": "debug",
"messageText": null,
"parameters": [
"debug message"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"debug\",\"messageText\":null,\"parameters\":[\"debug message\"],\"source\":\"console-api\",\"type\":\"debug\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"debug\",\"messageText\":null,\"parameters\":[\"debug message\"],\"source\":\"console-api\",\"type\":\"debug\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -624,20 +624,20 @@ stubPreparedMessages.set(`console.info('
"timeStamp": 1502884924625,
"type": "info",
"helperType": null,
"level": "info",
"messageText": null,
"parameters": [
"info message"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"info\",\"messageText\":null,\"parameters\":[\"info message\"],\"source\":\"console-api\",\"type\":\"info\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"info\",\"messageText\":null,\"parameters\":[\"info message\"],\"source\":\"console-api\",\"type\":\"info\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -652,27 +652,27 @@ stubPreparedMessages.set(`console.error(
"timeStamp": 1502884924628,
"type": "error",
"helperType": null,
"level": "error",
"messageText": null,
"parameters": [
"error message"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[\"error message\"],\"source\":\"console-api\",\"type\":\"error\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[\"error message\"],\"source\":\"console-api\",\"type\":\"error\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": [
{
"columnNumber": 27,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"lineNumber": 1
}
],
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -710,20 +710,20 @@ stubPreparedMessages.set(`console.log('m
[
"key2",
"value2"
]
]
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":1},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":1},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 5,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -755,20 +755,20 @@ stubPreparedMessages.set(`console.log('m
"length": 2,
"items": [
"a",
"b"
]
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -781,39 +781,39 @@ stubPreparedMessages.set(`console.trace(
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924752,
"type": "trace",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":3},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[],\"source\":\"console-api\",\"type\":\"trace\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":3},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[],\"source\":\"console-api\",\"type\":\"trace\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": [
{
"columnNumber": 3,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "testStacktraceFiltering",
"lineNumber": 3
},
{
"columnNumber": 3,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "foo",
"lineNumber": 6
},
{
"columnNumber": 1,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"lineNumber": 9
}
],
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 3,
"column": 3
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -826,20 +826,20 @@ stubPreparedMessages.set(`console.time('
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924757,
"type": "nullMessage",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"nullMessage\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"nullMessage\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -852,20 +852,20 @@ stubPreparedMessages.set(`timerAlreadyEx
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924758,
"type": "time",
"helperType": null,
"level": "warn",
"messageText": "Timer “bar” already exists.",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” already exists.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"time\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” already exists.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"time\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 3,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -878,20 +878,20 @@ stubPreparedMessages.set(`console.timeEn
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924759,
"type": "timeEnd",
"helperType": null,
"level": "log",
"messageText": "bar: 1.21ms",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":4,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1.21ms\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":4,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1.21ms\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 4,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -904,20 +904,20 @@ stubPreparedMessages.set(`timerDoesntExi
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924759,
"type": "timeEnd",
"helperType": null,
"level": "warn",
"messageText": "Timer “bar” doesn’t exist.",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 5,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -932,20 +932,20 @@ stubPreparedMessages.set(`console.table(
"timeStamp": 1502884924801,
"type": "log",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"bar"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -977,20 +977,20 @@ stubPreparedMessages.set(`console.table(
"items": [
"a",
"b",
"c"
]
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1005,20 +1005,20 @@ stubPreparedMessages.set(`console.group(
"timeStamp": 1502884924863,
"type": "startGroup",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"bar"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1031,20 +1031,20 @@ stubPreparedMessages.set(`console.groupE
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924864,
"type": "endGroup",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 3,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1059,20 +1059,20 @@ stubPreparedMessages.set(`console.groupC
"timeStamp": 1502884924870,
"type": "startGroupCollapsed",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"foo"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1085,20 +1085,20 @@ stubPreparedMessages.set(`console.groupE
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924871,
"type": "endGroup",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 3,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1113,20 +1113,20 @@ stubPreparedMessages.set(`console.group(
"timeStamp": 1502884924878,
"type": "startGroup",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"<no group label>"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"<no group label>\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"<no group label>\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1139,20 +1139,20 @@ stubPreparedMessages.set(`console.groupE
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924879,
"type": "endGroup",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 3,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1168,20 +1168,20 @@ stubPreparedMessages.set(`console.log(%c
"type": "log",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"foo",
"bar"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"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')"
@@ -1201,20 +1201,20 @@ stubPreparedMessages.set(`console.log("%
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"Hello",
"|",
"World"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":3},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Hello\",\"|\",\"World\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:red\",\"\",\"color: blue\"],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":3},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 3
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [
"color:red",
"",
@@ -1234,20 +1234,20 @@ stubPreparedMessages.set(`console.group(
"type": "startGroup",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"foo",
"bar"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"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')"
@@ -1263,20 +1263,20 @@ stubPreparedMessages.set(`console.groupE
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924887,
"type": "endGroup",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 6,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1292,20 +1292,20 @@ stubPreparedMessages.set(`console.groupC
"type": "startGroupCollapsed",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"foo",
"baz"
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"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')"
@@ -1321,20 +1321,20 @@ stubPreparedMessages.set(`console.groupE
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1502884924893,
"type": "endGroup",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 6,
"column": 1
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1390,20 +1390,20 @@ stubPreparedMessages.set(`console.dir({C
},
"ownSymbols": [],
"ownPropertiesLength": 4,
"ownSymbolsLength": 0,
"safeGetterValues": {}
}
}
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 27
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1416,20 +1416,20 @@ stubPreparedMessages.set(`console.count
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1511365913333,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "default: 1",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1442,20 +1442,20 @@ stubPreparedMessages.set(`console.count
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1511365913334,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "default: 2",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 3,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1468,20 +1468,20 @@ stubPreparedMessages.set(`console.count
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1511365913334,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "test counter: 1",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":4,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":4,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 4,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1494,20 +1494,20 @@ stubPreparedMessages.set(`console.count
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1511365913334,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "test counter: 2",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 5,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1520,20 +1520,20 @@ stubPreparedMessages.set(`console.count
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1511365913334,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "default: 3",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 6,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1548,20 +1548,20 @@ stubPreparedMessages.set(`console.count
"timeStamp": 1511365913334,
"type": "clear",
"helperType": null,
"level": "log",
"messageText": null,
"parameters": [
"Console was cleared."
],
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":7,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":7,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 7,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1574,20 +1574,20 @@ stubPreparedMessages.set(`console.count
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1511365913335,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "default: 4",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":8,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 4\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":8,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 4\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 8,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1600,20 +1600,20 @@ stubPreparedMessages.set(`console.count
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1511365913335,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "test counter: 3",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":9,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":9,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 9,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
@@ -1627,17 +1627,17 @@ stubPackets.set(`console.log('foobar', '
"message": {
"addonId": "",
"arguments": [
"foobar",
"test"
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924471,
@@ -1654,17 +1654,17 @@ stubPackets.set(`console.log(undefined)`
"addonId": "",
"arguments": [
{
"type": "undefined"
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924479,
@@ -1679,17 +1679,17 @@ stubPackets.set(`console.warn('danger, w
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"danger, will robinson!"
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "warn",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924487,
@@ -1706,17 +1706,17 @@ stubPackets.set(`console.log(NaN)`, {
"addonId": "",
"arguments": [
{
"type": "NaN"
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924495,
@@ -1733,17 +1733,17 @@ stubPackets.set(`console.log(null)`, {
"addonId": "",
"arguments": [
{
"type": "null"
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924501,
@@ -1758,17 +1758,17 @@ stubPackets.set(`console.log('鼬')`, {
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"鼬"
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924506,
@@ -1781,17 +1781,17 @@ stubPackets.set(`console.log('鼬')`, {
stubPackets.set(`console.clear()`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "clear",
"lineNumber": 1,
"prefix": "",
"private": false,
"timeStamp": 1502884924512,
"timer": null,
@@ -1809,17 +1809,17 @@ stubPackets.set(`console.count('bar')`,
"arguments": [
"bar"
],
"columnNumber": 27,
"counter": {
"count": 1,
"label": "bar"
},
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "count",
"lineNumber": 1,
"prefix": "",
"private": false,
"timeStamp": 1502884924515,
"timer": null,
@@ -1857,30 +1857,30 @@ stubPackets.set(`console.assert(false, {
"ownPropertiesLength": 1,
"ownSymbolsLength": 0,
"safeGetterValues": {}
}
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "assert",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924521,
"timer": null,
"stacktrace": [
{
"columnNumber": 27,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"lineNumber": 1
}
],
"workerType": "none",
"category": "webdev"
}
});
@@ -1890,17 +1890,17 @@ stubPackets.set(`console.log('hello \nfr
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"hello \nfrom \rthe \"string world!"
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924528,
@@ -1915,17 +1915,17 @@ stubPackets.set(`console.log('úṇĩçödê țĕșť')`, {
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"úṇĩçödê țĕșť"
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924586,
@@ -1946,23 +1946,23 @@ stubPackets.set(`console.dirxml(window)`
"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/new-console-output/test/fixtures/stub-generators/test-console-api.html"
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html"
}
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "dirxml",
"lineNumber": 1,
"prefix": "",
"private": false,
"timeStamp": 1502884924596,
"timer": null,
@@ -1995,17 +1995,17 @@ stubPackets.set(`console.log('myarray',
"green",
"blue"
]
}
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924604,
@@ -2030,17 +2030,17 @@ stubPackets.set(`console.log('myregex',
"frozen": false,
"sealed": false,
"ownPropertyLength": 1,
"displayString": "/a.b.c/"
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924610,
@@ -2072,17 +2072,17 @@ stubPackets.set(`console.table(['red', '
"green",
"blue"
]
}
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "table",
"lineNumber": 1,
"prefix": "",
"private": false,
"timeStamp": 1502884924612,
"timer": null,
@@ -2133,17 +2133,17 @@ stubPackets.set(`console.log('myobject',
"ownPropertiesLength": 3,
"ownSymbolsLength": 0,
"safeGetterValues": {}
}
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924614,
@@ -2158,17 +2158,17 @@ stubPackets.set(`console.debug('debug me
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"debug message"
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "debug",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924621,
@@ -2183,17 +2183,17 @@ stubPackets.set(`console.info('info mess
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"info message"
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "info",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924625,
@@ -2208,30 +2208,30 @@ stubPackets.set(`console.error('error me
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"error message"
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "error",
"lineNumber": 1,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924628,
"timer": null,
"stacktrace": [
{
"columnNumber": 27,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"lineNumber": 1
}
],
"workerType": "none",
"category": "webdev"
}
});
@@ -2264,17 +2264,17 @@ stubPackets.set(`console.log('mymap')`,
"value2"
]
]
}
}
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 5,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924631,
@@ -2306,17 +2306,17 @@ stubPackets.set(`console.log('myset')`,
"a",
"b"
]
}
}
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 2,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924746,
@@ -2329,41 +2329,41 @@ stubPackets.set(`console.log('myset')`,
stubPackets.set(`console.trace()`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 3,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "testStacktraceFiltering",
"groupName": "",
"level": "trace",
"lineNumber": 3,
"prefix": "",
"private": false,
"timeStamp": 1502884924752,
"timer": null,
"stacktrace": [
{
"columnNumber": 3,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "testStacktraceFiltering",
"lineNumber": 3
},
{
"columnNumber": 3,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "foo",
"lineNumber": 6
},
{
"columnNumber": 1,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"lineNumber": 9
}
],
"workerType": "none",
"styles": [],
"category": "webdev"
}
@@ -2374,17 +2374,17 @@ stubPackets.set(`console.time('bar')`, {
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"bar"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "time",
"lineNumber": 2,
"prefix": "",
"private": false,
"timeStamp": 1502884924757,
"timer": {
@@ -2401,17 +2401,17 @@ stubPackets.set(`timerAlreadyExists`, {
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"bar"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "time",
"lineNumber": 3,
"prefix": "",
"private": false,
"timeStamp": 1502884924758,
"timer": {
@@ -2429,17 +2429,17 @@ stubPackets.set(`console.timeEnd('bar')`
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"bar"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "timeEnd",
"lineNumber": 4,
"prefix": "",
"private": false,
"timeStamp": 1502884924759,
"timer": {
@@ -2457,17 +2457,17 @@ stubPackets.set(`timerDoesntExist`, {
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"bar"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "timeEnd",
"lineNumber": 5,
"prefix": "",
"private": false,
"timeStamp": 1502884924759,
"timer": {
@@ -2485,17 +2485,17 @@ stubPackets.set(`console.table('bar')`,
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"bar"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "table",
"lineNumber": 2,
"prefix": "",
"private": false,
"timeStamp": 1502884924801,
"timer": null,
@@ -2527,17 +2527,17 @@ stubPackets.set(`console.table(['a', 'b'
"b",
"c"
]
}
}
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "table",
"lineNumber": 2,
"prefix": "",
"private": false,
"timeStamp": 1502884924859,
"timer": null,
@@ -2552,17 +2552,17 @@ stubPackets.set(`console.group('bar')`,
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"bar"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "bar",
"level": "group",
"lineNumber": 2,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924863,
@@ -2575,17 +2575,17 @@ stubPackets.set(`console.group('bar')`,
stubPackets.set(`console.groupEnd('bar')`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "bar",
"level": "groupEnd",
"lineNumber": 3,
"prefix": "",
"private": false,
"timeStamp": 1502884924864,
"timer": null,
@@ -2600,17 +2600,17 @@ stubPackets.set(`console.groupCollapsed(
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"foo"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "foo",
"level": "groupCollapsed",
"lineNumber": 2,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924870,
@@ -2623,17 +2623,17 @@ stubPackets.set(`console.groupCollapsed(
stubPackets.set(`console.groupEnd('foo')`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "foo",
"level": "groupEnd",
"lineNumber": 3,
"prefix": "",
"private": false,
"timeStamp": 1502884924871,
"timer": null,
@@ -2646,17 +2646,17 @@ stubPackets.set(`console.groupEnd('foo')
stubPackets.set(`console.group()`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "group",
"lineNumber": 2,
"prefix": "",
"private": false,
"styles": [],
"timeStamp": 1502884924878,
@@ -2669,17 +2669,17 @@ stubPackets.set(`console.group()`, {
stubPackets.set(`console.groupEnd()`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "groupEnd",
"lineNumber": 3,
"prefix": "",
"private": false,
"timeStamp": 1502884924879,
"timer": null,
@@ -2695,17 +2695,17 @@ stubPackets.set(`console.log(%cfoobar)`,
"message": {
"addonId": "",
"arguments": [
"foo",
"bar"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 2,
"prefix": "",
"private": false,
"styles": [
"color:blue; font-size:1.3em; background:url('http://example.com/test'); position:absolute; top:10px; ",
@@ -2725,17 +2725,17 @@ stubPackets.set(`console.log("%cHello%c|
"addonId": "",
"arguments": [
"Hello",
"|",
"World"
],
"columnNumber": 3,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "log",
"lineNumber": 2,
"prefix": "",
"private": false,
"styles": [
"color:red",
@@ -2755,17 +2755,17 @@ stubPackets.set(`console.group(%cfoo%cba
"message": {
"addonId": "",
"arguments": [
"foo",
"bar"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "foo bar",
"level": "group",
"lineNumber": 2,
"prefix": "",
"private": false,
"styles": [
"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px",
@@ -2781,17 +2781,17 @@ stubPackets.set(`console.group(%cfoo%cba
stubPackets.set(`console.groupEnd(%cfoo%cbar)`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "foo bar",
"level": "groupEnd",
"lineNumber": 6,
"prefix": "",
"private": false,
"timeStamp": 1502884924887,
"timer": null,
@@ -2807,17 +2807,17 @@ stubPackets.set(`console.groupCollapsed(
"message": {
"addonId": "",
"arguments": [
"foo",
"baz"
],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "foo baz",
"level": "groupCollapsed",
"lineNumber": 2,
"prefix": "",
"private": false,
"styles": [
"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px",
@@ -2833,17 +2833,17 @@ stubPackets.set(`console.groupCollapsed(
stubPackets.set(`console.groupEnd(%cfoo%cbaz)`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 1,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "foo baz",
"level": "groupEnd",
"lineNumber": 6,
"prefix": "",
"private": false,
"timeStamp": 1502884924893,
"timer": null,
@@ -2899,17 +2899,17 @@ stubPackets.set(`console.dir({C, M, Y, K
"ownPropertiesLength": 4,
"ownSymbolsLength": 0,
"safeGetterValues": {}
}
}
],
"columnNumber": 27,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "dir",
"lineNumber": 1,
"prefix": "",
"private": false,
"timeStamp": 1502884924899,
"timer": null,
@@ -2927,17 +2927,17 @@ stubPackets.set(`console.count | default
"arguments": [
"default"
],
"columnNumber": 5,
"counter": {
"count": 1,
"label": "default"
},
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "count",
"lineNumber": 2,
"prefix": "",
"private": false,
"timeStamp": 1511365913333,
"timer": null,
@@ -2955,17 +2955,17 @@ stubPackets.set(`console.count | default
"arguments": [
"default"
],
"columnNumber": 5,
"counter": {
"count": 2,
"label": "default"
},
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "count",
"lineNumber": 3,
"prefix": "",
"private": false,
"timeStamp": 1511365913334,
"timer": null,
@@ -2983,17 +2983,17 @@ stubPackets.set(`console.count | test co
"arguments": [
"test counter"
],
"columnNumber": 5,
"counter": {
"count": 1,
"label": "test counter"
},
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "count",
"lineNumber": 4,
"prefix": "",
"private": false,
"timeStamp": 1511365913334,
"timer": null,
@@ -3011,17 +3011,17 @@ stubPackets.set(`console.count | test co
"arguments": [
"test counter"
],
"columnNumber": 5,
"counter": {
"count": 2,
"label": "test counter"
},
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "count",
"lineNumber": 5,
"prefix": "",
"private": false,
"timeStamp": 1511365913334,
"timer": null,
@@ -3039,17 +3039,17 @@ stubPackets.set(`console.count | default
"arguments": [
"default"
],
"columnNumber": 5,
"counter": {
"count": 3,
"label": "default"
},
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "count",
"lineNumber": 6,
"prefix": "",
"private": false,
"timeStamp": 1511365913334,
"timer": null,
@@ -3062,17 +3062,17 @@ stubPackets.set(`console.count | default
stubPackets.set(`console.count | clear`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [],
"columnNumber": 5,
"counter": null,
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "clear",
"lineNumber": 7,
"prefix": "",
"private": false,
"timeStamp": 1511365913334,
"timer": null,
@@ -3090,17 +3090,17 @@ stubPackets.set(`console.count | default
"arguments": [
"default"
],
"columnNumber": 5,
"counter": {
"count": 4,
"label": "default"
},
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "count",
"lineNumber": 8,
"prefix": "",
"private": false,
"timeStamp": 1511365913335,
"timer": null,
@@ -3118,17 +3118,17 @@ stubPackets.set(`console.count | test co
"arguments": [
"test counter"
],
"columnNumber": 5,
"counter": {
"count": 3,
"label": "test counter"
},
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "count",
"lineNumber": 9,
"prefix": "",
"private": false,
"timeStamp": 1511365913335,
"timer": null,
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
rename to devtools/client/webconsole/test/fixtures/stubs/cssMessage.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/cssMessage.js
@@ -4,34 +4,34 @@
"use strict";
/*
* THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
*/
const { ConsoleMessage } =
- require("devtools/client/webconsole/new-console-output/types");
+ require("devtools/client/webconsole/types");
let stubPreparedMessages = new Map();
let stubPackets = new Map();
stubPreparedMessages.set(`Unknown property ‘such-unknown-property’. Declaration dropped.`, new ConsoleMessage({
"id": "1",
"allowRepeating": true,
"source": "css",
"timeStamp": 1479159920406,
"type": "log",
"helperType": null,
"level": "warn",
"messageText": "Unknown property ‘such-unknown-property’. Declaration dropped.",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html\",\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html\",\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html",
"line": 3,
"column": 25
},
"groupId": null,
"userProvidedStyles": null,
"notes": null,
"indent": 0,
"prefix": "",
@@ -43,20 +43,20 @@ stubPreparedMessages.set(`Error in parsing value for ‘padding-top’. Declaration dropped.`, new ConsoleMessage({
"allowRepeating": true,
"source": "css",
"timeStamp": 1479159920465,
"type": "log",
"helperType": null,
"level": "warn",
"messageText": "Error in parsing value for ‘padding-top’. Declaration dropped.",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html\",\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html\",\"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,
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html",
"line": 3,
"column": 16
},
"groupId": null,
"userProvidedStyles": null,
"notes": null,
"indent": 0,
"prefix": "",
@@ -64,17 +64,17 @@ stubPreparedMessages.set(`Error in parsing value for ‘padding-top’. Declaration dropped.`, new ConsoleMessage({
}));
stubPackets.set(`Unknown property ‘such-unknown-property’. Declaration dropped.`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "pageError",
"pageError": {
"errorMessage": "Unknown property ‘such-unknown-property’. Declaration dropped.",
"errorMessageName": "",
- "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html",
+ "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html",
"lineText": "",
"lineNumber": 3,
"columnNumber": 25,
"category": "CSS Parser",
"timeStamp": 1479159920406,
"warning": true,
"error": false,
"exception": false,
@@ -87,17 +87,17 @@ stubPackets.set(`Unknown property ‘such-unknown-property’. Declaration dropped.`, {
});
stubPackets.set(`Error in parsing value for ‘padding-top’. Declaration dropped.`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "pageError",
"pageError": {
"errorMessage": "Error in parsing value for ‘padding-top’. Declaration dropped.",
"errorMessageName": "",
- "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html",
+ "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html",
"lineText": "",
"lineNumber": 3,
"columnNumber": 16,
"category": "CSS Parser",
"timeStamp": 1479159920465,
"warning": true,
"error": false,
"exception": false,
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
rename to devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js
@@ -4,17 +4,17 @@
"use strict";
/*
* THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
*/
const { ConsoleMessage } =
- require("devtools/client/webconsole/new-console-output/types");
+ require("devtools/client/webconsole/types");
let stubPreparedMessages = new Map();
let stubPackets = new Map();
stubPreparedMessages.set(`new Date(0)`, new ConsoleMessage({
"id": "1",
"allowRepeating": true,
"source": "javascript",
"timeStamp": 1479159921364,
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/index.js
rename to devtools/client/webconsole/test/fixtures/stubs/index.js
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/moz.build
rename to devtools/client/webconsole/test/fixtures/stubs/moz.build
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
rename to devtools/client/webconsole/test/fixtures/stubs/networkEvent.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/networkEvent.js
@@ -4,63 +4,63 @@
"use strict";
/*
* THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
*/
const { NetworkEventMessage } =
- require("devtools/client/webconsole/new-console-output/types");
+ require("devtools/client/webconsole/types");
let stubPreparedMessages = new Map();
let stubPackets = new Map();
stubPreparedMessages.set("GET request", new NetworkEventMessage({
"id": "1",
"actor": "server1.conn0.child1/netEvent30",
"level": "log",
"isXHR": false,
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "GET"
},
"response": {},
"source": "network",
"type": "log",
"groupId": null,
"timeStamp": 1487022056850,
"indent": 0,
"updates": [],
"openedOnce": false,
"securityState": null,
"securityInfo": null,
"requestHeadersFromUploadStream": null,
"private": false,
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"urlDetails": {
"baseNameWithQuery": "inexistent.html",
"host": "example.com",
"scheme": "http",
- "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"isLocal": null
},
"method": "GET",
"cause": {
"type": "img",
- "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+ "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
"stacktraceAvailable": true
}
}));
stubPreparedMessages.set("GET request update", new NetworkEventMessage({
"id": "1",
"actor": "server1.conn0.child1/netEvent30",
"level": "log",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "GET",
"headersSize": 489
},
"response": {
"httpVersion": "HTTP/1.1",
"status": "404",
"statusText": "Not Found",
"headersSize": 160,
@@ -76,70 +76,70 @@ stubPreparedMessages.set("GET request up
"type": "log",
"groupId": null,
"totalTime": 16,
"indent": 0,
"openedOnce": false,
"securityState": null,
"securityInfo": null,
"requestHeadersFromUploadStream": null,
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"urlDetails": {
"baseNameWithQuery": "inexistent.html",
"host": "example.com",
"scheme": "http",
- "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"isLocal": null
},
"method": "GET"
}));
stubPreparedMessages.set("XHR GET request", new NetworkEventMessage({
"id": "1",
"actor": "server1.conn1.child1/netEvent30",
"level": "log",
"isXHR": true,
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "GET"
},
"response": {},
"source": "network",
"type": "log",
"groupId": null,
"timeStamp": 1487022057746,
"indent": 0,
"updates": [],
"openedOnce": false,
"securityState": null,
"securityInfo": null,
"requestHeadersFromUploadStream": null,
"private": false,
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"urlDetails": {
"baseNameWithQuery": "inexistent.html",
"host": "example.com",
"scheme": "http",
- "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"isLocal": null
},
"method": "GET",
"cause": {
"type": "xhr",
- "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+ "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
"stacktraceAvailable": true
}
}));
stubPreparedMessages.set("XHR GET request update", new NetworkEventMessage({
"id": "1",
"actor": "server1.conn0.child1/netEvent31",
"level": "log",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "GET",
"headersSize": 489
},
"response": {
"httpVersion": "HTTP/1.1",
"status": "404",
"statusText": "Not Found",
"headersSize": 160,
@@ -155,70 +155,70 @@ stubPreparedMessages.set("XHR GET reques
"type": "log",
"groupId": null,
"totalTime": 16,
"indent": 0,
"openedOnce": false,
"securityState": null,
"securityInfo": null,
"requestHeadersFromUploadStream": null,
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"urlDetails": {
"baseNameWithQuery": "inexistent.html",
"host": "example.com",
"scheme": "http",
- "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"isLocal": null
},
"method": "GET"
}));
stubPreparedMessages.set("XHR POST request", new NetworkEventMessage({
"id": "1",
"actor": "server1.conn2.child1/netEvent30",
"level": "log",
"isXHR": true,
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "POST"
},
"response": {},
"source": "network",
"type": "log",
"groupId": null,
"timeStamp": 1487022058414,
"indent": 0,
"updates": [],
"openedOnce": false,
"securityState": null,
"securityInfo": null,
"requestHeadersFromUploadStream": null,
"private": false,
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"urlDetails": {
"baseNameWithQuery": "inexistent.html",
"host": "example.com",
"scheme": "http",
- "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"isLocal": null
},
"method": "POST",
"cause": {
"type": "xhr",
- "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+ "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
"stacktraceAvailable": true
}
}));
stubPreparedMessages.set("XHR POST request update", new NetworkEventMessage({
"id": "1",
"actor": "server1.conn0.child1/netEvent32",
"level": "log",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "POST",
"headersSize": 509
},
"response": {
"httpVersion": "HTTP/1.1",
"status": "404",
"statusText": "Not Found",
"headersSize": 160,
@@ -234,58 +234,58 @@ stubPreparedMessages.set("XHR POST reque
"type": "log",
"groupId": null,
"totalTime": 10,
"indent": 0,
"openedOnce": false,
"securityState": null,
"securityInfo": null,
"requestHeadersFromUploadStream": null,
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"urlDetails": {
"baseNameWithQuery": "inexistent.html",
"host": "example.com",
"scheme": "http",
- "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"isLocal": null
},
"method": "POST"
}));
stubPackets.set(`GET request`, {
"_type": "NetworkEvent",
"timeStamp": 1487022056850,
"node": null,
"actor": "server1.conn0.child1/netEvent30",
"discardRequestBody": true,
"discardResponseBody": true,
"startedDateTime": "2017-02-13T21:40:56.850Z",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "GET"
},
"isXHR": false,
"cause": {
"type": "img",
- "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+ "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
"stacktraceAvailable": true
},
"response": {},
"timings": {},
"updates": [],
"private": false,
"from": "server1.conn0.child1/consoleActor2"
});
stubPackets.set(`GET request update`, {
"networkInfo": {
"_type": "NetworkEvent",
"actor": "server1.conn0.child1/netEvent30",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "GET",
"headersSize": 489
},
"response": {
"httpVersion": "HTTP/1.1",
"status": "404",
"statusText": "Not Found",
"headersSize": 160,
@@ -305,38 +305,38 @@ stubPackets.set(`XHR GET request`, {
"_type": "NetworkEvent",
"timeStamp": 1487022057746,
"node": null,
"actor": "server1.conn1.child1/netEvent30",
"discardRequestBody": true,
"discardResponseBody": true,
"startedDateTime": "2017-02-13T21:40:57.746Z",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "GET"
},
"isXHR": true,
"cause": {
"type": "xhr",
- "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+ "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
"stacktraceAvailable": true
},
"response": {},
"timings": {},
"updates": [],
"private": false,
"from": "server1.conn1.child1/consoleActor2"
});
stubPackets.set(`XHR GET request update`, {
"networkInfo": {
"_type": "NetworkEvent",
"actor": "server1.conn0.child1/netEvent31",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "GET",
"headersSize": 489
},
"response": {
"httpVersion": "HTTP/1.1",
"status": "404",
"statusText": "Not Found",
"headersSize": 160,
@@ -356,38 +356,38 @@ stubPackets.set(`XHR POST request`, {
"_type": "NetworkEvent",
"timeStamp": 1487022058414,
"node": null,
"actor": "server1.conn2.child1/netEvent30",
"discardRequestBody": true,
"discardResponseBody": true,
"startedDateTime": "2017-02-13T21:40:58.414Z",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "POST"
},
"isXHR": true,
"cause": {
"type": "xhr",
- "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+ "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
"stacktraceAvailable": true
},
"response": {},
"timings": {},
"updates": [],
"private": false,
"from": "server1.conn2.child1/consoleActor2"
});
stubPackets.set(`XHR POST request update`, {
"networkInfo": {
"_type": "NetworkEvent",
"actor": "server1.conn0.child1/netEvent32",
"request": {
- "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+ "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
"method": "POST",
"headersSize": 509
},
"response": {
"httpVersion": "HTTP/1.1",
"status": "404",
"statusText": "Not Found",
"headersSize": 160,
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
rename to devtools/client/webconsole/test/fixtures/stubs/pageError.js
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/pageError.js
@@ -4,46 +4,46 @@
"use strict";
/*
* THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN TESTS IN FIXTURES/ TO UPDATE.
*/
const { ConsoleMessage } =
- require("devtools/client/webconsole/new-console-output/types");
+ require("devtools/client/webconsole/types");
let stubPreparedMessages = new Map();
let stubPackets = new Map();
stubPreparedMessages.set(`ReferenceError: asdf is not defined`, new ConsoleMessage({
"id": "1",
"allowRepeating": true,
"source": "javascript",
"timeStamp": 1476573167137,
"type": "log",
"helperType": null,
"level": "error",
"messageText": "ReferenceError: asdf is not defined",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"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/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineNumber": 3,
"columnNumber": 5,
"functionName": "bar"
},
{
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineNumber": 6,
"columnNumber": 5,
"functionName": "foo"
},
{
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineNumber": 9,
"columnNumber": 3,
"functionName": null
},
{
"filename": "resource://testing-common/content-task.js line 50 > eval",
"lineNumber": 7,
"columnNumber": 9,
@@ -52,17 +52,17 @@ stubPreparedMessages.set(`ReferenceError
{
"filename": "resource://testing-common/content-task.js",
"lineNumber": 51,
"columnNumber": 20,
"functionName": null
}
],
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 3,
"column": 5
},
"groupId": null,
"exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
"userProvidedStyles": null,
"notes": null,
"indent": 0,
@@ -75,43 +75,43 @@ stubPreparedMessages.set(`SyntaxError: r
"allowRepeating": true,
"source": "javascript",
"timeStamp": 1487992945524,
"type": "log",
"helperType": null,
"level": "error",
"messageText": "SyntaxError: redeclaration of let a",
"parameters": null,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"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 50 > eval",
"lineNumber": 7,
"columnNumber": 9,
"functionName": null
},
{
"filename": "resource://testing-common/content-task.js",
"lineNumber": 51,
"columnNumber": 20,
"functionName": null
}
],
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 9
},
"groupId": null,
"userProvidedStyles": null,
"notes": [
{
"messageBody": "Previously declared at line 2, column 6",
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 6
}
}
],
"indent": 0,
"prefix": "",
"private": false
@@ -127,20 +127,20 @@ stubPreparedMessages.set(`TypeError long
"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,
- "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"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}",
+ "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"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/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineNumber": 1,
"columnNumber": 7,
"functionName": null
},
{
"filename": "resource://testing-common/content-task.js line 50 > eval",
"lineNumber": 7,
"columnNumber": 9,
@@ -149,17 +149,17 @@ stubPreparedMessages.set(`TypeError long
{
"filename": "resource://testing-common/content-task.js",
"lineNumber": 51,
"columnNumber": 20,
"functionName": null
}
],
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 1,
"column": 7
},
"groupId": null,
"userProvidedStyles": null,
"notes": null,
"indent": 0,
"prefix": "",
@@ -210,43 +210,43 @@ stubPreparedMessages.set(`throw "tomato"
stubPackets.set(`ReferenceError: asdf is not defined`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "pageError",
"pageError": {
"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/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineText": "",
"lineNumber": 3,
"columnNumber": 5,
"category": "content javascript",
"timeStamp": 1476573167137,
"warning": false,
"error": false,
"exception": true,
"strict": false,
"info": false,
"private": false,
"stacktrace": [
{
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineNumber": 3,
"columnNumber": 5,
"functionName": "bar"
},
{
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineNumber": 6,
"columnNumber": 5,
"functionName": "foo"
},
{
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineNumber": 9,
"columnNumber": 3,
"functionName": null
},
{
"filename": "resource://testing-common/content-task.js line 50 > eval",
"lineNumber": 7,
"columnNumber": 9,
@@ -264,17 +264,17 @@ stubPackets.set(`ReferenceError: asdf is
});
stubPackets.set(`SyntaxError: redeclaration of let a`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "pageError",
"pageError": {
"errorMessage": "SyntaxError: redeclaration of let a",
"errorMessageName": "JSMSG_REDECLARED_VAR",
- "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineText": " let a, a;\n",
"lineNumber": 2,
"columnNumber": 9,
"category": "content javascript",
"timeStamp": 1487992945524,
"warning": false,
"error": false,
"exception": true,
@@ -294,17 +294,17 @@ stubPackets.set(`SyntaxError: redeclarat
"columnNumber": 20,
"functionName": null
}
],
"notes": [
{
"messageBody": "Previously declared at line 2, column 6",
"frame": {
- "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 2,
"column": 6
}
}
]
}
});
@@ -314,31 +314,31 @@ stubPackets.set(`TypeError longString me
"pageError": {
"errorMessage": {
"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"
},
"errorMessageName": "",
- "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineText": "",
"lineNumber": 1,
"columnNumber": 7,
"category": "content javascript",
"timeStamp": 1493109507061,
"warning": false,
"error": false,
"exception": true,
"strict": false,
"info": false,
"private": false,
"stacktrace": [
{
- "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+ "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"lineNumber": 1,
"columnNumber": 7,
"functionName": null
},
{
"filename": "resource://testing-common/content-task.js line 50 > eval",
"lineNumber": 7,
"columnNumber": 9,
rename from devtools/client/webconsole/new-console-output/test/helpers.js
rename to devtools/client/webconsole/test/helpers.js
--- a/devtools/client/webconsole/new-console-output/test/helpers.js
+++ b/devtools/client/webconsole/test/helpers.js
@@ -1,21 +1,21 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const reduxActions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { configureStore } = require("devtools/client/webconsole/new-console-output/store");
-const { IdGenerator } = require("devtools/client/webconsole/new-console-output/utils/id-generator");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const { getAllMessagesById } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { getPrefsService } = require("devtools/client/webconsole/new-console-output/utils/prefs");
+const reduxActions = require("devtools/client/webconsole/actions/index");
+const { configureStore } = require("devtools/client/webconsole/store");
+const { IdGenerator } = require("devtools/client/webconsole/utils/id-generator");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const { getAllMessagesById } = require("devtools/client/webconsole/selectors/messages");
+const { getPrefsService } = require("devtools/client/webconsole/utils/prefs");
const prefsService = getPrefsService({});
-const { PREFS } = require("devtools/client/webconsole/new-console-output/constants");
+const { PREFS } = require("devtools/client/webconsole/constants");
/**
* Prepare actions for use in testing.
*/
function setupActions() {
// Some actions use dependency injection. This helps them avoid using state in
// a hard-to-test way. We need to inject stubbed versions of these dependencies.
const wrappedActions = Object.assign({}, reduxActions);
rename from devtools/client/webconsole/new-console-output/test/middleware/.eslintrc.js
rename to devtools/client/webconsole/test/middleware/.eslintrc.js
rename from devtools/client/webconsole/new-console-output/test/middleware/debounce.test.js
rename to devtools/client/webconsole/test/middleware/debounce.test.js
rename from devtools/client/webconsole/new-console-output/test/mocha-test-setup.js
rename to devtools/client/webconsole/test/mocha-test-setup.js
--- a/devtools/client/webconsole/new-console-output/test/mocha-test-setup.js
+++ b/devtools/client/webconsole/test/mocha-test-setup.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
/* eslint-env node */
"use strict";
-const mcRoot = `${__dirname}/../../../../../`;
+const mcRoot = `${__dirname}/../../../../`;
const getModule = mcPath => `module.exports = require("${mcRoot}${mcPath}");`;
const { Services: { pref } } = require("devtools-modules");
pref("devtools.debugger.remote-timeout", 10000);
pref("devtools.hud.loglimit", 10000);
pref("devtools.webconsole.filter.error", true);
pref("devtools.webconsole.filter.warn", true);
pref("devtools.webconsole.filter.info", true);
@@ -45,28 +45,28 @@ requireHacker.global_hook("default", (pa
return getModule("devtools/client/shared/vendor/react-dev");
}
// Some modules depend on Chrome APIs which don't work in mocha. When such a module
// is required, replace it with a mock version.
switch (path) {
case "devtools/shared/l10n":
return getModule(
- "devtools/client/webconsole/new-console-output/test/fixtures/LocalizationHelper");
+ "devtools/client/webconsole/test/fixtures/LocalizationHelper");
case "devtools/shared/plural-form":
return getModule(
- "devtools/client/webconsole/new-console-output/test/fixtures/PluralForm");
+ "devtools/client/webconsole/test/fixtures/PluralForm");
case "Services":
case "Services.default":
return `module.exports = require("devtools-modules/src/Services")`;
case "devtools/shared/client/object-client":
return `() => {}`;
case "devtools/client/netmonitor/src/components/TabboxPanel":
return "{}";
- case "devtools/client/webconsole/new-console-output/utils/context-menu":
+ case "devtools/client/webconsole/utils/context-menu":
return "{}";
case "devtools/shared/event-emitter":
return `module.exports = require("devtools-modules/src/utils/event-emitter")`;
}
// We need to rewrite all the modules assuming the root is mozilla-central and give them
// an absolute path.
if (path.startsWith("devtools/")) {
rename from devtools/client/webconsole/new-console-output/test/mochitest/.eslintrc.js
rename to devtools/client/webconsole/test/mochitest/.eslintrc.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/.eslintrc.js
+++ b/devtools/client/webconsole/test/mochitest/.eslintrc.js
@@ -1,6 +1,6 @@
"use strict";
module.exports = {
// Extend from the shared list of defined globals for mochitests.
- "extends": "../../../../../.eslintrc.mochitests.js"
+ "extends": "../../../../.eslintrc.mochitests.js"
};
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
rename to devtools/client/webconsole/test/mochitest/browser.ini
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js
rename to devtools/client/webconsole/test/mochitest/browser_console.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js
+++ b/devtools/client/webconsole/test/mochitest/browser_console.js
@@ -3,26 +3,26 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test the basic features of the Browser Console.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html?" +
+ "test/mochitest/test-console.html?" +
Date.now();
const TEST_FILE = "chrome://mochitests/content/browser/devtools/client/" +
- "webconsole/new-console-output/test/mochitest/" +
+ "webconsole/test/mochitest/" +
"test-cu-reporterror.js";
const TEST_XHR_ERROR_URI = `http://example.com/404.html?${Date.now()}`;
const TEST_IMAGE = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/test-image.png";
+ "test/test-image.png";
const ObjectClient = require("devtools/shared/client/object-client");
add_task(async function() {
await addTab(TEST_URI);
let opened = waitForBrowserConsole();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_clear_method.js
rename to devtools/client/webconsole/test/mochitest/browser_console_clear_method.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_consolejsm_output.js
rename to devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js
rename to devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js
+++ b/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js
@@ -1,17 +1,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Check that we display the expected context menu entries.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
// Enable net messages in the console for this test.
await pushPref("devtools.browserconsole.filter.net", true);
await addTab(TEST_URI);
const hud = await HUDService.toggleBrowserConsole();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_dead_objects.js
rename to devtools/client/webconsole/test/mochitest/browser_console_dead_objects.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_devtools_loader_exception.js
rename to devtools/client/webconsole/test/mochitest/browser_console_devtools_loader_exception.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_error_source_click.js
rename to devtools/client/webconsole/test/mochitest/browser_console_error_source_click.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_filters.js
rename to devtools/client/webconsole/test/mochitest/browser_console_filters.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_nsiconsolemessage.js
rename to devtools/client/webconsole/test/mochitest/browser_console_nsiconsolemessage.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_open_or_focus.js
rename to devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_restore.js
rename to devtools/client/webconsole/test/mochitest/browser_console_restore.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_console_api_calls.js
rename to devtools/client/webconsole/test/mochitest/browser_console_webconsole_console_api_calls.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_ctrlw_close_tab.js
rename to devtools/client/webconsole/test/mochitest/browser_console_webconsole_ctrlw_close_tab.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_iframe_messages.js
rename to devtools/client/webconsole/test/mochitest/browser_console_webconsole_iframe_messages.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_iframe_messages.js
+++ b/devtools/client/webconsole/test/mochitest/browser_console_webconsole_iframe_messages.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Check that cached messages from nested iframes are displayed in the
// Web/Browser Console.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console-iframes.html";
+ "test/mochitest/test-console-iframes.html";
const expectedMessages = [
"main file",
"blah",
"iframe 2",
"iframe 3"
];
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_private_browsing.js
rename to devtools/client/webconsole/test/mochitest/browser_console_webconsole_private_browsing.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_accessibility.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_add_edited_input_to_history.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test that autocomplete doesn't break when trying to reach into objects from
// a different domain. See Bug 989025.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-iframe-parent.html";
+ "test/mochitest/test-iframe-parent.html";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
const { jsterm } = hud;
const onParentTitle = waitForMessage(hud, "iframe parent");
jsterm.execute("document.title");
await onParentTitle;
ok(true, "root document's title is accessible");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_escape_key.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test that makes sure web console autocomplete happens in the user-selected
// stackframe from the js debugger.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-autocomplete-in-stackframe.html";
+ "test/mochitest/test-autocomplete-in-stackframe.html";
add_task(async function() {
// Force the old debugger UI since it's directly used (see Bug 1301705)
await pushPref("devtools.debugger.new-debugger-frontend", false);
let { jsterm } = await openNewTabAndConsole(TEST_URI);
const {
autocompletePopup: popup,
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_inside_text.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_native_getters.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_completion.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_a_select_all.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_key_nav.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_document_no_xray.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_dollar.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_dollar.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_dollar.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_dollar.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test that using `$` and `$$` in jsterm call the global content functions
// if they are defined. See Bug 621644.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-jsterm-dollar.html";
+ "test/mochitest/test-jsterm-dollar.html";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
await test$(hud);
await test$$(hud);
});
async function test$(hud) {
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_docs.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_outside_valid_range.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_clear.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar_dollar.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar_x.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_help.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_keys_values.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_pprint.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_persist.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_input_expansion.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_inspect.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_instance_of.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_multiline.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_multiline.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
@@ -5,17 +5,17 @@
// Tests that the console waits for more input instead of evaluating
// when valid, but incomplete, statements are present upon pressing enter
// -or- when the user ends a line with shift + enter.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
let SHOULD_ENTER_MULTILINE = [
{input: "function foo() {" },
{input: "var a = 1," },
{input: "var a = 1;", shiftKey: true },
{input: "function foo() { }", shiftKey: true },
{input: "function" },
{input: "(x) =>" },
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests for bug 704295
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
testCompletion(hud);
});
function testCompletion(hud) {
let jsterm = hud.jsterm;
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_null_undefined.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_popup.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_selfxss.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
@@ -9,17 +9,17 @@
// are logged to the console and have the correct "Learn More"
// url appended to them.
// Bug 875456 - Log mixed content messages from the Mixed Content
// Blocker to the Security Pane in the Web Console
"use strict";
const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-mixedcontent-securityerrors.html";
const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" +
"Mixed_content" + DOCS_GA_PARAMS;
add_task(async function() {
await Promise.all([
pushPref("security.mixed_content.block_active_content", false),
pushPref("security.mixed_content.block_display_content", false),
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_batching.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_batching.js
@@ -3,18 +3,18 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Check adding console calls as batch keep the order of the message.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-batching.html";
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+ "test/mochitest/test-batching.html";
+const { l10n } = require("devtools/client/webconsole/utils/messages");
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
const messageNumber = 100;
await testSimpleBatchLogging(hud, messageNumber);
await testBatchLoggingAndClear(hud, messageNumber);
});
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
@@ -12,17 +12,17 @@
// by clicking on the doorhanger shield and validates that the
// appropriate messages are logged to console.
// Bug 875456 - Log mixed content messages from the Mixed Content
// Blocker to the Security Pane in the Web Console.
"use strict";
const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-mixedcontent-securityerrors.html";
const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" +
"Mixed_content" + DOCS_GA_PARAMS;
const blockedActiveContentText = "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";
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test to see if the cached messages are displayed when the console UI is
// opened.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-webconsole-error-observer.html";
add_task(async function() {
// On e10s, the exception is triggered in child process
// and is ignored by test harness
if (!Services.appinfo.browserTabsRemoteAutostart) {
expectUncaughtException();
}
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_cd_iframe.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_cd_iframe.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test that the cd() jsterm helper function works as expected. See bug 609872.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-cd-iframe-parent.html";
+ "test/mochitest/test-cd-iframe-parent.html";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
info("Test initial state");
await executeWindowTest(hud, "parent");
info("cd() into the iframe using a selector");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_certificate_messages.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_certificate_messages.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that the Web Console shows weak crypto warnings (SHA-1 Certificate)
"use strict";
const TEST_URI = "data:text/html;charset=utf8,Web Console weak crypto warnings test";
-const TEST_URI_PATH = "/browser/devtools/client/webconsole/new-console-output/test/" +
+const TEST_URI_PATH = "/browser/devtools/client/webconsole/test/" +
"mochitest/test-certificate-messages.html";
const SHA1_URL = "https://sha1ee.example.com" + TEST_URI_PATH;
const SHA256_URL = "https://sha256ee.example.com" + TEST_URI_PATH;
const TRIGGER_MSG = "If you haven't seen ssl warnings yet, you won't";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_click_function_to_source.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_click_function_to_source.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that clicking on a function displays its source in the debugger. See Bug 1050691.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-click-function-to-source.html";
// Force the old debugger UI since it's directly used (see Bug 1301705)
pushPref("devtools.debugger.new-debugger-frontend", false);
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_clickable_urls.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_sidebar.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_close_sidebar.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_close_unfocused_window.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_close_unfocused_window.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// See Bug 597103. Check that closing the console on an unfocused window does not trigger
// any error.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
let tab1 = await addTab(TEST_URI, {window});
info("Open a second window");
let win2 = await openNewBrowserWindow();
info("Add a test tab in the second window");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_closing_after_completion.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_closing_after_completion.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests to ensure that errors don't appear when the console is closed while a
// completion is being performed. See Bug 580001.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
let tab = await addTab(TEST_URI);
const browser = tab.linkedBrowser;
const hud = await openConsole();
// Fire a completion.
await jstermSetValueAndComplete(hud.jsterm, "doc");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_closure_inspection.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_closure_inspection.js
@@ -7,17 +7,17 @@
/* eslint-disable no-undef */
// Check that inspecting a closure in the variables view sidebar works when
// execution is paused.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-closures.html";
+ "test/mochitest/test-closures.html";
var gWebConsole, gJSTerm, gVariablesView;
// Force the old debugger UI since it's directly used (see Bug 1301705)
Services.prefs.setBoolPref("devtools.debugger.new-debugger-frontend", false);
registerCleanupFunction(function() {
Services.prefs.clearUserPref("devtools.debugger.new-debugger-frontend");
});
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_api_iframe.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_api_iframe.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Check that Console API works with iframes. See Bug 613013.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console-api-iframe.html";
+ "test/mochitest/test-console-api-iframe.html";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
const loggedString = "iframe added";
// Wait for the initial message to be displayed.
await waitFor(() => findMessage(hud, loggedString));
ok(true, "The initial message is displayed in the console");
// Create a promise for the message logged after the reload.
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir_uninspectable.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir_uninspectable.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_group.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_group.js
@@ -4,19 +4,19 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Check console.group, console.groupCollapsed and console.groupEnd calls
// behave as expected.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console-group.html";
+ "test/mochitest/test-console-group.html";
const { INDENT_WIDTH } =
- require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+ require("devtools/client/webconsole/components/MessageIndent");
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
const store = hud.ui.newConsoleOutput.getStore();
logAllStoreChanges(hud);
const onMessagesLogged = waitForMessage(hud, "log-6");
ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_logging_workers_api.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_logging_workers_api.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that the basic console.log()-style APIs and filtering work for
// sharedWorkers
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console-workers.html";
+ "test/mochitest/test-console-workers.html";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
const message = await waitFor(() => findMessage(hud, "foo-bar-shared-worker"));
is(
message.querySelector(".message-body").textContent,
`foo-bar-shared-worker Object { foo: "bar" }`,
"log from SharedWorker is displayed as expected"
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_table.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_table.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Check console.table calls with all the test cases shown
// in the MDN doc (https://developer.mozilla.org/en-US/docs/Web/API/Console/table)
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console-table.html";
+ "test/mochitest/test-console-table.html";
add_task(async function() {
let toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
let hud = toolbox.getCurrentPanel().hud;
function Person(firstName, lastName) {
this.firstName = firstName;
this.lastName = lastName;
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_duplicates.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_duplicates.js
@@ -1,17 +1,17 @@
/* -*- 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 TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-console-trace-duplicates.html";
add_task(async function testTraceMessages() {
let hud = await openNewTabAndConsole(TEST_URI);
// NB: Now that stack frames include a column number multiple invocations
// on the same line are considered unique. ie:
// |foo(); foo();|
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test the Copy Link Location menu item of the webconsole is displayed for network
// messages and copies the expected URL.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html?_date=" +
+ "test/mochitest/test-console.html?_date=" +
Date.now();
const CONTEXT_MENU_ID = "#console-menu-copy-url";
add_task(async function() {
// Enable net messages in the console for this test.
await pushPref("devtools.webconsole.filter.net", true);
let hud = await openNewTabAndConsole(TEST_URI);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_object.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_object.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_open_url.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_open_url.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test that the Open URL in new Tab menu item is displayed for network logs and works as
// expected.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
// Enable net messages in the console for this test.
await pushPref("devtools.webconsole.filter.net", true);
let hud = await openNewTabAndConsole(TEST_URI);
hud.jsterm.clearOutput();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_store_as_global.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
@@ -6,17 +6,17 @@
// Tests that a file with an unsupported CSP directive ('reflected-xss filter')
// displays the appropriate message to the console. See Bug 1045902.
"use strict";
const EXPECTED_RESULT = "Not supporting directive \u2018reflected-xss\u2019. " +
"Directive and values will be ignored.";
const TEST_FILE = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test_console_csp_ignore_reflected_xss_message.html";
const TEST_URI =
"data:text/html;charset=utf8,Web Console CSP ignoring reflected XSS (bug 1045902)";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
await loadDocument(TEST_FILE);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_csp_violation.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_violation.js
@@ -5,17 +5,17 @@
// Tests that the Web Console CSP messages for two META policies
// are correctly displayed. See Bug 1247459.
"use strict";
const TEST_URI = "data:text/html;charset=utf8,Web Console CSP violation test";
const TEST_VIOLATION = "https://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-csp-violation.html";
+ "test/mochitest/test-csp-violation.html";
const CSP_VIOLATION_MSG = "Content Security Policy: The page\u2019s settings " +
"blocked the loading of a resource at " +
"http://some.example.com/test.png (\u201cimg-src\u201d).";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
hud.jsterm.clearOutput();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_cspro.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_cspro.js
@@ -13,17 +13,17 @@ CSP_REPORT_MSG are confirmed to be found
See Bug 1010953.
*/
"use strict";
const TEST_URI = "data:text/html;charset=utf8,Web Console CSP report only test";
const TEST_VIOLATION = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-cspro.html";
+ "test/mochitest/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).";
const CSP_REPORT_MSG =
"Content Security Policy: The page\u2019s settings observed the loading of a " +
"resource at http://some.example.com/cspro.js " +
"(\u201cscript-src\u201d). A CSP report is being sent.";
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_document_focus.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_document_focus.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_duplicate_errors.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_duplicate_errors.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that exceptions thrown by content don't show up twice in the Web
// Console. See Bug 582201.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-duplicate-error.html";
+ "test/mochitest/test-duplicate-error.html";
add_task(async function() {
// On e10s, the exception is triggered in child process
// and is ignored by test harness
if (!Services.appinfo.browserTabsRemoteAutostart) {
expectUncaughtException();
}
let hud = await openNewTabAndConsole(TEST_URI);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_errors_after_page_reload.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_errors_after_page_reload.js
@@ -5,17 +5,17 @@
// Tests that errors still show up in the Web Console after a page reload.
// See bug 580030: the error handler fails silently after page reload.
// https://bugzilla.mozilla.org/show_bug.cgi?id=580030
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-error.html";
+ "test/mochitest/test-error.html";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
info("Reload the content window");
let onNavigate = hud.target.once("navigate");
ContentTask.spawn(gBrowser.selectedBrowser, null, () => {
content.wrappedJSObject.location.reload();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test that makes sure web console eval happens in the user-selected stackframe
// from the js debugger.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-eval-in-stackframe.html";
+ "test/mochitest/test-eval-in-stackframe.html";
add_task(async function() {
// Force the old debugger UI since it's directly used (see Bug 1301705).
await pushPref("devtools.debugger.new-debugger-frontend", false);
info("open the console");
const hud = await openNewTabAndConsole(TEST_URI);
const {jsterm} = hud;
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
@@ -5,17 +5,17 @@
// Test to make sure that web console commands can fire while paused at a
// breakpoint that was triggered from a JS call. Relies on asynchronous js
// evaluation over the protocol - see Bug 1088861.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-eval-in-stackframe.html";
+ "test/mochitest/test-eval-in-stackframe.html";
add_task(async function() {
// Force the old debugger UI since it's directly used (see Bug 1301705).
await pushPref("devtools.debugger.new-debugger-frontend", false);
info("open the console");
const hud = await openNewTabAndConsole(TEST_URI);
const {jsterm} = hud;
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_execution_scope.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_execution_scope.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that commands run by the user are executed in content space.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
const {jsterm} = hud;
jsterm.clearOutput();
const onInputMessage = waitForMessage(hud, "window.location.href;", ".message.command");
const onEvaluationResultMessage = waitForMessage(hud, TEST_URI, ".message.result");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_external_script_errors.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_external_script_errors.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// See Bug 597136.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-external-script-errors.html";
add_task(async function() {
// On e10s, the exception is triggered in child process
// and is ignored by test harness
if (!Services.appinfo.browserTabsRemoteAutostart) {
expectUncaughtException();
}
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_file_uri.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_file_uri.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_filter_scroll.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_filters.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_filters.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests filters.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console-filters.html";
+ "test/mochitest/test-console-filters.html";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
await setFilterBarVisible(hud, true);
let filterState = await getFilterState(hud);
// Check defaults.
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_filters_persist.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_filters_persist.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests all filters persist.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console-filters.html";
+ "test/mochitest/test-console-filters.html";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
let filterButtons = await getFilterButtons(hud);
info("Disable all filters");
filterButtons.forEach(filterButton => {
if (filterIsEnabled(filterButton)) {
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_highlighter_console_helper.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_history_arrow_keys.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that errors about invalid HPKP security headers are logged to the web console.
"use strict";
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/" +
- "new-console-output/test/mochitest/test_hpkp-invalid-headers.sjs";
+ "test/mochitest/test_hpkp-invalid-headers.sjs";
const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/" +
"Public_Key_Pinning" + DOCS_GA_PARAMS;
const NON_BUILTIN_ROOT_PREF =
"security.cert_pinning.process_headers_from_non_builtin_roots";
add_task(async function() {
registerCleanupFunction(() => {
Services.prefs.clearUserPref(NON_BUILTIN_ROOT_PREF);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_hsts_invalid-headers.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_hsts_invalid-headers.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that errors about invalid HSTS security headers are logged to the web console.
"use strict";
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/" +
- "/new-console-output/test/mochitest/test_hsts-invalid-headers.sjs";
+ "/test/mochitest/test_hsts-invalid-headers.sjs";
const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/Headers/" +
"Strict-Transport-Security" + DOCS_GA_PARAMS;
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
await navigateAndCheckWarningMessage({
url: SJS_URL + "?badSyntax",
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_wrong_hud.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_iframe_wrong_hud.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_wrong_hud.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_iframe_wrong_hud.js
@@ -3,23 +3,23 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Ensure that iframes are not associated with the wrong hud. See Bug 593003.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-iframe-wrong-hud.html";
+ "test/mochitest/test-iframe-wrong-hud.html";
const TEST_IFRAME_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html";
+ "test/mochitest/test-iframe-wrong-hud-iframe.html";
const TEST_DUMMY_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
await pushPref("devtools.webconsole.filter.net", true);
const tab1 = await addTab(TEST_URI);
const hud1 = await openConsole(tab1);
const tab2 = await addTab(TEST_DUMMY_URI);
await openConsole(gBrowser.selectedTab);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
@@ -6,17 +6,17 @@
// Tests that warnings about ineffective iframe sandboxing are logged to the
// web console when necessary (and not otherwise). See Bug 752559.
"use strict";
requestLongerTimeout(2);
const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/";
+ "test/mochitest/";
const TEST_URI_WARNING = `${TEST_PATH}test-ineffective-iframe-sandbox-warning0.html`;
const TEST_URI_NOWARNING = [
`${TEST_PATH}test-ineffective-iframe-sandbox-warning1.html`,
`${TEST_PATH}test-ineffective-iframe-sandbox-warning2.html`,
`${TEST_PATH}test-ineffective-iframe-sandbox-warning3.html`,
`${TEST_PATH}test-ineffective-iframe-sandbox-warning4.html`,
`${TEST_PATH}test-ineffective-iframe-sandbox-warning5.html`
];
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_init.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_init.js
@@ -1,17 +1,17 @@
/* -*- 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 TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
let toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
let hud = toolbox.getCurrentPanel().hud;
let {ui} = hud;
ok(ui.jsterm, "jsterm exists");
ok(ui.newConsoleOutput, "newConsoleOutput exists");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_focus.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_input_focus.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that errors about insecure passwords are logged to the web console.
// See Bug 762593.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-insecure-passwords-about-blank-web-console-warning.html";
const INSECURE_PASSWORD_MSG = "Password fields present on an insecure (http://) iframe." +
" This is a security risk that allows user login credentials to be stolen.";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
await waitFor(()=> findMessage(hud, INSECURE_PASSWORD_MSG, ".message.warn"), "", 100);
ok(true, "Insecure password error displayed successfully");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
@@ -4,21 +4,21 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that errors about insecure passwords are logged to the web console.
// See Bug 762593.
"use strict";
const INSECURE_IFRAME_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-insecure-passwords-web-console-warning.html";
+ "test/mochitest/test-insecure-passwords-web-console-warning.html";
const INSECURE_PASSWORD_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-iframe-insecure-form-action.html";
+ "test/mochitest/test-iframe-insecure-form-action.html";
const INSECURE_FORM_ACTION_URI = "https://example.com/browser/devtools/client/" +
- "webconsole/new-console-output/test/mochitest/test-iframe-insecure-form-action.html";
+ "webconsole/test/mochitest/test-iframe-insecure-form-action.html";
const STOLEN = "This is a security risk that allows user login credentials to be stolen.";
const INSECURE_PASSWORD_MSG =
"Password fields present on an insecure (http://) page. " + STOLEN;
const INSECURE_FORM_ACTION_MSG =
"Password fields present in a form with an insecure (http://) form action. " + STOLEN;
const INSECURE_IFRAME_MSG =
"Password fields present on an insecure (http://) iframe. " + STOLEN;
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Check that users can inspect objects logged from cross-domain iframes -
// bug 869003.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-inspect-cross-domain-objects-top.html";
add_task(async function() {
requestLongerTimeout(2);
let hud = await openNewTabAndConsole("data:text/html;charset=utf8,<p>hello");
info("Wait for the 'foobar' message to be logged by the frame");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_js_input_expansion.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_js_input_expansion.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_js_input_expansion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_js_input_expansion.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that the input box expands as the user types long lines.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
const { jsterm } = await openNewTabAndConsole(TEST_URI);
jsterm.clearOutput();
const { inputNode } = jsterm;
const getInputHeight = () => inputNode.clientHeight;
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_keyboard_accessibility.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_keyboard_accessibility.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_location_debugger_link.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_location_debugger_link.js
@@ -11,17 +11,17 @@
// There are shutdown issues for which multiple rejections are left uncaught.
// See bug 1018184 for resolving these issues.
const { PromiseTestUtils } = scopedCuImport("resource://testing-common/PromiseTestUtils.jsm");
PromiseTestUtils.whitelistRejectionsGlobally(/this\.worker is null/);
requestLongerTimeout(2);
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-location-debugger-link.html";
+ "test/mochitest/test-location-debugger-link.html";
add_task(async function() {
// Force the new debugger UI, in case this gets uplifted with the old
// debugger still turned on
await pushPref("devtools.debugger.new-debugger-frontend", true);
await pushPref("devtools.webconsole.filter.error", true);
await pushPref("devtools.webconsole.filter.log", true);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_scratchpad_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_location_scratchpad_link.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_location_styleeditor_link.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_location_styleeditor_link.js
@@ -1,17 +1,17 @@
/* -*- 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 TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-location-styleeditor-link.html";
add_task(async function() {
await pushPref("devtools.webconsole.filter.css", true);
let hud = await openNewTabAndConsole(TEST_URI);
let target = TargetFactory.forTab(gBrowser.selectedTab);
let toolbox = gDevTools.getToolbox(target);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_logErrorInPage.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_logErrorInPage.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_logWarningInPage.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_logWarningInPage.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_loglimit.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_loglimit.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_expand.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_expand.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_hang.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_hang.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_hang.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_hang.js
@@ -6,17 +6,17 @@
// XXX Remove this when the file is migrated to the new frontend.
/* eslint-disable no-undef */
// Test that very long strings do not hang the browser.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-bug-859170-longstring-hang.html";
add_task(async function() {
await loadTab(TEST_URI);
let hud = await openConsole();
info("wait for the initial long string");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_message_categories.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_message_categories.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_message_categories.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_message_categories.js
@@ -5,17 +5,17 @@
"use strict";
// Check that messages are logged and observed with the correct category. See Bug 595934.
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/" +
- "new-console-output/test/mochitest/";
+ "test/mochitest/";
const TESTS = [
{
// #0
file: "test-message-categories-css-loader.html",
category: "CSS Loader",
matchString: "text/css",
},
{
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_attach.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_attach.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const TEST_FILE = "test-network-request.html";
const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/";
+ "test/mochitest/";
const TEST_URI = TEST_PATH + TEST_FILE;
add_task(async function task() {
await pushPref("devtools.webconsole.filter.net", false);
await pushPref("devtools.webconsole.filter.netxhr", true);
await openNewTabAndToolbox(TEST_URI, "netmonitor");
const currentTab = gBrowser.selectedTab;
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_exceptions.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_exceptions.js
@@ -5,17 +5,17 @@
// Tests that we report JS exceptions in event handlers coming from
// network requests, like onreadystate for XHR. See bug 618078.
"use strict";
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/" +
- "new-console-output/test/mochitest/test-network-exceptions.html";
+ "test/mochitest/test-network-exceptions.html";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
// On e10s, the exception is triggered in child process
// and is ignored by test harness
if (!Services.appinfo.browserTabsRemoteAutostart) {
expectUncaughtException();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_expand.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_expand.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const TEST_FILE = "test-network-request.html";
const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/";
+ "test/mochitest/";
const TEST_URI = TEST_PATH + TEST_FILE;
const NET_PREF = "devtools.webconsole.filter.net";
const XHR_PREF = "devtools.webconsole.filter.netxhr";
requestLongerTimeout(2);
Services.prefs.setBoolPref(NET_PREF, false);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_openinnet.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_openinnet.js
@@ -4,17 +4,17 @@
"use strict";
const TEST_URI = "data:text/html;charset=utf8,Test that 'Open in Network Panel' " +
"context menu item opens the selected request in netmonitor panel.";
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/" +
- "new-console-output/test/mochitest/";
+ "test/mochitest/";
const NET_PREF = "devtools.webconsole.filter.net";
const XHR_PREF = "devtools.webconsole.filter.netxhr";
Services.prefs.setBoolPref(NET_PREF, true);
Services.prefs.setBoolPref(XHR_PREF, true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref(NET_PREF);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_status_code.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_status_code.js
@@ -1,21 +1,21 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const TEST_FILE = "test-network-request.html";
const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/";
+ "test/mochitest/";
const TEST_URI = TEST_PATH + TEST_FILE;
const NET_PREF = "devtools.webconsole.filter.net";
const XHR_PREF = "devtools.webconsole.filter.netxhr";
-let { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+let { l10n } = require("devtools/client/webconsole/utils/messages");
const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/Status/200" + STATUS_CODES_GA_PARAMS;
pushPref(NET_PREF, true);
pushPref(XHR_PREF, true);
add_task(async function task() {
const hud = await openNewTabAndConsole(TEST_URI);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_requests_from_chrome.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_reset_filter.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_reset_filter.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that network log messages bring up the network panel and select the
// right request even if it was previously filtered off.
"use strict";
const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/";
+ "test/mochitest/";
const TEST_URI = "data:text/html;charset=utf8,<p>test file URI";
add_task(async function() {
await pushPref("devtools.webconsole.filter.net", true);
let toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
let hud = toolbox.getCurrentPanel().hud;
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_highlight.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_highlight.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_select.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_select.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_in_sidebar.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_in_sidebar.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_entries.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_entries.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_key_sorting.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_key_sorting.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Test that makes sure web console eval works while the js debugger paused the
// page, and while the inspector is active. See bug 886137.
"use strict";
const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-eval-in-stackframe.html";
+ "test/mochitest/test-eval-in-stackframe.html";
add_task(async function() {
// Force the old debugger UI since it's directly used (see Bug 1301705)
await pushPref("devtools.debugger.new-debugger-frontend", false);
let hud = await openNewTabAndConsole(TEST_URI);
info("Switch to the debugger");
await openDebugger();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_observer_notifications.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_observer_notifications.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Check that inspecting an optimized out variable works when execution is
// paused.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-closure-optimized-out.html";
add_task(async function() {
// Force the old debugger UI since it's directly used (see Bug 1301705)
await pushPref("devtools.debugger.new-debugger-frontend", false);
let hud = await openNewTabAndConsole(TEST_URI);
let { toolbox, panel: debuggerPanel } = await openDebugger();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy_newlines.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy_newlines.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_output_order.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_output_order.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that any output created from calls to the console API comes before the
// echoed JavaScript.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
hud.jsterm.clearOutput();
let messages = ["console.log('foo', 'bar');", "foo bar", "undefined"];
let onMessages = waitForMessages({
hud,
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_persist.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_persist.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Check that message persistence works - bug 705921 / bug 1307881
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
registerCleanupFunction(() => {
Services.prefs.clearUserPref("devtools.webconsole.persistlog");
});
add_task(async function() {
info("Testing that messages disappear on a refresh if logs aren't persisted");
let hud = await openNewTabAndConsole(TEST_URI);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_reopen_closed_tab.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_reopen_closed_tab.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// See Bug 597756. Check that errors are still displayed in the console after
// reloading a page.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-reopen-closed-tab.html";
+ "test/mochitest/test-reopen-closed-tab.html";
add_task(async function() {
// If we persist log, the test might be successful even if only the first
// error log is shown.
pushPref("devtools.webconsole.persistlog", false);
info("Open console and refresh tab.");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_repeat_different_objects.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_repeat_different_objects.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
@@ -5,17 +5,17 @@
// Tests if the JSTerm sandbox is updated when the user navigates from one
// domain to another, in order to avoid permission denied errors with a sandbox
// created for a different origin. See Bug 664688.
"use strict";
const BASE_URI = "browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
const TEST_URI1 = "http://example.com/" + BASE_URI;
const TEST_URI2 = "http://example.org/" + BASE_URI;
add_task(async function() {
pushPref("devtools.webconsole.persistlog", false);
let hud = await openNewTabAndConsole(TEST_URI1);
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_script_errordoc_urls.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_script_errordoc_urls.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_scroll.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_scroll.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_select_all.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_select_all.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_show_subresource_security_errors.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_show_subresource_security_errors.js
@@ -5,17 +5,17 @@
// Ensure non-toplevel security errors are displayed
"use strict";
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/" +
- "new-console-output/test/mochitest/test-subresource-security-error.html";
+ "test/mochitest/test-subresource-security-error.html";
const SAMPLE_MSG = "specified a header that could not be parsed successfully.";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI);
hud.jsterm.clearOutput();
await loadDocument(TEST_DOC);
await waitFor(() => findMessage(hud, SAMPLE_MSG, ".message.warn"));
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
@@ -6,17 +6,17 @@
"use strict";
const TEST_URI = "data:text/html;charset=utf8,Test that the netmonitor " +
"displays requests that have been recorded in the " +
"web console, even if the netmonitor hadn't opened yet.";
const TEST_FILE = "test-network-request.html";
const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" + TEST_FILE;
+ "test/mochitest/" + TEST_FILE;
const NET_PREF = "devtools.webconsole.filter.net";
Services.prefs.setBoolPref(NET_PREF, true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref(NET_PREF);
});
add_task(async function task() {
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
@@ -6,17 +6,17 @@
"use strict";
const TEST_URI = "data:text/html;charset=utf8,Test that the web console " +
"displays requests that have been recorded in the " +
"netmonitor, even if the console hadn't opened yet.";
const TEST_FILE = "test-network-request.html";
const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" + TEST_FILE;
+ "test/mochitest/" + TEST_FILE;
const NET_PREF = "devtools.webconsole.filter.net";
Services.prefs.setBoolPref(NET_PREF, true);
registerCleanupFunction(() => {
Services.prefs.clearUserPref(NET_PREF);
});
add_task(async function() {
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_css.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_css.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_error.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_error.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test that a missing source map is reported.
const BASE = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/";
+ "test/mochitest/";
add_task(async function() {
for (let test of ["test-sourcemap-error-01.html", "test-sourcemap-error-02.html"]) {
const hud = await openNewTabAndConsole(BASE + test);
const node = await waitFor(() => findMessage(hud, "here"));
ok(node, "logged text is displayed in web console");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_invalid.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_invalid.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_nosource.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_nosource.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_split.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_escape_key.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_split_escape_key.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_focus.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_split_focus.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_persist.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_split_persist.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
@@ -10,17 +10,17 @@
// There are shutdown issues for which multiple rejections are left uncaught.
// See bug 1018184 for resolving these issues.
const { PromiseTestUtils } = scopedCuImport("resource://testing-common/PromiseTestUtils.jsm");
PromiseTestUtils.whitelistRejectionsGlobally(/Component not initialized/);
PromiseTestUtils.whitelistRejectionsGlobally(/this\.worker is null/);
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-stacktrace-location-debugger-link.html";
add_task(async function() {
// Force the new debugger UI, in case this gets uplifted with the old
// debugger still turned on
Services.prefs.setBoolPref("devtools.debugger.new-debugger-frontend", true);
Services.prefs.setBoolPref("devtools.webconsole.filter.log", true);
registerCleanupFunction(function* () {
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_scratchpad_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_scratchpad_link.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_strict_mode_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_strict_mode_errors.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_string.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_string.js
@@ -1,17 +1,17 @@
/* -*- 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 TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-console.html";
+ "test/mochitest/test-console.html";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
info("console.log with a string argument");
let receivedMessages = waitForMessages({
hud,
messages: [{
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that the Console API implements the time() and timeEnd() methods.
"use strict";
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-time-methods.html";
+ "test/mochitest/test-time-methods.html";
const TEST_URI2 = "data:text/html;charset=utf-8,<script>" +
"console.timeEnd('bTimer');</script>";
const TEST_URI3 = "data:text/html;charset=utf-8,<script>" +
"console.time('bTimer');console.log('smoke signal');</script>";
const TEST_URI4 = "data:text/html;charset=utf-8," +
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_timestamps.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_timestamps.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
@@ -4,17 +4,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Load a page with tracking elements that get blocked and make sure that a
// 'learn more' link shows up in the webconsole.
"use strict";
const TEST_URI = "http://tracking.example.org/browser/devtools/client/" +
- "webconsole/new-console-output/test/mochitest/" +
+ "webconsole/test/mochitest/" +
"test-trackingprotection-securityerrors.html";
const LEARN_MORE_URI = "https://developer.mozilla.org/Firefox/Privacy/" +
"Tracking_Protection" + DOCS_GA_PARAMS;
const {UrlClassifierTestUtils} = ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
registerCleanupFunction(function() {
UrlClassifierTestUtils.cleanupTestTrackers();
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_view_source.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_view_source.js
@@ -6,17 +6,17 @@
// Tests that source URLs in the Web Console can be clicked to display the
// standard View Source window. As JS exceptions and console.log() messages always
// have their locations opened in Debugger, we need to test a security message in
// order to have it opened in the standard View Source window.
"use strict";
const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/" +
+ "test/mochitest/" +
"test-mixedcontent-securityerrors.html";
add_task(async function() {
let hud = await openNewTabAndConsole(TEST_URI);
info("console opened");
let msg = await waitFor(() => findMessage(hud, "Blocked loading mixed active content"));
ok(msg, "error message");
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_visibility_messages.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_visibility_messages.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_warn_about_replaced_api.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_warn_about_replaced_api.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_websocket.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_websocket.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_websocket.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_websocket.js
@@ -3,17 +3,17 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Check that WebSocket connection failure messages are displayed. See Bug 603750.
const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
- "new-console-output/test/mochitest/test-websocket.html";
+ "test/mochitest/test-websocket.html";
const TEST_URI2 = "data:text/html;charset=utf-8,Web Console test for " +
"bug 603750: Web Socket errors";
add_task(async function() {
const hud = await openNewTabAndConsole(TEST_URI2);
BrowserTestUtils.loadURI(gBrowser.selectedBrowser, TEST_URI);
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_invalidmap.js
rename to devtools/client/webconsole/test/mochitest/code_bundle_invalidmap.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_invalidmap.js.map
rename to devtools/client/webconsole/test/mochitest/code_bundle_invalidmap.js.map
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_nosource.js
rename to devtools/client/webconsole/test/mochitest/code_bundle_nosource.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_nosource.js.map
rename to devtools/client/webconsole/test/mochitest/code_bundle_nosource.js.map
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_nosource.js
rename to devtools/client/webconsole/test/mochitest/code_nosource.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/head.js
rename to devtools/client/webconsole/test/mochitest/head.js
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/test/mochitest/head.js
@@ -9,17 +9,17 @@
// Import helpers registering the test-actor in remote targets
/* globals registerTestActor, getTestActor, Task, openToolboxForTab, gBrowser */
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/shared/test/test-actor-registry.js",
this);
// shared-head.js handles imports, constants, and utility functions
// Load the shared-head file first.
-/* import-globals-from ../../../../shared/test/shared-head.js */
+/* import-globals-from ../../../shared/test/shared-head.js */
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
this);
var {HUDService} = require("devtools/client/webconsole/hudservice");
var WCUL10n = require("devtools/client/webconsole/webconsole-l10n");
const DOCS_GA_PARAMS = `?${new URLSearchParams({
"utm_source": "mozilla",
@@ -27,17 +27,17 @@ const DOCS_GA_PARAMS = `?${new URLSearch
"utm_campaign": "default"
})}`;
const STATUS_CODES_GA_PARAMS = `?${new URLSearchParams({
"utm_source": "mozilla",
"utm_medium": "devtools-webconsole",
"utm_campaign": "default"
})}`;
-const wcActions = require("devtools/client/webconsole/new-console-output/actions/index");
+const wcActions = require("devtools/client/webconsole/actions/index");
Services.prefs.setBoolPref("devtools.browserconsole.new-frontend-enabled", true);
registerCleanupFunction(async function() {
Services.prefs.clearUserPref("devtools.browserconsole.new-frontend-enabled");
Services.prefs.clearUserPref("devtools.webconsole.ui.filterbar");
// Reset all filter prefs between tests. First flushPrefEnv in case one of the
// filter prefs has been pushed for the test
rename from devtools/client/webconsole/new-console-output/test/mochitest/sjs_cors-test-server.sjs
rename to devtools/client/webconsole/test/mochitest/sjs_cors-test-server.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/sjs_slow-response-test-server.sjs
rename to devtools/client/webconsole/test/mochitest/sjs_slow-response-test-server.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.css
rename to devtools/client/webconsole/test/mochitest/source-mapped.css
rename from devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.css.map
rename to devtools/client/webconsole/test/mochitest/source-mapped.css.map
rename from devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.scss
rename to devtools/client/webconsole/test/mochitest/source-mapped.scss
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html
rename to devtools/client/webconsole/test/mochitest/test-autocomplete-in-stackframe.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-batching.html
rename to devtools/client/webconsole/test/mochitest/test-batching.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-585956-console-trace.html
rename to devtools/client/webconsole/test/mochitest/test-bug-585956-console-trace.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-599725-response-headers.sjs
rename to devtools/client/webconsole/test/mochitest/test-bug-599725-response-headers.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.html
rename to devtools/client/webconsole/test/mochitest/test-bug-601177-log-levels.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.js
rename to devtools/client/webconsole/test/mochitest/test-bug-601177-log-levels.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-630733-response-redirect-headers.sjs
rename to devtools/client/webconsole/test/mochitest/test-bug-630733-response-redirect-headers.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-632275-getters.html
rename to devtools/client/webconsole/test/mochitest/test-bug-632275-getters.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-646025-console-file-location.html
rename to devtools/client/webconsole/test/mochitest/test-bug-646025-console-file-location.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-console-log.js
rename to devtools/client/webconsole/test/mochitest/test-bug-766001-console-log.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-js-console-links.html
rename to devtools/client/webconsole/test/mochitest/test-bug-766001-js-console-links.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-js-errors.js
rename to devtools/client/webconsole/test/mochitest/test-bug-766001-js-errors.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors-1.css
rename to devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors-1.css
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors-2.css
rename to devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors-2.css
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors.html
rename to devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-837351-security-errors.html
rename to devtools/client/webconsole/test/mochitest/test-bug-837351-security-errors.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-859170-longstring-hang.html
rename to devtools/client/webconsole/test/mochitest/test-bug-859170-longstring-hang.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-952277-highlight-nodes-in-vview.html
rename to devtools/client/webconsole/test/mochitest/test-bug-952277-highlight-nodes-in-vview.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_console_log_filter.html
rename to devtools/client/webconsole/test/mochitest/test-bug_923281_console_log_filter.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test1.js
rename to devtools/client/webconsole/test/mochitest/test-bug_923281_test1.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test2.js
rename to devtools/client/webconsole/test/mochitest/test-bug_923281_test2.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-child.html
rename to devtools/client/webconsole/test/mochitest/test-cd-iframe-child.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-parent.html
rename to devtools/client/webconsole/test/mochitest/test-cd-iframe-parent.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-certificate-messages.html
rename to devtools/client/webconsole/test/mochitest/test-certificate-messages.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-click-function-to-source.html
rename to devtools/client/webconsole/test/mochitest/test-click-function-to-source.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-click-function-to-source.js
rename to devtools/client/webconsole/test/mochitest/test-click-function-to-source.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-closure-optimized-out.html
rename to devtools/client/webconsole/test/mochitest/test-closure-optimized-out.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-closures.html
rename to devtools/client/webconsole/test/mochitest/test-closures.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-api-iframe.html
rename to devtools/client/webconsole/test/mochitest/test-console-api-iframe.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-api-stackframe.html
rename to devtools/client/webconsole/test/mochitest/test-console-api-stackframe.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-clear.html
rename to devtools/client/webconsole/test/mochitest/test-console-clear.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-column.html
rename to devtools/client/webconsole/test/mochitest/test-console-column.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-count-external-file.js
rename to devtools/client/webconsole/test/mochitest/test-console-count-external-file.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-count.html
rename to devtools/client/webconsole/test/mochitest/test-console-count.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-extras.html
rename to devtools/client/webconsole/test/mochitest/test-console-extras.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html
rename to devtools/client/webconsole/test/mochitest/test-console-filters.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-group.html
rename to devtools/client/webconsole/test/mochitest/test-console-group.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-iframes.html
rename to devtools/client/webconsole/test/mochitest/test-console-iframes.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-02.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-02.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-03.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-03.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-04.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-04.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-dom-elements.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-dom-elements.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-events.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-events.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-replaced-api.html
rename to devtools/client/webconsole/test/mochitest/test-console-replaced-api.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging-array.sjs
rename to devtools/client/webconsole/test/mochitest/test-console-server-logging-array.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging-backtrace.sjs
rename to devtools/client/webconsole/test/mochitest/test-console-server-logging-backtrace.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging.sjs
rename to devtools/client/webconsole/test/mochitest/test-console-server-logging.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-table.html
rename to devtools/client/webconsole/test/mochitest/test-console-table.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-async.html
rename to devtools/client/webconsole/test/mochitest/test-console-trace-async.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-duplicates.html
rename to devtools/client/webconsole/test/mochitest/test-console-trace-duplicates.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-workers.html
rename to devtools/client/webconsole/test/mochitest/test-console-workers.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console.html
rename to devtools/client/webconsole/test/mochitest/test-console.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-csp-violation.html
rename to devtools/client/webconsole/test/mochitest/test-csp-violation.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cspro.html
rename to devtools/client/webconsole/test/mochitest/test-cspro.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cspro.html^headers^
rename to devtools/client/webconsole/test/mochitest/test-cspro.html^headers^
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cu-reporterror.js
rename to devtools/client/webconsole/test/mochitest/test-cu-reporterror.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-data.json
rename to devtools/client/webconsole/test/mochitest/test-data.json
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-data.json^headers^
rename to devtools/client/webconsole/test/mochitest/test-data.json^headers^
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-duplicate-error.html
rename to devtools/client/webconsole/test/mochitest/test-duplicate-error.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-encoding-ISO-8859-1.html
rename to devtools/client/webconsole/test/mochitest/test-encoding-ISO-8859-1.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-error.html
rename to devtools/client/webconsole/test/mochitest/test-error.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-eval-in-stackframe.html
rename to devtools/client/webconsole/test/mochitest/test-eval-in-stackframe.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-exception-stackframe.html
rename to devtools/client/webconsole/test/mochitest/test-exception-stackframe.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.html
rename to devtools/client/webconsole/test/mochitest/test-external-script-errors.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.js
rename to devtools/client/webconsole/test/mochitest/test-external-script-errors.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-file-location.js
rename to devtools/client/webconsole/test/mochitest/test-file-location.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-filter.html
rename to devtools/client/webconsole/test/mochitest/test-filter.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-for-of.html
rename to devtools/client/webconsole/test/mochitest/test-for-of.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-child.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-child.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-insecure-form-action.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-insecure-form-action.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-parent.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-parent.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-parent.html
+++ b/devtools/client/webconsole/test/mochitest/test-iframe-parent.html
@@ -3,11 +3,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>test for bug 989025 - iframe parent</title>
</head>
<body>
<p>test for bug 989025 - iframe parent</p>
- <iframe src="http://mochi.test:8888/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-child.html"></iframe>
+ <iframe src="http://mochi.test:8888/browser/devtools/client/webconsole/test/mochitest/test-iframe-child.html"></iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud-iframe.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud.html
+++ b/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud.html
@@ -4,11 +4,11 @@
<meta charset="utf-8">
<title>WebConsole test: iframe associated to the wrong HUD</title>
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<p>WebConsole test: iframe associated to the wrong HUD.</p>
<iframe
- src="http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html"></iframe>
+ src="http://example.com/browser/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud-iframe.html"></iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe1.html
rename to devtools/client/webconsole/test/mochitest/test-iframe1.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html
rename to devtools/client/webconsole/test/mochitest/test-iframe2.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html
rename to devtools/client/webconsole/test/mochitest/test-iframe3.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-image.png
rename to devtools/client/webconsole/test/mochitest/test-image.png
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
@@ -4,11 +4,11 @@
<meta charset="utf8">
<title>Bug 752559 - print warning to error console when iframe sandbox
is being used ineffectively</title>
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html"></iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
@@ -4,11 +4,11 @@
<meta charset="utf8">
<title>Bug 752559 - print warning to error console when iframe sandbox
is being used ineffectively</title>
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning0.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning0.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning1.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning1.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning2.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning2.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
@@ -4,11 +4,11 @@
<meta charset="utf8">
<title>Bug 752559 - print warning to error console when iframe sandbox
is being used ineffectively (allow-scripts, allow-same-origin)</title>
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
@@ -4,11 +4,11 @@
<meta charset="utf8">
<title>Bug 752559 - print warning to error console when iframe sandbox
is being used ineffectively (allow-scripts, allow-same-origin, nested)</title>
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html" sandbox="allow-scripts allow-same-origin"></iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
@@ -4,11 +4,11 @@
<meta charset="utf8">
<title>Bug 752559 - print warning to error console when iframe sandbox
is being used ineffectively (nested, allow-scripts, allow-same-origin)</title>
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html"></iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-frame.html
rename to devtools/client/webconsole/test/mochitest/test-insecure-frame.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-frame.html
+++ b/devtools/client/webconsole/test/mochitest/test-insecure-frame.html
@@ -4,12 +4,12 @@
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<h1>iframe 1</h1>
<p>This frame is served with an insecure password field.</p>
<iframe src=
- "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-insecure-form-action.html">
+ "http://example.com/browser/devtools/client/webconsole/test/mochitest/test-iframe-insecure-form-action.html">
</iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html
rename to devtools/client/webconsole/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-web-console-warning.html
rename to devtools/client/webconsole/test/mochitest/test-insecure-passwords-web-console-warning.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-frame.html
rename to devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-frame.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-top.html
rename to devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-top.html
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-top.html
+++ b/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-top.html
@@ -4,11 +4,11 @@
<meta charset="utf-8">
<title>Web Console test for bug 869003</title>
<!-- Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<p>Make sure users can inspect objects from cross-domain iframes.</p>
<p>Top window.</p>
- <iframe src="http://example.org/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-frame.html"></iframe>
+ <iframe src="http://example.org/browser/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-frame.html"></iframe>
</body>
</html>
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-jsterm-dollar.html
rename to devtools/client/webconsole/test/mochitest/test-jsterm-dollar.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link-console-log.js
rename to devtools/client/webconsole/test/mochitest/test-location-debugger-link-console-log.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link-errors.js
rename to devtools/client/webconsole/test/mochitest/test-location-debugger-link-errors.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link.html
rename to devtools/client/webconsole/test/mochitest/test-location-debugger-link.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link-1.css
rename to devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-1.css
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link-2.css
rename to devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-2.css
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link.html
rename to devtools/client/webconsole/test/mochitest/test-location-styleeditor-link.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-canvas-css.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-canvas-css.js
rename to devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.css
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.css^headers^
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css^headers^
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-parser.css
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.css
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-parser.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-empty-getelementbyid.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-empty-getelementbyid.js
rename to devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-html.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-html.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-image.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-image.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-image.jpg
rename to devtools/client/webconsole/test/mochitest/test-message-categories-image.jpg
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-imagemap.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-imagemap.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml-external.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml-external.xml
rename to devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.xml
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml.xhtml
rename to devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml.xhtml
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-svg.xhtml
rename to devtools/client/webconsole/test/mochitest/test-message-categories-svg.xhtml
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-workers.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.js
rename to devtools/client/webconsole/test/mochitest/test-message-categories-workers.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-mixedcontent-securityerrors.html
rename to devtools/client/webconsole/test/mochitest/test-mixedcontent-securityerrors.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-mutation.html
rename to devtools/client/webconsole/test/mochitest/test-mutation.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-network-exceptions.html
rename to devtools/client/webconsole/test/mochitest/test-network-exceptions.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-network-request.html
rename to devtools/client/webconsole/test/mochitest/test-network-request.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-network.html
rename to devtools/client/webconsole/test/mochitest/test-network.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-observe-http-ajax.html
rename to devtools/client/webconsole/test/mochitest/test-observe-http-ajax.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-own-console.html
rename to devtools/client/webconsole/test/mochitest/test-own-console.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-property-provider.html
rename to devtools/client/webconsole/test/mochitest/test-property-provider.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html
rename to devtools/client/webconsole/test/mochitest/test-reopen-closed-tab.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-result-format-as-string.html
rename to devtools/client/webconsole/test/mochitest/test-result-format-as-string.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-01.html
rename to devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-01.js
rename to devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-02.html
rename to devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-02.js
rename to devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-stacktrace-location-debugger-link.html
rename to devtools/client/webconsole/test/mochitest/test-stacktrace-location-debugger-link.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.html
rename to devtools/client/webconsole/test/mochitest/test-subresource-security-error.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.js
rename to devtools/client/webconsole/test/mochitest/test-subresource-security-error.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.js^headers^
rename to devtools/client/webconsole/test/mochitest/test-subresource-security-error.js^headers^
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-time-methods.html
rename to devtools/client/webconsole/test/mochitest/test-time-methods.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-trackingprotection-securityerrors.html
rename to devtools/client/webconsole/test/mochitest/test-trackingprotection-securityerrors.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-webconsole-error-observer.html
rename to devtools/client/webconsole/test/mochitest/test-webconsole-error-observer.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-websocket.html
rename to devtools/client/webconsole/test/mochitest/test-websocket.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-websocket.js
rename to devtools/client/webconsole/test/mochitest/test-websocket.js
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_bug_770099_violation.html
rename to devtools/client/webconsole/test/mochitest/test_bug_770099_violation.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_bug_770099_violation.html^headers^
rename to devtools/client/webconsole/test/mochitest/test_bug_770099_violation.html^headers^
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_console_csp_ignore_reflected_xss_message.html
rename to devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_console_csp_ignore_reflected_xss_message.html^headers^
rename to devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html^headers^
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_hpkp-invalid-headers.sjs
rename to devtools/client/webconsole/test/mochitest/test_hpkp-invalid-headers.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_hsts-invalid-headers.sjs
rename to devtools/client/webconsole/test/mochitest/test_hsts-invalid-headers.sjs
rename from devtools/client/webconsole/new-console-output/test/mochitest/testscript.js
rename to devtools/client/webconsole/test/mochitest/testscript.js
rename from devtools/client/webconsole/new-console-output/test/moz.build
rename to devtools/client/webconsole/test/moz.build
rename from devtools/client/webconsole/new-console-output/test/package.json
rename to devtools/client/webconsole/test/package.json
rename from devtools/client/webconsole/new-console-output/test/store/.eslintrc.js
rename to devtools/client/webconsole/test/store/.eslintrc.js
rename from devtools/client/webconsole/new-console-output/test/store/filters.test.js
rename to devtools/client/webconsole/test/store/filters.test.js
--- a/devtools/client/webconsole/new-console-output/test/store/filters.test.js
+++ b/devtools/client/webconsole/test/store/filters.test.js
@@ -1,24 +1,24 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const expect = require("expect");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { messagesAdd } = require("devtools/client/webconsole/new-console-output/actions/index");
-const { ConsoleCommand } = require("devtools/client/webconsole/new-console-output/types");
-const { getVisibleMessages } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
-const { setupStore, getFiltersPrefs } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { FILTERS, PREFS } = require("devtools/client/webconsole/new-console-output/constants");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const actions = require("devtools/client/webconsole/actions/index");
+const { messagesAdd } = require("devtools/client/webconsole/actions/index");
+const { ConsoleCommand } = require("devtools/client/webconsole/types");
+const { getVisibleMessages } = require("devtools/client/webconsole/selectors/messages");
+const { getAllFilters } = require("devtools/client/webconsole/selectors/filters");
+const { setupStore, getFiltersPrefs } = require("devtools/client/webconsole/test/helpers");
+const { FILTERS, PREFS } = require("devtools/client/webconsole/constants");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
describe("Filtering", () => {
let store;
let numMessages;
// Number of messages in prepareBaseStore which are not filtered out, i.e. Evaluation
// Results, console commands and console.groups .
const numUnfilterableMessages = 3;
rename from devtools/client/webconsole/new-console-output/test/store/hidden-messages.test.js
rename to devtools/client/webconsole/test/store/hidden-messages.test.js
--- a/devtools/client/webconsole/new-console-output/test/store/hidden-messages.test.js
+++ b/devtools/client/webconsole/test/store/hidden-messages.test.js
@@ -1,20 +1,20 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const expect = require("expect");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { getFilteredMessagesCount } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { FILTERS } = require("devtools/client/webconsole/new-console-output/constants");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+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 { FILTERS } = require("devtools/client/webconsole/constants");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
describe("Filtering - Hidden messages", () => {
let store;
beforeEach(() => {
store = prepareBaseStore();
// Switch off all filters (include those which are on by default).
store.dispatch(actions.filtersClear());
rename from devtools/client/webconsole/new-console-output/test/store/messages.test.js
rename to devtools/client/webconsole/test/store/messages.test.js
--- a/devtools/client/webconsole/new-console-output/test/store/messages.test.js
+++ b/devtools/client/webconsole/test/store/messages.test.js
@@ -6,29 +6,29 @@ const {
getAllMessagesUiById,
getAllMessagesTableDataById,
getAllNetworkMessagesUpdateById,
getAllRepeatById,
getCurrentGroup,
getGroupsById,
getAllMessagesById,
getVisibleMessages,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
+} = require("devtools/client/webconsole/selectors/messages");
const {
clonePacket,
getFirstMessage,
getLastMessage,
getMessageAt,
setupActions,
setupStore,
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+} = require("devtools/client/webconsole/test/helpers");
+const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
const {
MESSAGE_TYPE,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
const expect = require("expect");
describe("Message reducer:", () => {
let actions;
before(() => {
actions = setupActions();
rename from devtools/client/webconsole/new-console-output/test/store/network-messages.test.js
rename to devtools/client/webconsole/test/store/network-messages.test.js
--- a/devtools/client/webconsole/new-console-output/test/store/network-messages.test.js
+++ b/devtools/client/webconsole/test/store/network-messages.test.js
@@ -1,21 +1,21 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const {
getAllNetworkMessagesUpdateById,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
+} = require("devtools/client/webconsole/selectors/messages");
const {
setupActions,
setupStore,
clonePacket
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+} = require("devtools/client/webconsole/test/helpers");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
const expect = require("expect");
describe("Network message reducer:", () => {
let actions;
let getState;
let dispatch;
rename from devtools/client/webconsole/new-console-output/test/store/private-messages.test.js
rename to devtools/client/webconsole/test/store/private-messages.test.js
--- a/devtools/client/webconsole/new-console-output/test/store/private-messages.test.js
+++ b/devtools/client/webconsole/test/store/private-messages.test.js
@@ -8,25 +8,25 @@ const {
getAllMessagesUiById,
getAllMessagesTableDataById,
getAllNetworkMessagesUpdateById,
getAllRepeatById,
getCurrentGroup,
getGroupsById,
getAllMessagesById,
getVisibleMessages,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
+} = require("devtools/client/webconsole/selectors/messages");
const {
getFirstMessage,
getLastMessage,
getPrivatePacket,
setupActions,
setupStore,
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+} = require("devtools/client/webconsole/test/helpers");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
const expect = require("expect");
describe("private messages", () => {
let actions;
before(() => {
actions = setupActions();
});
rename from devtools/client/webconsole/new-console-output/test/store/release-actors.test.js
rename to devtools/client/webconsole/test/store/release-actors.test.js
--- a/devtools/client/webconsole/new-console-output/test/store/release-actors.test.js
+++ b/devtools/client/webconsole/test/store/release-actors.test.js
@@ -2,19 +2,19 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const {
clonePacket,
getFirstMessage,
setupActions,
setupStore,
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
+} = require("devtools/client/webconsole/test/helpers");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
const expect = require("expect");
describe("Release actor enhancer:", () => {
let actions;
before(() => {
actions = setupActions();
});
rename from devtools/client/webconsole/new-console-output/test/store/search.test.js
rename to devtools/client/webconsole/test/store/search.test.js
--- a/devtools/client/webconsole/new-console-output/test/store/search.test.js
+++ b/devtools/client/webconsole/test/store/search.test.js
@@ -1,18 +1,18 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const expect = require("expect");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { getVisibleMessages } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
+const actions = require("devtools/client/webconsole/actions/index");
+const { getVisibleMessages } = require("devtools/client/webconsole/selectors/messages");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
describe("Searching in grips", () => {
let store;
beforeEach(() => {
store = prepareBaseStore();
store.dispatch(actions.filtersClear());
});
rename from devtools/client/webconsole/new-console-output/test/store/ui.test.js
rename to devtools/client/webconsole/test/store/ui.test.js
--- a/devtools/client/webconsole/new-console-output/test/store/ui.test.js
+++ b/devtools/client/webconsole/test/store/ui.test.js
@@ -1,18 +1,18 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const expect = require("expect");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { setupStore, getFirstMessage, getLastMessage } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const actions = require("devtools/client/webconsole/actions/index");
+const { setupStore, getFirstMessage, getLastMessage } = require("devtools/client/webconsole/test/helpers");
+const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
describe("Testing UI", () => {
let store;
beforeEach(() => {
store = setupStore();
});
rename from devtools/client/webconsole/new-console-output/test/unit/.eslintrc.js
rename to devtools/client/webconsole/test/unit/.eslintrc.js
--- a/devtools/client/webconsole/new-console-output/test/unit/.eslintrc.js
+++ b/devtools/client/webconsole/test/unit/.eslintrc.js
@@ -1,6 +1,6 @@
"use strict";
module.exports = {
// Extend from the common devtools xpcshell eslintrc config.
- "extends": "../../../../../.eslintrc.xpcshell.js"
+ "extends": "../../../../.eslintrc.xpcshell.js"
};
rename from devtools/client/webconsole/new-console-output/test/unit/test_webconsole_l10n.js
rename to devtools/client/webconsole/test/unit/test_webconsole_l10n.js
rename from devtools/client/webconsole/new-console-output/test/unit/xpcshell.ini
rename to devtools/client/webconsole/test/unit/xpcshell.ini
rename from devtools/client/webconsole/new-console-output/test/utils/.eslintrc.js
rename to devtools/client/webconsole/test/utils/.eslintrc.js
rename from devtools/client/webconsole/new-console-output/test/utils/getRepeatId.test.js
rename to devtools/client/webconsole/test/utils/getRepeatId.test.js
--- a/devtools/client/webconsole/new-console-output/test/utils/getRepeatId.test.js
+++ b/devtools/client/webconsole/test/utils/getRepeatId.test.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { getRepeatId } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const { getRepeatId } = require("devtools/client/webconsole/utils/messages");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
const expect = require("expect");
describe("getRepeatId:", () => {
it("returns same repeatId for duplicate values", () => {
const baseMessage = stubPreparedMessages.get("console.log('foobar', 'test')");
// Repeat ID must be the same even if the timestamp is different.
rename from devtools/client/webconsole/new-console-output/types.js
rename to devtools/client/webconsole/types.js
--- a/devtools/client/webconsole/new-console-output/types.js
+++ b/devtools/client/webconsole/types.js
@@ -4,17 +4,17 @@
* 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/. */
"use strict";
const {
MESSAGE_SOURCE,
MESSAGE_TYPE,
MESSAGE_LEVEL
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
exports.ConsoleCommand = function(props) {
return Object.assign({
id: null,
allowRepeating: false,
messageText: null,
source: MESSAGE_SOURCE.JAVASCRIPT,
type: MESSAGE_TYPE.COMMAND,
rename from devtools/client/webconsole/new-console-output/utils/context-menu.js
rename to devtools/client/webconsole/utils/context-menu.js
--- a/devtools/client/webconsole/new-console-output/utils/context-menu.js
+++ b/devtools/client/webconsole/utils/context-menu.js
@@ -7,20 +7,20 @@
"use strict";
const Services = require("Services");
const {gDevTools} = require("devtools/client/framework/devtools");
const Menu = require("devtools/client/framework/menu");
const MenuItem = require("devtools/client/framework/menu-item");
-const { MESSAGE_SOURCE } = require("devtools/client/webconsole/new-console-output/constants");
+const { MESSAGE_SOURCE } = require("devtools/client/webconsole/constants");
const clipboardHelper = require("devtools/shared/platform/clipboard");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
/**
* Create a Menu instance for the webconsole.
*
* @param {Object} jsterm
* The JSTerm instance used by the webconsole.
* @param {Element} parentNode
* The container of the new console frontend output wrapper.
rename from devtools/client/webconsole/new-console-output/utils/id-generator.js
rename to devtools/client/webconsole/utils/id-generator.js
rename from devtools/client/webconsole/new-console-output/utils/messages.js
rename to devtools/client/webconsole/utils/messages.js
rename from devtools/client/webconsole/new-console-output/utils/moz.build
rename to devtools/client/webconsole/utils/moz.build
rename from devtools/client/webconsole/new-console-output/utils/object-inspector.js
rename to devtools/client/webconsole/utils/object-inspector.js
rename from devtools/client/webconsole/new-console-output/utils/prefs.js
rename to devtools/client/webconsole/utils/prefs.js
--- a/devtools/client/webconsole/webconsole.html
+++ b/devtools/client/webconsole/webconsole.html
@@ -11,17 +11,17 @@
<link rel="stylesheet" href="resource://devtools/client/shared/components/reps/reps.css"/>
<link rel="stylesheet" href="resource://devtools/client/shared/components/tabs/Tabs.css"/>
<link rel="stylesheet" href="resource://devtools/client/shared/components/tabs/TabBar.css"/>
<link rel="stylesheet" href="resource://devtools/client/shared/components/NotificationBox.css"/>
<link rel="stylesheet" href="chrome://devtools/content/netmonitor/src/assets/styles/httpi.css"/>
<script src="chrome://devtools/content/shared/theme-switching.js"></script>
<script type="application/javascript"
- src="resource://devtools/client/webconsole/new-console-output/main.js"></script>
+ src="resource://devtools/client/webconsole/main.js"></script>
</head>
<body class="theme-sidebar" role="application">
<div id="app-wrapper" class="theme-body">
<div id="output-container" role="document" aria-live="polite"></div>
<div id="jsterm-wrapper">
<div id="webconsole-notificationbox"></div>
<div class="jsterm-input-container" style="direction:ltr">
<div class="jsterm-stack-node">
--- a/devtools/client/webconsole/webpack.config.js
+++ b/devtools/client/webconsole/webpack.config.js
@@ -73,17 +73,17 @@ webpackConfig.resolve = {
// Make sure webpack is always looking for modules in
// `webconsole/node_modules` directory first.
path.resolve(__dirname, "node_modules"), "node_modules"
],
alias: {
"Services": "devtools-modules/src/Services",
"devtools/client/webconsole/jsterm": path.join(__dirname, "../../client/shared/webpack/shims/jsterm-stub"),
- "devtools/client/webconsole/utils": path.join(__dirname, "new-console-output/test/fixtures/WebConsoleUtils"),
+ "devtools/client/webconsole/utils": path.join(__dirname, "test/fixtures/WebConsoleUtils"),
"devtools/client/shared/vendor/immutable": "immutable",
"devtools/client/shared/vendor/react": "react",
"devtools/client/shared/vendor/react-dom": "react-dom",
"devtools/client/shared/vendor/react-redux": "react-redux",
"devtools/client/shared/vendor/redux": "redux",
"devtools/client/shared/vendor/reselect": "reselect",
@@ -93,17 +93,17 @@ webpackConfig.resolve = {
"devtools/client/framework/menu": "devtools-modules/src/menu",
"devtools/client/sourceeditor/editor": "devtools-source-editor/src/source-editor",
"devtools/client/shared/zoom-keys": "devtools-modules/src/zoom-keys",
"devtools/shared/fronts/timeline": path.join(__dirname, "../../client/shared/webpack/shims/fronts-timeline-shim"),
"devtools/shared/old-event-emitter": "devtools-modules/src/utils/event-emitter",
"devtools/shared/event-emitter": "devtools-modules/src/utils/event-emitter",
- "devtools/shared/client/debugger-client": path.join(__dirname, "new-console-output/test/fixtures/DebuggerClient"),
+ "devtools/shared/client/debugger-client": path.join(__dirname, "test/fixtures/DebuggerClient"),
"devtools/shared/platform/clipboard": path.join(__dirname, "../../client/shared/webpack/shims/platform-clipboard-stub"),
"devtools/shared/platform/stack": path.join(__dirname, "../../client/shared/webpack/shims/platform-stack-stub"),
// Locales need to be explicitly mapped to the en-US subfolder
"toolkit/locales": path.join(__dirname, "../../../toolkit/locales/en-US"),
"devtools/client/locales": path.join(__dirname, "../../client/locales/en-US"),
"devtools/shared/locales": path.join(__dirname, "../../shared/locales/en-US"),
"devtools/startup/locales": path.join(__dirname, "../../shared/locales/en-US"),
