--- a/devtools/client/netmonitor/index.html
+++ b/devtools/client/netmonitor/index.html
@@ -9,21 +9,23 @@
<link rel="stylesheet" href="chrome://devtools/skin/netmonitor.css"/>
<script type="application/javascript;version=1.8"
src="chrome://devtools/content/shared/theme-switching.js">
</script>
</head>
<body class="theme-sidebar" role="application">
<div id="mount"></div>
<script>
+ "use strict";
+
const { BrowserLoader } = Components.utils.import("resource://devtools/client/shared/browser-loader.js", {});
- const { require } = BrowserLoader({
+ const require = window.windowRequire = BrowserLoader({
baseURI: "resource://devtools/client/netmonitor/",
window,
- });
+ }).require;
const EventEmitter = require("devtools/shared/event-emitter");
const { createFactory } = require("devtools/client/shared/vendor/react");
const { render, unmountComponentAtNode } = require("devtools/client/shared/vendor/react-dom");
const Provider = createFactory(require("devtools/client/shared/vendor/react-redux").Provider);
const { configureStore } = require("./src/utils/create-store");
const store = window.gStore = configureStore();
const { NetMonitorController } = require("./src/netmonitor-controller");
--- a/devtools/client/netmonitor/src/har/test/.eslintrc.js
+++ b/devtools/client/netmonitor/src/har/test/.eslintrc.js
@@ -1,10 +1,10 @@
/* 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";
module.exports = {
// Extend from the shared list of defined globals for mochitests.
- "extends": "../../../../.eslintrc.mochitests.js"
+ "extends": "../../../../../.eslintrc.mochitests.js"
};
--- a/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js
+++ b/devtools/client/netmonitor/src/har/test/browser_net_har_copy_all_as_har.js
@@ -7,19 +7,19 @@
* Basic tests for exporting Network panel content into HAR format.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let RequestListContextMenu = windowRequire(
- "devtools/client/netmonitor/request-list-context-menu");
+ "devtools/client/netmonitor/src/request-list-context-menu");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
tab.linkedBrowser.reload();
yield wait;
let contextMenu = new RequestListContextMenu({});
--- a/devtools/client/netmonitor/src/har/test/browser_net_har_post_data.js
+++ b/devtools/client/netmonitor/src/har/test/browser_net_har_post_data.js
@@ -8,19 +8,19 @@
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(
HAR_EXAMPLE_URL + "html_har_post-data-test-page.html");
info("Starting test... ");
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let RequestListContextMenu = windowRequire(
- "devtools/client/netmonitor/request-list-context-menu");
+ "devtools/client/netmonitor/src/request-list-context-menu");
gStore.dispatch(Actions.batchEnable(false));
// Execute one POST request on the page and wait till its done.
let wait = waitForNetworkEvents(monitor, 0, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.executeTest();
});
--- a/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js
+++ b/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js
@@ -12,19 +12,19 @@ add_task(function* () {
function* throttleUploadTest(actuallyThrottle) {
let { tab, monitor } = yield initNetMonitor(
HAR_EXAMPLE_URL + "html_har_post-data-test-page.html");
info("Starting test... (actuallyThrottle = " + actuallyThrottle + ")");
let { gStore, windowRequire, NetMonitorController } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let RequestListContextMenu = windowRequire(
- "devtools/client/netmonitor/request-list-context-menu");
+ "devtools/client/netmonitor/src/request-list-context-menu");
gStore.dispatch(Actions.batchEnable(false));
const size = 4096;
const uploadSize = actuallyThrottle ? size / 3 : 0;
const request = {
"NetworkMonitor.throttleData": {
--- a/devtools/client/netmonitor/src/har/test/head.js
+++ b/devtools/client/netmonitor/src/har/test/head.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/* eslint no-unused-vars: [2, {"vars": "local", "args": "none"}] */
-/* import-globals-from ../../test/head.js */
+/* import-globals-from ../../../test/head.js */
// Load the NetMonitor head.js file to share its API.
var netMonitorHead = "chrome://mochitests/content/browser/devtools/client/netmonitor/test/head.js";
Services.scriptloader.loadSubScript(netMonitorHead, this);
// Directory with HAR related test files.
-const HAR_EXAMPLE_URL = "http://example.com/browser/devtools/client/netmonitor/har/test/";
+const HAR_EXAMPLE_URL = "http://example.com/browser/devtools/client/netmonitor/src/har/test/";
--- a/devtools/client/netmonitor/test/browser_net_accessibility-01.js
+++ b/devtools/client/netmonitor/test/browser_net_accessibility-01.js
@@ -10,17 +10,17 @@
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
info("Starting test... ");
// It seems that this test may be slow on Ubuntu builds running on ec2.
requestLongerTimeout(2);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let count = 0;
function check(selectedIndex, panelVisibility) {
info("Performing check " + (count++) + ".");
let requestItems = Array.from(document.querySelectorAll(".request-list-item"));
--- a/devtools/client/netmonitor/test/browser_net_accessibility-02.js
+++ b/devtools/client/netmonitor/test/browser_net_accessibility-02.js
@@ -10,17 +10,17 @@
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
info("Starting test... ");
// It seems that this test may be slow on Ubuntu builds running on ec2.
requestLongerTimeout(2);
let { window, document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let count = 0;
function check(selectedIndex, panelVisibility) {
info("Performing check " + (count++) + ".");
let requestItems = Array.from(document.querySelectorAll(".request-list-item"));
--- a/devtools/client/netmonitor/test/browser_net_api-calls.js
+++ b/devtools/client/netmonitor/test/browser_net_api-calls.js
@@ -8,21 +8,21 @@
* (including Unicode)
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(API_CALLS_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
const REQUEST_URIS = [
"http://example.com/api/fileName.xml",
"http://example.com/api/file%E2%98%A2.xml",
"http://example.com/api/ascii/get/",
"http://example.com/api/unicode/%E2%98%A2/",
--- a/devtools/client/netmonitor/test/browser_net_autoscroll.js
+++ b/devtools/client/netmonitor/test/browser_net_autoscroll.js
@@ -6,17 +6,17 @@
/**
* Bug 863102 - Automatically scroll down upon new network requests.
*/
add_task(function* () {
requestLongerTimeout(2);
let { monitor } = yield initNetMonitor(INFINITE_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
// Wait until the first request makes the empty notice disappear
yield waitForRequestListToAppear();
let requestsContainer = document.querySelector(".requests-list-contents");
ok(requestsContainer, "Container element exists as expected.");
// (1) Check that the scroll position is maintained at the bottom
--- a/devtools/client/netmonitor/test/browser_net_brotli.js
+++ b/devtools/client/netmonitor/test/browser_net_brotli.js
@@ -6,27 +6,27 @@
const BROTLI_URL = HTTPS_EXAMPLE_URL + "html_brotli-test-page.html";
const BROTLI_REQUESTS = 1;
/**
* Test brotli encoded response is handled correctly on HTTPS.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(BROTLI_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, BROTLI_REQUESTS);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_cached-status.js
+++ b/devtools/client/netmonitor/test/browser_net_cached-status.js
@@ -7,21 +7,21 @@
* Tests if cached requests have the correct status code
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(STATUS_CODES_URL, null, true);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
const REQUEST_DATA = [
{
method: "GET",
uri: STATUS_CODES_SJS + "?sts=ok&cached",
details: {
--- a/devtools/client/netmonitor/test/browser_net_cause.js
+++ b/devtools/client/netmonitor/test/browser_net_cause.js
@@ -85,21 +85,21 @@ add_task(function* () {
// page is loaded. That's why we first load a bogus page from SIMPLE_URL,
// and only then load the real thing from CAUSE_URL - we want to catch
// all the requests the page is making, not only the XHRs.
// We can't use about:blank here, because initNetMonitor checks that the
// page has actually made at least one request.
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, EXPECTED_REQUESTS.length);
tab.linkedBrowser.loadURI(CAUSE_URL);
yield wait;
is(gStore.getState().requests.requests.size, EXPECTED_REQUESTS.length,
"All the page events should be recorded.");
--- a/devtools/client/netmonitor/test/browser_net_cause_redirect.js
+++ b/devtools/client/netmonitor/test/browser_net_cause_redirect.js
@@ -15,18 +15,20 @@ add_task(function* () {
// Serves HTTPS, sets the Strict-Transport-Security header, no stack
{ status: 200, hasStack: false },
// Second request to HTTP redirects to HTTPS internally
{ status: 200, hasStack: true },
];
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let {
+ getSortedRequests,
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, EXPECTED_REQUESTS.length);
yield performRequests(2, HSTS_SJS);
yield wait;
EXPECTED_REQUESTS.forEach(({status, hasStack}, i) => {
--- a/devtools/client/netmonitor/test/browser_net_charts-02.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-02.js
@@ -4,17 +4,17 @@
"use strict";
/**
* Makes sure Pie Charts have the right internal structure when
* initialized with empty data.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, windowRequire } = monitor.panelWin;
let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
let pie = Chart.Pie(document, {
--- a/devtools/client/netmonitor/test/browser_net_charts-03.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-03.js
@@ -3,17 +3,17 @@
"use strict";
/**
* Makes sure Table Charts have the right internal structure.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, windowRequire } = monitor.panelWin;
let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
let table = Chart.Table(document, {
--- a/devtools/client/netmonitor/test/browser_net_charts-04.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-04.js
@@ -4,17 +4,17 @@
"use strict";
/**
* Makes sure Pie Charts have the right internal structure when
* initialized with empty data.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, windowRequire } = monitor.panelWin;
let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
let table = Chart.Table(document, {
--- a/devtools/client/netmonitor/test/browser_net_charts-05.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-05.js
@@ -3,17 +3,17 @@
"use strict";
/**
* Makes sure Pie+Table Charts have the right internal structure.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, windowRequire } = monitor.panelWin;
let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
let chart = Chart.PieTable(document, {
--- a/devtools/client/netmonitor/test/browser_net_charts-06.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-06.js
@@ -3,17 +3,17 @@
"use strict";
/**
* Makes sure Pie Charts correctly handle empty source data.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, windowRequire } = monitor.panelWin;
let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
let pie = Chart.Pie(document, {
--- a/devtools/client/netmonitor/test/browser_net_charts-07.js
+++ b/devtools/client/netmonitor/test/browser_net_charts-07.js
@@ -3,17 +3,17 @@
"use strict";
/**
* Makes sure Table Charts correctly handle empty source data.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, windowRequire } = monitor.panelWin;
let { Chart } = windowRequire("devtools/client/shared/widgets/Chart");
let table = Chart.Table(document, {
--- a/devtools/client/netmonitor/test/browser_net_clear.js
+++ b/devtools/client/netmonitor/test/browser_net_clear.js
@@ -7,18 +7,18 @@
* Tests if the clear button empties the request menu.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
let detailsPanelToggleButton = document.querySelector(".network-details-panel-toggle");
let clearButton = document.querySelector(".requests-list-clear-button");
gStore.dispatch(Actions.batchEnable(false));
// Make sure we start in a sane state
assertNoRequestState();
--- a/devtools/client/netmonitor/test/browser_net_complex-params.js
+++ b/devtools/client/netmonitor/test/browser_net_complex-params.js
@@ -8,18 +8,18 @@
* displayed correctly.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(PARAMS_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { L10N } = windowRequire("devtools/client/netmonitor/utils/l10n");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { L10N } = windowRequire("devtools/client/netmonitor/src/utils/l10n");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1, 6);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_content-type.js
+++ b/devtools/client/netmonitor/test/browser_net_content-type.js
@@ -3,27 +3,26 @@
"use strict";
/**
* Tests if different response content types are handled correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
-
let { tab, monitor } = yield initNetMonitor(CONTENT_TYPE_WITHOUT_CACHE_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { L10N } = windowRequire("devtools/client/netmonitor/src/utils/l10n");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, CONTENT_TYPE_WITHOUT_CACHE_REQUESTS);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_copy_headers.js
+++ b/devtools/client/netmonitor/test/browser_net_copy_headers.js
@@ -7,17 +7,19 @@
* Tests if copying a request's request/response headers works.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let {
+ getSortedRequests,
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
let wait = waitForNetworkEvents(monitor, 1);
tab.linkedBrowser.reload();
yield wait;
EventUtils.sendMouseEvent({ type: "mousedown" },
document.querySelectorAll(".request-list-item")[0]);
--- a/devtools/client/netmonitor/test/browser_net_copy_params.js
+++ b/devtools/client/netmonitor/test/browser_net_copy_params.js
@@ -7,17 +7,17 @@
* Tests whether copying a request item's parameters works.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(PARAMS_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1, 6);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_copy_url.js
+++ b/devtools/client/netmonitor/test/browser_net_copy_url.js
@@ -7,17 +7,19 @@
* Tests if copying a request's url works.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let {
+ getSortedRequests,
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests(1);
});
yield wait;
EventUtils.sendMouseEvent({ type: "mousedown" },
--- a/devtools/client/netmonitor/test/browser_net_cors_requests.js
+++ b/devtools/client/netmonitor/test/browser_net_cors_requests.js
@@ -6,21 +6,21 @@
/**
* Test that CORS preflight requests are displayed by network monitor
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CORS_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1, 1);
info("Performing a CORS request");
let requestUrl = "http://test1.example.com" + CORS_SJS_PATH;
yield ContentTask.spawn(tab.linkedBrowser, requestUrl, function* (url) {
--- a/devtools/client/netmonitor/test/browser_net_curl-utils.js
+++ b/devtools/client/netmonitor/test/browser_net_curl-utils.js
@@ -9,19 +9,21 @@
const { Curl, CurlUtils } = require("devtools/client/shared/curl");
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CURL_UTILS_URL);
info("Starting test... ");
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
- let { getLongString } = windowRequire("devtools/client/netmonitor/utils/client");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let {
+ getSortedRequests,
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
+ let { getLongString } = windowRequire("devtools/client/netmonitor/src/utils/client");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1, 3);
yield ContentTask.spawn(tab.linkedBrowser, SIMPLE_SJS, function* (url) {
content.wrappedJSObject.performRequests(url);
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_cyrillic-01.js
+++ b/devtools/client/netmonitor/test/browser_net_cyrillic-01.js
@@ -7,21 +7,21 @@
* Tests if cyrillic text is rendered correctly in the source editor.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CYRILLIC_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_cyrillic-02.js
+++ b/devtools/client/netmonitor/test/browser_net_cyrillic-02.js
@@ -11,17 +11,17 @@
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CYRILLIC_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
let wait = waitForNetworkEvents(monitor, 1);
tab.linkedBrowser.reload();
yield wait;
verifyRequestItemTarget(
document,
getDisplayedRequests(gStore.getState()),
--- a/devtools/client/netmonitor/test/browser_net_filter-01.js
+++ b/devtools/client/netmonitor/test/browser_net_filter-01.js
@@ -126,22 +126,22 @@ const EXPECTED_REQUESTS = [
statusText: "Switching Protocols",
}
}
];
add_task(function* () {
let { monitor } = yield initNetMonitor(FILTERING_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
function setFreetextFilter(value) {
gStore.dispatch(Actions.setRequestFilterText(value));
}
info("Starting test... ");
--- a/devtools/client/netmonitor/test/browser_net_filter-02.js
+++ b/devtools/client/netmonitor/test/browser_net_filter-02.js
@@ -132,22 +132,22 @@ const EXPECTED_REQUESTS = [
add_task(function* () {
let { monitor } = yield initNetMonitor(FILTERING_URL);
info("Starting test... ");
// It seems that this test may be slow on Ubuntu builds running on ec2.
requestLongerTimeout(2);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 9);
loadCommonFrameScript();
yield performRequestsInContent(REQUESTS_WITH_MEDIA_AND_FLASH_AND_WS);
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_filter-03.js
+++ b/devtools/client/netmonitor/test/browser_net_filter-03.js
@@ -23,22 +23,22 @@ const REQUESTS_WITH_MEDIA = BASIC_REQUES
add_task(function* () {
let { monitor } = yield initNetMonitor(FILTERING_URL);
info("Starting test... ");
// It seems that this test may be slow on Ubuntu builds running on ec2.
requestLongerTimeout(2);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
// The test assumes that the first HTML request here has a longer response
// body than the other HTML requests performed later during the test.
let requests = Cu.cloneInto(REQUESTS_WITH_MEDIA, {});
let newres = "res=<p>" + new Array(10).join(Math.random(10)) + "</p>";
requests[0].url = requests[0].url.replace("res=undefined", newres);
--- a/devtools/client/netmonitor/test/browser_net_filter-04.js
+++ b/devtools/client/netmonitor/test/browser_net_filter-04.js
@@ -32,18 +32,18 @@ const REQUESTS_WITH_MEDIA_AND_FLASH_AND_
add_task(function* () {
Services.prefs.setCharPref("devtools.netmonitor.filters",
'["bogus", "js", "alsobogus"]');
let { monitor } = yield initNetMonitor(FILTERING_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { Prefs } = windowRequire("devtools/client/netmonitor/utils/prefs");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { Prefs } = windowRequire("devtools/client/netmonitor/src/utils/prefs");
gStore.dispatch(Actions.batchEnable(false));
is(Prefs.filters.length, 3,
"All the filter types should be loaded.");
is(Prefs.filters[0], "bogus",
"The first filter type is invalid, but loaded anyway.");
--- a/devtools/client/netmonitor/test/browser_net_footer-summary.js
+++ b/devtools/client/netmonitor/test/browser_net_footer-summary.js
@@ -6,28 +6,28 @@
/**
* Test if the summary text displayed in the network requests menu footer is correct.
*/
add_task(function* () {
const {
getFormattedSize,
getFormattedTime
- } = require("devtools/client/netmonitor/utils/format-utils");
+ } = require("devtools/client/netmonitor/src/utils/format-utils");
requestLongerTimeout(2);
let { tab, monitor } = yield initNetMonitor(FILTERING_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let { getDisplayedRequestsSummary } =
- windowRequire("devtools/client/netmonitor/selectors/index");
- let { L10N } = windowRequire("devtools/client/netmonitor/utils/l10n");
+ windowRequire("devtools/client/netmonitor/src/selectors/index");
+ let { L10N } = windowRequire("devtools/client/netmonitor/src/utils/l10n");
let { PluralForm } = windowRequire("devtools/shared/plural-form");
gStore.dispatch(Actions.batchEnable(false));
testStatus();
for (let i = 0; i < 2; i++) {
info(`Performing requests in batch #${i}`);
let wait = waitForNetworkEvents(monitor, 8);
--- a/devtools/client/netmonitor/test/browser_net_frame.js
+++ b/devtools/client/netmonitor/test/browser_net_frame.js
@@ -154,21 +154,21 @@ add_task(function* () {
// page is loaded. That's why we first load a bogus page from SIMPLE_URL,
// and only then load the real thing from TOP_URL - we want to catch
// all the requests the page is making, not only the XHRs.
// We can't use about:blank here, because initNetMonitor checks that the
// page has actually made at least one request.
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
tab.linkedBrowser.loadURI(TOP_URL, null, null);
yield waitForNetworkEvents(monitor, REQUEST_COUNT);
is(gStore.getState().requests.requests.size, REQUEST_COUNT,
--- a/devtools/client/netmonitor/test/browser_net_header-docs.js
+++ b/devtools/client/netmonitor/test/browser_net_header-docs.js
@@ -1,28 +1,27 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { getHeadersURL } = require("devtools/client/netmonitor/utils/mdn-utils");
-
/**
* Tests if "Learn More" links are correctly displayed
* next to headers.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(POST_DATA_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
+ let { getHeadersURL } = require("devtools/client/netmonitor/src/utils/mdn-utils");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 0, 2);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_html-preview.js
+++ b/devtools/client/netmonitor/test/browser_net_html-preview.js
@@ -7,17 +7,17 @@
* Tests if html responses show and properly populate a "Preview" tab.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CONTENT_TYPE_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 6);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_icon-preview.js
+++ b/devtools/client/netmonitor/test/browser_net_icon-preview.js
@@ -8,18 +8,21 @@
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CONTENT_TYPE_WITHOUT_CACHE_URL);
info("Starting test... ");
let { document, gStore, windowRequire, NetMonitorController } =
monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { ACTIVITY_TYPE, EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let {
+ ACTIVITY_TYPE,
+ EVENTS,
+ } = windowRequire("devtools/client/netmonitor/src/constants");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForEvents();
yield performRequests();
yield wait;
info("Checking the image thumbnail when all items are shown.");
--- a/devtools/client/netmonitor/test/browser_net_image-tooltip.js
+++ b/devtools/client/netmonitor/test/browser_net_image-tooltip.js
@@ -9,18 +9,21 @@ const IMAGE_TOOLTIP_REQUESTS = 1;
/**
* Tests if image responses show a popup in the requests menu when hovered.
*/
add_task(function* test() {
let { tab, monitor } = yield initNetMonitor(IMAGE_TOOLTIP_URL);
info("Starting test... ");
let { document, gStore, windowRequire, NetMonitorController } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { ACTIVITY_TYPE, EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let {
+ ACTIVITY_TYPE,
+ EVENTS,
+ } = windowRequire("devtools/client/netmonitor/src/constants");
let toolboxDoc = monitor.panelWin.parent.document;
gStore.dispatch(Actions.batchEnable(false));
let onEvents = waitForNetworkEvents(monitor, IMAGE_TOOLTIP_REQUESTS);
let onThumbnail = monitor.panelWin.once(EVENTS.RESPONSE_IMAGE_THUMBNAIL_DISPLAYED);
yield performRequests();
yield onEvents;
--- a/devtools/client/netmonitor/test/browser_net_json-b64.js
+++ b/devtools/client/netmonitor/test/browser_net_json-b64.js
@@ -3,22 +3,22 @@
"use strict";
/**
* Tests if JSON responses encoded in base64 are handled correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(JSON_B64_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_json-long.js
+++ b/devtools/client/netmonitor/test/browser_net_json-long.js
@@ -3,31 +3,31 @@
"use strict";
/**
* Tests if very long JSON responses are handled correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(JSON_LONG_URL);
info("Starting test... ");
// This is receiving over 80 KB of json and will populate over 6000 items
// in a variables view instance. Debug builds are slow.
requestLongerTimeout(4);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_json-malformed.js
+++ b/devtools/client/netmonitor/test/browser_net_json-malformed.js
@@ -3,26 +3,26 @@
"use strict";
/**
* Tests if malformed JSON responses are handled correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(JSON_MALFORMED_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_json-null.js
+++ b/devtools/client/netmonitor/test/browser_net_json-null.js
@@ -1,36 +1,35 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { L10N } = require("devtools/client/netmonitor/utils/l10n");
-
/**
* Tests if JSON responses containing null values are properly displayed.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(JSON_BASIC_URL + "?name=null");
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let { L10N } = windowRequire("devtools/client/netmonitor/src/utils/l10n");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
- yield openResponsePanel(document);
- checkResponsePanelDisplaysJSON(document);
+ yield openResponsePanel();
+ checkResponsePanelDisplaysJSON();
let tabpanel = document.querySelector("#response-panel");
is(tabpanel.querySelectorAll(".tree-section").length, 1,
"There should be 1 tree sections displayed in this tabpanel.");
is(tabpanel.querySelectorAll(".treeRow:not(.tree-section)").length, 1,
"There should be 1 json properties displayed in this tabpanel.");
is(tabpanel.querySelectorAll(".empty-notice").length, 0,
"The empty notice should not be displayed in this tabpanel.");
@@ -39,39 +38,39 @@ add_task(function* () {
.querySelectorAll("tr:not(.tree-section) .treeLabelCell .treeLabel");
let values = tabpanel
.querySelectorAll("tr:not(.tree-section) .treeValueCell .objectBox");
is(labels[0].textContent, "greeting", "The first json property name was incorrect.");
is(values[0].textContent, "null", "The first json property value was incorrect.");
yield teardown(monitor);
-});
-/**
- * Helper to assert that the response panel found in the provided document is currently
- * showing a preview of a JSON object.
- */
-function checkResponsePanelDisplaysJSON(doc) {
- let tabpanel = doc.querySelector("#response-panel");
- is(tabpanel.querySelector(".response-error-header") === null, true,
- "The response error header doesn't have the intended visibility.");
- let jsonView = tabpanel.querySelector(".tree-section .treeLabel") || {};
- is(jsonView.textContent === L10N.getStr("jsonScopeName"), true,
- "The response json view has the intended visibility.");
- is(tabpanel.querySelector(".editor-mount iframe") === null, true,
- "The response editor doesn't have the intended visibility.");
- is(tabpanel.querySelector(".response-image-box") === null, true,
- "The response image box doesn't have the intended visibility.");
-}
+ /**
+ * Helper to assert that the response panel found in the provided document is currently
+ * showing a preview of a JSON object.
+ */
+ function checkResponsePanelDisplaysJSON() {
+ let panel = document.querySelector("#response-panel");
+ is(panel.querySelector(".response-error-header") === null, true,
+ "The response error header doesn't have the intended visibility.");
+ let jsonView = panel.querySelector(".tree-section .treeLabel") || {};
+ is(jsonView.textContent === L10N.getStr("jsonScopeName"), true,
+ "The response json view has the intended visibility.");
+ is(panel.querySelector(".editor-mount iframe") === null, true,
+ "The response editor doesn't have the intended visibility.");
+ is(panel.querySelector(".response-image-box") === null, true,
+ "The response image box doesn't have the intended visibility.");
+ }
-/**
- * Open the netmonitor details panel and switch to the response tab.
- * Returns a promise that will resolve when the response panel DOM element is available.
- */
-function openResponsePanel(document) {
- let onReponsePanelReady = waitForDOM(document, "#response-panel");
- EventUtils.sendMouseEvent({ type: "click" },
- document.querySelector(".network-details-panel-toggle"));
- EventUtils.sendMouseEvent({ type: "click" },
- document.querySelector("#response-tab"));
- return onReponsePanelReady;
-}
+ /**
+ * Open the netmonitor details panel and switch to the response tab.
+ * Returns a promise that will resolve when the response panel DOM element is available.
+ */
+ function openResponsePanel() {
+ let onReponsePanelReady = waitForDOM(document, "#response-panel");
+ EventUtils.sendMouseEvent({ type: "click" },
+ document.querySelector(".network-details-panel-toggle"));
+ EventUtils.sendMouseEvent({ type: "click" },
+ document.querySelector("#response-tab"));
+ return onReponsePanelReady;
+ }
+});
--- a/devtools/client/netmonitor/test/browser_net_json_custom_mime.js
+++ b/devtools/client/netmonitor/test/browser_net_json_custom_mime.js
@@ -3,27 +3,26 @@
"use strict";
/**
* Tests if JSON responses with unusal/custom MIME types are handled correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
-
let { tab, monitor } = yield initNetMonitor(JSON_CUSTOM_MIME_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { L10N } = windowRequire("devtools/client/netmonitor/src/utils/l10n");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_json_text_mime.js
+++ b/devtools/client/netmonitor/test/browser_net_json_text_mime.js
@@ -3,27 +3,27 @@
"use strict";
/**
* Tests if JSON responses with unusal/custom MIME types are handled correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(JSON_TEXT_MIME_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_jsonp.js
+++ b/devtools/client/netmonitor/test/browser_net_jsonp.js
@@ -3,27 +3,27 @@
"use strict";
/**
* Tests if JSONP responses are handled correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(JSONP_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 2);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_large-response.js
+++ b/devtools/client/netmonitor/test/browser_net_large-response.js
@@ -13,21 +13,21 @@ add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
info("Starting test... ");
// This test could potentially be slow because over 100 KB of stuff
// is going to be requested and displayed in the source editor.
requestLongerTimeout(2);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, HTML_LONG_URL, function* (url) {
content.wrappedJSObject.performRequests(1, url);
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_open_request_in_tab.js
+++ b/devtools/client/netmonitor/test/browser_net_open_request_in_tab.js
@@ -7,17 +7,17 @@
* Tests if Open in new tab works.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
info("Starting test...");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests(1);
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_page-nav.js
+++ b/devtools/client/netmonitor/test/browser_net_page-nav.js
@@ -8,17 +8,17 @@
* action in the network monitor.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { windowRequire } = monitor.panelWin;
- let { EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
yield testNavigate();
yield testNavigateBack();
yield testClose();
function* testNavigate() {
info("Navigating forward...");
--- a/devtools/client/netmonitor/test/browser_net_pane-collapse.js
+++ b/devtools/client/netmonitor/test/browser_net_pane-collapse.js
@@ -7,17 +7,17 @@
* Tests if the network monitor panes collapse properly.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, windowRequire } = monitor.panelWin;
- let { Prefs } = windowRequire("devtools/client/netmonitor/utils/prefs");
+ let { Prefs } = windowRequire("devtools/client/netmonitor/src/utils/prefs");
let detailsPaneToggleButton = document.querySelector(".network-details-panel-toggle");
let wait = waitForNetworkEvents(monitor, 1);
tab.linkedBrowser.reload();
yield wait;
ok(!document.querySelector(".network-details-panel") &&
detailsPaneToggleButton.classList.contains("pane-collapsed"),
--- a/devtools/client/netmonitor/test/browser_net_pane-toggle.js
+++ b/devtools/client/netmonitor/test/browser_net_pane-toggle.js
@@ -7,22 +7,22 @@
* Tests if toggling the details pane works as expected.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
let {
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let toggleButton = document.querySelector(".network-details-panel-toggle");
is(toggleButton.hasAttribute("disabled"), true,
"The pane toggle button should be disabled when the frontend is opened.");
is(toggleButton.classList.contains("pane-collapsed"), true,
--- a/devtools/client/netmonitor/test/browser_net_post-data-01.js
+++ b/devtools/client/netmonitor/test/browser_net_post-data-01.js
@@ -3,30 +3,30 @@
"use strict";
/**
* Tests if the POST requests display the correct information in the UI.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
// Set a higher panel height in order to get full CodeMirror content
Services.prefs.setIntPref("devtools.toolbox.footer.height", 400);
let { tab, monitor } = yield initNetMonitor(POST_DATA_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 0, 2);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_post-data-02.js
+++ b/devtools/client/netmonitor/test/browser_net_post-data-02.js
@@ -4,23 +4,23 @@
"use strict";
/**
* Tests if the POST requests display the correct information in the UI,
* for raw payloads with attached content-type headers.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(POST_RAW_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 0, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_post-data-03.js
+++ b/devtools/client/netmonitor/test/browser_net_post-data-03.js
@@ -4,23 +4,23 @@
"use strict";
/**
* Tests if the POST requests display the correct information in the UI,
* for raw payloads with content-type headers attached to the upload stream.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(POST_RAW_WITH_HEADERS_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 0, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_post-data-04.js
+++ b/devtools/client/netmonitor/test/browser_net_post-data-04.js
@@ -4,23 +4,23 @@
"use strict";
/**
* Tests if the POST requests display the correct information in the UI,
* for JSON payloads.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(POST_JSON_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 0, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_prefs-and-l10n.js
+++ b/devtools/client/netmonitor/test/browser_net_prefs-and-l10n.js
@@ -3,23 +3,23 @@
"use strict";
/**
* Tests if the preferences and localization objects work correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { windowRequire } = monitor.panelWin;
- let { Prefs } = windowRequire("devtools/client/netmonitor/utils/prefs");
+ let { Prefs } = windowRequire("devtools/client/netmonitor/src/utils/prefs");
testL10N();
testPrefs();
return teardown(monitor);
function testL10N() {
is(typeof L10N.getStr("netmonitor.security.enabled"), "string",
--- a/devtools/client/netmonitor/test/browser_net_prefs-reload.js
+++ b/devtools/client/netmonitor/test/browser_net_prefs-reload.js
@@ -5,31 +5,31 @@
/**
* Tests if the prefs that should survive across tool reloads work.
*/
add_task(function* () {
let { monitor } = yield initNetMonitor(SIMPLE_URL);
let { getRequestFilterTypes } = monitor.panelWin
- .windowRequire("devtools/client/netmonitor/selectors/index");
+ .windowRequire("devtools/client/netmonitor/src/selectors/index");
let Actions = monitor.panelWin
- .windowRequire("devtools/client/netmonitor/actions/index");
+ .windowRequire("devtools/client/netmonitor/src/actions/index");
info("Starting test... ");
// This test reopens the network monitor a bunch of times, for different
// hosts (bottom, side, window). This seems to be slow on debug builds.
requestLongerTimeout(3);
// Use these getters instead of caching instances inside the panel win,
// since the tool is reopened a bunch of times during this test
// and the instances will differ.
let getDoc = () => monitor.panelWin.document;
let getPrefs = () => monitor.panelWin
- .windowRequire("devtools/client/netmonitor/utils/prefs").Prefs;
+ .windowRequire("devtools/client/netmonitor/src/utils/prefs").Prefs;
let getStore = () => monitor.panelWin.gStore;
let getState = () => getStore().getState();
let prefsToCheck = {
filters: {
// A custom new value to be used for the verified preference.
newValue: ["html", "css"],
// Getter used to retrieve the current value from the frontend, in order
--- a/devtools/client/netmonitor/test/browser_net_raw_headers.js
+++ b/devtools/client/netmonitor/test/browser_net_raw_headers.js
@@ -7,18 +7,20 @@
* Tests if showing raw headers works.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(POST_DATA_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let {
+ getSortedRequests,
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 0, 2);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_req-resp-bodies.js
+++ b/devtools/client/netmonitor/test/browser_net_req-resp-bodies.js
@@ -3,27 +3,27 @@
"use strict";
/**
* Test if request and response body logging stays on after opening the console.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(JSON_LONG_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
// Perform first batch of requests.
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
--- a/devtools/client/netmonitor/test/browser_net_resend.js
+++ b/devtools/client/netmonitor/test/browser_net_resend.js
@@ -12,21 +12,21 @@ const ADD_HEADER = "Test-header: true";
const ADD_UA_HEADER = "User-Agent: Custom-Agent";
const ADD_POSTDATA = "&t3=t4";
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(POST_DATA_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 0, 2);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests();
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_resend_cors.js
+++ b/devtools/client/netmonitor/test/browser_net_resend_cors.js
@@ -8,20 +8,20 @@
* a preflight OPTIONS request (bug 1270096 and friends)
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CORS_URL);
info("Starting test... ");
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let requestUrl = "http://test1.example.com" + CORS_SJS_PATH;
info("Waiting for OPTIONS, then POST");
let wait = waitForNetworkEvents(monitor, 1, 1);
yield ContentTask.spawn(tab.linkedBrowser, requestUrl, function* (url) {
--- a/devtools/client/netmonitor/test/browser_net_resend_headers.js
+++ b/devtools/client/netmonitor/test/browser_net_resend_headers.js
@@ -7,20 +7,20 @@
* Test if custom request headers are not ignored (bug 1270096 and friends)
*/
add_task(function* () {
let { monitor } = yield initNetMonitor(SIMPLE_SJS);
info("Starting test... ");
let { gStore, windowRequire, NetMonitorController } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let requestUrl = SIMPLE_SJS;
let requestHeaders = [
{ name: "Host", value: "fakehost.example.com" },
{ name: "User-Agent", value: "Testzilla" },
{ name: "Referer", value: "http://example.com/referrer" },
--- a/devtools/client/netmonitor/test/browser_net_security-details.js
+++ b/devtools/client/netmonitor/test/browser_net_security-details.js
@@ -5,17 +5,17 @@
/**
* Test that Security details tab contains the expected data.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
info("Performing a secure request.");
const REQUESTS_URL = "https://example.com" + CORS_SJS_PATH;
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, REQUESTS_URL, function* (url) {
content.wrappedJSObject.performRequests(1, url);
--- a/devtools/client/netmonitor/test/browser_net_security-error.js
+++ b/devtools/client/netmonitor/test/browser_net_security-error.js
@@ -5,18 +5,18 @@
/**
* Test that Security details tab shows an error message with broken connections.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
gStore.dispatch(Actions.batchEnable(false));
info("Requesting a resource that has a certificate problem.");
let wait = waitForSecurityBrokenNetworkEvent();
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests(1, "https://nocert.example.com");
--- a/devtools/client/netmonitor/test/browser_net_security-icon-click.js
+++ b/devtools/client/netmonitor/test/browser_net_security-icon-click.js
@@ -5,17 +5,17 @@
/**
* Test that clicking on the security indicator opens the security details tab.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
info("Requesting a resource over HTTPS.");
yield performRequestAndWait("https://example.com" + CORS_SJS_PATH + "?request_2");
yield performRequestAndWait("https://example.com" + CORS_SJS_PATH + "?request_1");
is(gStore.getState().requests.requests.size, 2, "Two events event logged.");
--- a/devtools/client/netmonitor/test/browser_net_security-redirect.js
+++ b/devtools/client/netmonitor/test/browser_net_security-redirect.js
@@ -6,17 +6,17 @@
/**
* Test a http -> https redirect shows secure icon only for redirected https
* request.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 2);
yield ContentTask.spawn(tab.linkedBrowser, HTTPS_REDIRECT_SJS, function* (url) {
content.wrappedJSObject.performRequests(1, url);
});
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_security-state.js
+++ b/devtools/client/netmonitor/test/browser_net_security-state.js
@@ -13,17 +13,17 @@ add_task(function* () {
"test1.example.com": "security-state-insecure",
"example.com": "security-state-secure",
"nocert.example.com": "security-state-broken",
"localhost": "security-state-local",
};
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
yield performRequests();
for (let subitemNode of Array.from(document.querySelectorAll(
"requests-list-subitem.requests-list-security-and-domain"))) {
let domain = subitemNode.querySelector(".requests-list-domain").textContent;
--- a/devtools/client/netmonitor/test/browser_net_security-tab-deselect.js
+++ b/devtools/client/netmonitor/test/browser_net_security-tab-deselect.js
@@ -6,17 +6,17 @@
/**
* Test that security details tab is no longer selected if an insecure request
* is selected.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
info("Performing requests.");
let wait = waitForNetworkEvents(monitor, 2);
const REQUEST_URLS = [
"https://example.com" + CORS_SJS_PATH,
"http://example.com" + CORS_SJS_PATH,
--- a/devtools/client/netmonitor/test/browser_net_security-tab-visibility.js
+++ b/devtools/client/netmonitor/test/browser_net_security-tab-visibility.js
@@ -28,20 +28,19 @@ add_task(function* () {
visibleOnNewEvent: false,
visibleOnSecurityInfo: true,
visibleOnceComplete: true,
}
];
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let {
- getSelectedRequest,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { getSelectedRequest } =
+ windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
for (let testcase of TEST_DATA) {
info("Testing Security tab visibility for " + testcase.desc);
let onNewItem = monitor.panelWin.once(EVENTS.NETWORK_EVENT);
let onSecurityInfo = monitor.panelWin.once(EVENTS.RECEIVED_SECURITY_INFO);
let onComplete = testcase.isBroken ?
--- a/devtools/client/netmonitor/test/browser_net_security-warnings.js
+++ b/devtools/client/netmonitor/test/browser_net_security-warnings.js
@@ -13,17 +13,17 @@ const TEST_CASES = [
uri: "https://example.com" + CORS_SJS_PATH,
warnCipher: null,
},
];
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
for (let test of TEST_CASES) {
info("Testing site with " + test.desc);
info("Performing request to " + test.uri);
let wait = waitForNetworkEvents(monitor, 1);
--- a/devtools/client/netmonitor/test/browser_net_send-beacon-other-tab.js
+++ b/devtools/client/netmonitor/test/browser_net_send-beacon-other-tab.js
@@ -5,18 +5,20 @@
/**
* Tests if beacons from other tabs are properly ignored.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let {
+ getSortedRequests,
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let beaconTab = yield addTab(SEND_BEACON_URL);
info("Beacon tab added successfully.");
is(gStore.getState().requests.requests.size, 0, "The requests menu should be empty.");
--- a/devtools/client/netmonitor/test/browser_net_send-beacon.js
+++ b/devtools/client/netmonitor/test/browser_net_send-beacon.js
@@ -5,18 +5,19 @@
/**
* Tests if beacons are handled correctly.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SEND_BEACON_URL);
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { getSortedRequests } =
+ windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
is(gStore.getState().requests.requests.size, 0, "The requests menu should be empty.");
let wait = waitForNetworkEvents(monitor, 1);
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequest();
--- a/devtools/client/netmonitor/test/browser_net_service-worker-status.js
+++ b/devtools/client/netmonitor/test/browser_net_service-worker-status.js
@@ -12,21 +12,21 @@ const URL = EXAMPLE_URL.replace("http:",
const TEST_URL = URL + "service-workers/status-codes.html";
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(TEST_URL, null, true);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
const REQUEST_DATA = [
{
method: "GET",
uri: URL + "service-workers/test/200",
details: {
--- a/devtools/client/netmonitor/test/browser_net_simple-request-data.js
+++ b/devtools/client/netmonitor/test/browser_net_simple-request-data.js
@@ -3,29 +3,29 @@
"use strict";
/**
* Tests if requests render correct information in the menu UI.
*/
function test() {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
initNetMonitor(SIMPLE_SJS).then(({ tab, monitor }) => {
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
let {
getDisplayedRequests,
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
waitForNetworkEvents(monitor, 1)
.then(() => teardown(monitor))
.then(finish);
monitor.panelWin.once(EVENTS.NETWORK_EVENT, () => {
--- a/devtools/client/netmonitor/test/browser_net_simple-request-details.js
+++ b/devtools/client/netmonitor/test/browser_net_simple-request-details.js
@@ -3,28 +3,28 @@
"use strict";
/**
* Tests if requests render correct information in the details UI.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(SIMPLE_SJS);
info("Starting test... ");
let { document, gStore, windowRequire, NetMonitorView } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
let {
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
let Editor = require("devtools/client/sourceeditor/editor");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 1);
tab.linkedBrowser.reload();
yield wait;
--- a/devtools/client/netmonitor/test/browser_net_simple-request.js
+++ b/devtools/client/netmonitor/test/browser_net_simple-request.js
@@ -12,17 +12,17 @@
* 3) Empty user message visibility
* 4) Number of requests displayed
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
gStore.dispatch(Actions.batchEnable(false));
is(document.querySelector(".network-details-panel-toggle").hasAttribute("disabled"),
true,
"The pane toggle button should be disabled when the frontend is opened.");
ok(document.querySelector(".request-list-empty-notice"),
"An empty notice should be displayed when the frontend is opened.");
--- a/devtools/client/netmonitor/test/browser_net_sort-01.js
+++ b/devtools/client/netmonitor/test/browser_net_sort-01.js
@@ -3,32 +3,32 @@
"use strict";
/**
* Test if sorting columns in the network table works correctly with new requests.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SORTING_URL);
info("Starting test... ");
// It seems that this test may be slow on debug builds. This could be because
// of the heavy dom manipulation associated with sorting.
requestLongerTimeout(2);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
// Loading the frame script and preparing the xhr request URLs so we can
// generate some requests later.
loadCommonFrameScript();
let requests = [{
url: "sjs_sorting-test-server.sjs?index=1&" + Math.random(),
--- a/devtools/client/netmonitor/test/browser_net_sort-02.js
+++ b/devtools/client/netmonitor/test/browser_net_sort-02.js
@@ -3,32 +3,32 @@
"use strict";
/**
* Test if sorting columns in the network table works correctly.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { monitor } = yield initNetMonitor(SORTING_URL);
info("Starting test... ");
// It seems that this test may be slow on debug builds. This could be because
// of the heavy dom manipulation associated with sorting.
requestLongerTimeout(2);
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSelectedRequest,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
// Loading the frame script and preparing the xhr request URLs so we can
// generate some requests later.
loadCommonFrameScript();
let requests = [{
url: "sjs_sorting-test-server.sjs?index=1&" + Math.random(),
--- a/devtools/client/netmonitor/test/browser_net_statistics-01.js
+++ b/devtools/client/netmonitor/test/browser_net_statistics-01.js
@@ -8,17 +8,17 @@
*/
add_task(function* () {
let { monitor } = yield initNetMonitor(STATISTICS_URL);
info("Starting test... ");
let panel = monitor.panelWin;
let { document, gStore, windowRequire } = panel;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
ok(document.querySelector(".monitor-panel"),
"The current main panel is correct.");
info("Displaying statistics panel");
gStore.dispatch(Actions.openStatistics(true));
ok(document.querySelector(".statistics-panel"),
--- a/devtools/client/netmonitor/test/browser_net_statistics-02.js
+++ b/devtools/client/netmonitor/test/browser_net_statistics-02.js
@@ -9,17 +9,17 @@
*/
add_task(function* () {
let { monitor } = yield initNetMonitor(FILTERING_URL);
info("Starting test... ");
let panel = monitor.panelWin;
let { document, gStore, windowRequire } = panel;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-html-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-css-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-js-button"));
EventUtils.sendMouseEvent({ type: "click" },
--- a/devtools/client/netmonitor/test/browser_net_status-codes.js
+++ b/devtools/client/netmonitor/test/browser_net_status-codes.js
@@ -3,28 +3,28 @@
"use strict";
/**
* Tests if requests display the correct status code and text in the UI.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(STATUS_CODES_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let requestItems = [];
const REQUEST_DATA = [
{
// request #0
--- a/devtools/client/netmonitor/test/browser_net_streaming-response.js
+++ b/devtools/client/netmonitor/test/browser_net_streaming-response.js
@@ -8,21 +8,21 @@
* displayed as XML or plain text
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
const REQUESTS = [
[ "hls-m3u8", /^#EXTM3U/ ],
[ "mpeg-dash", /^<\?xml/ ]
];
--- a/devtools/client/netmonitor/test/browser_net_throttle.js
+++ b/devtools/client/netmonitor/test/browser_net_throttle.js
@@ -10,21 +10,21 @@ add_task(function* () {
yield throttleTest(false);
});
function* throttleTest(actuallyThrottle) {
requestLongerTimeout(2);
let { monitor } = yield initNetMonitor(SIMPLE_URL);
let { gStore, windowRequire, NetMonitorController } = monitor.panelWin;
- let { ACTIVITY_TYPE } = windowRequire("devtools/client/netmonitor/constants");
- let { EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let { ACTIVITY_TYPE } = windowRequire("devtools/client/netmonitor/src/constants");
+ let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
let {
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
info("Starting test... (actuallyThrottle = " + actuallyThrottle + ")");
// When throttling, must be smaller than the length of the content
// of SIMPLE_URL in bytes.
const size = actuallyThrottle ? 200 : 0;
const request = {
--- a/devtools/client/netmonitor/test/browser_net_timeline_ticks.js
+++ b/devtools/client/netmonitor/test/browser_net_timeline_ticks.js
@@ -3,17 +3,17 @@
"use strict";
/**
* Tests if timeline correctly displays interval divisions.
*/
add_task(function* () {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
let { tab, monitor } = yield initNetMonitor(SIMPLE_URL);
info("Starting test... ");
let { $, $all, NetMonitorView, NetMonitorController } = monitor.panelWin;
let { RequestsMenu } = NetMonitorView;
// Disable transferred size column support for this test.
--- a/devtools/client/netmonitor/test/browser_net_timing-division.js
+++ b/devtools/client/netmonitor/test/browser_net_timing-division.js
@@ -7,18 +7,20 @@
* Tests if timing intervals are divided againts seconds when appropriate.
*/
add_task(function* () {
let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let {
+ getSortedRequests,
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
let wait = waitForNetworkEvents(monitor, 2);
// Timeout needed for having enough divisions on the time scale.
yield ContentTask.spawn(tab.linkedBrowser, {}, function* () {
content.wrappedJSObject.performRequests(2, null, 3000);
});
--- a/devtools/client/netmonitor/test/browser_net_truncate.js
+++ b/devtools/client/netmonitor/test/browser_net_truncate.js
@@ -3,34 +3,34 @@
"use strict";
/**
* Verifies that truncated response bodies still have the correct reported size.
*/
function test() {
- let { L10N } = require("devtools/client/netmonitor/utils/l10n");
+ let { L10N } = require("devtools/client/netmonitor/src/utils/l10n");
const { RESPONSE_BODY_LIMIT } = require("devtools/shared/webconsole/network-monitor");
const URL = EXAMPLE_URL + "sjs_truncate-test-server.sjs?limit=" + RESPONSE_BODY_LIMIT;
// Another slow test on Linux debug.
requestLongerTimeout(2);
initNetMonitor(URL).then(({ tab, monitor }) => {
info("Starting test... ");
let { document, gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { EVENTS } = windowRequire("devtools/client/netmonitor/constants");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { EVENTS } = windowRequire("devtools/client/netmonitor/src/constants");
let {
getDisplayedRequests,
getSortedRequests,
- } = windowRequire("devtools/client/netmonitor/selectors/index");
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
waitForNetworkEvents(monitor, 1)
.then(() => teardown(monitor))
.then(finish);
monitor.panelWin.once(EVENTS.RECEIVED_RESPONSE_CONTENT, () => {
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -8,24 +8,24 @@
"use strict";
// shared-head.js handles imports, constants, and utility functions
Services.scriptloader.loadSubScript(
"chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js",
this);
-const { EVENTS } = require("devtools/client/netmonitor/constants");
+const { EVENTS } = require("devtools/client/netmonitor/src/constants");
let { Toolbox } = require("devtools/client/framework/toolbox");
const {
decodeUnicodeUrl,
getUrlBaseName,
getUrlQuery,
getUrlHost,
-} = require("devtools/client/netmonitor/utils/request-utils");
+} = require("devtools/client/netmonitor/src/utils/request-utils");
/* eslint-disable no-unused-vars, max-len */
const EXAMPLE_URL = "http://example.com/browser/devtools/client/netmonitor/test/";
const HTTPS_EXAMPLE_URL = "https://example.com/browser/devtools/client/netmonitor/test/";
const API_CALLS_URL = EXAMPLE_URL + "html_api-calls-test-page.html";
const SIMPLE_URL = EXAMPLE_URL + "html_simple-test-page.html";
const NAVIGATE_URL = EXAMPLE_URL + "html_navigate-test-page.html";
--- a/devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js
@@ -10,18 +10,20 @@ const TEST_URL = TEST_BASE_HTTP + "doc_u
add_task(function* () {
info("Opening netmonitor");
let tab = yield addTab("about:blank");
let target = TargetFactory.forTab(tab);
let toolbox = yield gDevTools.showToolbox(target, "netmonitor");
let monitor = toolbox.getPanel("netmonitor");
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let {
+ getSortedRequests,
+ } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
info("Navigating to test page");
yield navigateTo(TEST_URL);
info("Opening Style Editor");
let styleeditor = yield toolbox.selectTool("styleeditor");
--- a/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
+++ b/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
@@ -59,18 +59,18 @@ function loadDocument(browser) {
return deferred.promise;
}
function testNetmonitor(toolbox) {
let monitor = toolbox.getCurrentPanel();
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { getSortedRequests } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
is(gStore.getState().requests.requests.size, 1, "Network request appears in the network panel");
let item = getSortedRequests(gStore.getState()).get(0);
is(item.method, "GET", "The attached method is correct.");
is(item.url, TEST_PATH, "The attached url is correct.");
--- a/devtools/client/webconsole/test/browser_webconsole_netlogging_panel.js
+++ b/devtools/client/webconsole/test/browser_webconsole_netlogging_panel.js
@@ -19,17 +19,17 @@ add_task(function* () {
let request = yield finishedRequest;
yield hud.ui.openNetworkPanel(request.actor);
let toolbox = gDevTools.getToolbox(hud.target);
is(toolbox.currentToolId, "netmonitor", "Network panel was opened");
let panel = toolbox.getCurrentPanel();
let { gStore, windowRequire } = panel.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSelectedRequest } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { getSelectedRequest } = windowRequire("devtools/client/netmonitor/src/selectors/index");
let selected = getSelectedRequest(gStore.getState());
is(selected.method, request.request.method,
"The correct request is selected");
is(selected.url, request.request.url,
"The correct request is definitely selected");
});
--- a/devtools/client/webconsole/test/browser_webconsole_netlogging_reset_filter.js
+++ b/devtools/client/webconsole/test/browser_webconsole_netlogging_reset_filter.js
@@ -34,18 +34,18 @@ add_task(function* () {
ok(htmlRequest, "htmlRequest was a html");
yield hud.ui.openNetworkPanel(htmlRequest.actor);
let toolbox = gDevTools.getToolbox(hud.target);
is(toolbox.currentToolId, "netmonitor", "Network panel was opened");
let panel = toolbox.getCurrentPanel();
let { gStore, windowRequire } = panel.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSelectedRequest } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { getSelectedRequest } = windowRequire("devtools/client/netmonitor/src/selectors/index");
let selected = getSelectedRequest(gStore.getState());
is(selected.method, htmlRequest.request.method,
"The correct request is selected");
is(selected.url, htmlRequest.request.url,
"The correct request is definitely selected");
// Filter out the HTML request.
--- a/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
+++ b/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
@@ -59,18 +59,18 @@ function loadDocument(browser) {
return deferred.promise;
}
function testNetmonitor(toolbox) {
let monitor = toolbox.getCurrentPanel();
let { gStore, windowRequire } = monitor.panelWin;
- let Actions = windowRequire("devtools/client/netmonitor/actions/index");
- let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index");
+ let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+ let { getSortedRequests } = windowRequire("devtools/client/netmonitor/src/selectors/index");
gStore.dispatch(Actions.batchEnable(false));
is(gStore.getState().requests.requests.size, 1, "Network request appears in the network panel");
let item = getSortedRequests(gStore.getState()).get(0);
is(item.method, "GET", "The request method is correct.");
is(item.url, TEST_PATH, "The request url is correct.");