diff --git a/.eslintignore b/.eslintignore index 2c6ade0a3ffb..1da590fcf44b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -87,8 +87,6 @@ devtools/client/framework/** devtools/client/inspector/markup/test/doc_markup_events_*.html devtools/client/inspector/rules/test/doc_media_queries.html devtools/client/memory/test/chrome/*.html -devtools/client/netmonitor/test/** -devtools/client/netmonitor/har/test/** devtools/client/performance/components/test/test_jit_optimizations_01.html devtools/client/projecteditor/** devtools/client/responsive.html/test/browser/touch.html diff --git a/devtools/client/netmonitor/har/test/browser_net_har_copy_all_as_har.js b/devtools/client/netmonitor/har/test/browser_net_har_copy_all_as_har.js index d51f18e7c4e1..a9344f46e056 100644 --- a/devtools/client/netmonitor/har/test/browser_net_har_copy_all_as_har.js +++ b/devtools/client/netmonitor/har/test/browser_net_har_copy_all_as_har.js @@ -11,7 +11,7 @@ add_task(function* () { info("Starting test... "); - let { document, gStore, windowRequire } = monitor.panelWin; + let { gStore, windowRequire } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let RequestListContextMenu = windowRequire( "devtools/client/netmonitor/request-list-context-menu"); diff --git a/devtools/client/netmonitor/har/test/browser_net_har_post_data.js b/devtools/client/netmonitor/har/test/browser_net_har_post_data.js index 207fd1964d59..a4f52af8ade5 100644 --- a/devtools/client/netmonitor/har/test/browser_net_har_post_data.js +++ b/devtools/client/netmonitor/har/test/browser_net_har_post_data.js @@ -12,7 +12,7 @@ add_task(function* () { info("Starting test... "); - let { document, gStore, windowRequire } = monitor.panelWin; + let { gStore, windowRequire } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let RequestListContextMenu = windowRequire( "devtools/client/netmonitor/request-list-context-menu"); diff --git a/devtools/client/netmonitor/har/test/browser_net_har_throttle_upload.js b/devtools/client/netmonitor/har/test/browser_net_har_throttle_upload.js index d45bb10e215d..94623bcfa192 100644 --- a/devtools/client/netmonitor/har/test/browser_net_har_throttle_upload.js +++ b/devtools/client/netmonitor/har/test/browser_net_har_throttle_upload.js @@ -16,7 +16,7 @@ function* throttleUploadTest(actuallyThrottle) { info("Starting test... (actuallyThrottle = " + actuallyThrottle + ")"); - let { document, gStore, windowRequire, NetMonitorController } = monitor.panelWin; + let { gStore, windowRequire, NetMonitorController } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let RequestListContextMenu = windowRequire( "devtools/client/netmonitor/request-list-context-menu"); diff --git a/devtools/client/netmonitor/har/test/html_har_post-data-test-page.html b/devtools/client/netmonitor/har/test/html_har_post-data-test-page.html index 7542d8d240e9..203ae06bad68 100644 --- a/devtools/client/netmonitor/har/test/html_har_post-data-test-page.html +++ b/devtools/client/netmonitor/har/test/html_har_post-data-test-page.html @@ -16,22 +16,25 @@
HAR POST data test
diff --git a/devtools/client/netmonitor/test/browser_net_autoscroll.js b/devtools/client/netmonitor/test/browser_net_autoscroll.js index bdafc8aa4274..c84cc84122bb 100644 --- a/devtools/client/netmonitor/test/browser_net_autoscroll.js +++ b/devtools/client/netmonitor/test/browser_net_autoscroll.js @@ -66,7 +66,7 @@ add_task(function* () { info("Waiting for one network request"); yield waitForNetworkEvents(monitor, 1); console.log(requestsContainer.scrollHeight); - console.log(requestsContainer.clientHeight) + console.log(requestsContainer.clientHeight); if (requestsContainer.scrollHeight > requestsContainer.clientHeight) { info("The list is long enough, returning"); return; diff --git a/devtools/client/netmonitor/test/browser_net_cause.js b/devtools/client/netmonitor/test/browser_net_cause.js index ea353925d728..6f43a9b2d27b 100644 --- a/devtools/client/netmonitor/test/browser_net_cause.js +++ b/devtools/client/netmonitor/test/browser_net_cause.js @@ -38,14 +38,14 @@ const EXPECTED_REQUESTS = [ url: EXAMPLE_URL + "xhr_request", causeType: "xhr", causeUri: CAUSE_URL, - stack: [{ fn: "performXhrRequest", file: CAUSE_FILE_NAME, line: 22 }] + stack: [{ fn: "performXhrRequest", file: CAUSE_FILE_NAME, line: 24 }] }, { method: "GET", url: EXAMPLE_URL + "fetch_request", causeType: "fetch", causeUri: CAUSE_URL, - stack: [{ fn: "performFetchRequest", file: CAUSE_FILE_NAME, line: 26 }] + stack: [{ fn: "performFetchRequest", file: CAUSE_FILE_NAME, line: 28 }] }, { method: "GET", @@ -53,8 +53,8 @@ const EXPECTED_REQUESTS = [ causeType: "fetch", causeUri: CAUSE_URL, stack: [ - { fn: "performPromiseFetchRequest", file: CAUSE_FILE_NAME, line: 38 }, - { fn: null, file: CAUSE_FILE_NAME, line: 37, asyncCause: "promise callback" }, + { fn: "performPromiseFetchRequest", file: CAUSE_FILE_NAME, line: 40 }, + { fn: null, file: CAUSE_FILE_NAME, line: 39, asyncCause: "promise callback" }, ] }, { @@ -63,8 +63,8 @@ const EXPECTED_REQUESTS = [ causeType: "fetch", causeUri: CAUSE_URL, stack: [ - { fn: "performTimeoutFetchRequest", file: CAUSE_FILE_NAME, line: 40 }, - { fn: "performPromiseFetchRequest", file: CAUSE_FILE_NAME, line: 39, + { fn: "performTimeoutFetchRequest", file: CAUSE_FILE_NAME, line: 42 }, + { fn: "performPromiseFetchRequest", file: CAUSE_FILE_NAME, line: 41, asyncCause: "setTimeout handler" }, ] }, @@ -73,7 +73,7 @@ const EXPECTED_REQUESTS = [ url: EXAMPLE_URL + "beacon_request", causeType: "beacon", causeUri: CAUSE_URL, - stack: [{ fn: "performBeaconRequest", file: CAUSE_FILE_NAME, line: 30 }] + stack: [{ fn: "performBeaconRequest", file: CAUSE_FILE_NAME, line: 32 }] }, ]; diff --git a/devtools/client/netmonitor/test/browser_net_charts-03.js b/devtools/client/netmonitor/test/browser_net_charts-03.js index c72d04bc4efc..457ec96eb1c9 100644 --- a/devtools/client/netmonitor/test/browser_net_charts-03.js +++ b/devtools/client/netmonitor/test/browser_net_charts-03.js @@ -67,7 +67,6 @@ add_task(function* () { is(rows[0].querySelectorAll("span")[1].textContent, "label2header", "The second column of the header displays the correct text."); - ok(rows[1].querySelector(".table-chart-row-box.chart-colored-blob"), "A colored blob exists for the firt row."); is(rows[1].querySelectorAll("span")[0].getAttribute("name"), "label1", diff --git a/devtools/client/netmonitor/test/browser_net_clear.js b/devtools/client/netmonitor/test/browser_net_clear.js index 15a38005928b..6bffb04d0200 100644 --- a/devtools/client/netmonitor/test/browser_net_clear.js +++ b/devtools/client/netmonitor/test/browser_net_clear.js @@ -14,7 +14,6 @@ add_task(function* () { let { document, gStore, windowRequire } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let { EVENTS } = windowRequire("devtools/client/netmonitor/constants"); - let detailsPane = document.querySelector("#details-pane"); let detailsPanelToggleButton = document.querySelector(".network-details-panel-toggle"); let clearButton = document.querySelector(".requests-list-clear-button"); diff --git a/devtools/client/netmonitor/test/browser_net_content-type.js b/devtools/client/netmonitor/test/browser_net_content-type.js index f4b258ffe76f..eb60eddb07d9 100644 --- a/devtools/client/netmonitor/test/browser_net_content-type.js +++ b/devtools/client/netmonitor/test/browser_net_content-type.js @@ -41,8 +41,9 @@ add_task(function* () { fullMimeType: "text/xml; charset=utf-8", size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 42), time: true - }); - verifyRequestItemTarget( + } + ); + verifyRequestItemTarget( document, getDisplayedRequests(gStore.getState()), getSortedRequests(gStore.getState()).get(1), @@ -55,8 +56,9 @@ add_task(function* () { fullMimeType: "text/css; charset=utf-8", size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 34), time: true - }); - verifyRequestItemTarget( + } + ); + verifyRequestItemTarget( document, getDisplayedRequests(gStore.getState()), getSortedRequests(gStore.getState()).get(2), @@ -69,8 +71,9 @@ add_task(function* () { fullMimeType: "application/javascript; charset=utf-8", size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 34), time: true - }); - verifyRequestItemTarget( + } + ); + verifyRequestItemTarget( document, getDisplayedRequests(gStore.getState()), getSortedRequests(gStore.getState()).get(3), @@ -83,26 +86,30 @@ add_task(function* () { fullMimeType: "application/json; charset=utf-8", size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 29), time: true - }); - verifyRequestItemTarget( + } + ); + verifyRequestItemTarget( document, getDisplayedRequests(gStore.getState()), getSortedRequests(gStore.getState()).get(4), "GET", - CONTENT_TYPE_SJS + "?fmt=bogus", { + CONTENT_TYPE_SJS + "?fmt=bogus", + { status: 404, statusText: "Not Found", type: "html", fullMimeType: "text/html; charset=utf-8", size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 24), time: true - }); - verifyRequestItemTarget( + } + ); + verifyRequestItemTarget( document, getDisplayedRequests(gStore.getState()), getSortedRequests(gStore.getState()).get(5), "GET", - TEST_IMAGE, { + TEST_IMAGE, + { fuzzyUrl: true, status: 200, statusText: "OK", @@ -110,13 +117,15 @@ add_task(function* () { fullMimeType: "image/png", size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 580), time: true - }); - verifyRequestItemTarget( + } + ); + verifyRequestItemTarget( document, getDisplayedRequests(gStore.getState()), getSortedRequests(gStore.getState()).get(6), "GET", - CONTENT_TYPE_SJS + "?fmt=gzip", { + CONTENT_TYPE_SJS + "?fmt=gzip", + { status: 200, statusText: "OK", type: "plain", @@ -124,7 +133,8 @@ add_task(function* () { transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 73), size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 10.73), time: true - }); + } + ); yield selectIndexAndWaitForEditor(0); yield testResponseTab("xml"); diff --git a/devtools/client/netmonitor/test/browser_net_copy_as_curl.js b/devtools/client/netmonitor/test/browser_net_copy_as_curl.js index 1267d7e2f3f5..caf04ad0479a 100644 --- a/devtools/client/netmonitor/test/browser_net_copy_as_curl.js +++ b/devtools/client/netmonitor/test/browser_net_copy_as_curl.js @@ -41,8 +41,7 @@ add_task(function* () { header("Cache-Control: no-cache") ]; - let { document, gStore, windowRequire } = monitor.panelWin; - let Actions = windowRequire("devtools/client/netmonitor/actions/index"); + let { document } = monitor.panelWin; let wait = waitForNetworkEvents(monitor, 1); yield ContentTask.spawn(tab.linkedBrowser, SIMPLE_SJS, function* (url) { diff --git a/devtools/client/netmonitor/test/browser_net_copy_image_as_data_uri.js b/devtools/client/netmonitor/test/browser_net_copy_image_as_data_uri.js index 6beb81aa3a1a..6ada7fdd21c6 100644 --- a/devtools/client/netmonitor/test/browser_net_copy_image_as_data_uri.js +++ b/devtools/client/netmonitor/test/browser_net_copy_image_as_data_uri.js @@ -11,7 +11,7 @@ add_task(function* () { let { tab, monitor } = yield initNetMonitor(CONTENT_TYPE_WITHOUT_CACHE_URL); info("Starting test... "); - let { document, gStore, windowRequire } = monitor.panelWin; + let { document } = monitor.panelWin; let wait = waitForNetworkEvents(monitor, CONTENT_TYPE_WITHOUT_CACHE_REQUESTS); yield ContentTask.spawn(tab.linkedBrowser, {}, function* () { @@ -29,7 +29,7 @@ add_task(function* () { // toolbox.doc monitor.toolbox.doc .querySelector("#request-list-context-copy-image-as-data-uri").click(); - }, TEST_IMAGE_DATA_URI); + }, TEST_IMAGE_DATA_URI); ok(true, "Clipboard contains the currently selected image as data uri."); diff --git a/devtools/client/netmonitor/test/browser_net_curl-utils.js b/devtools/client/netmonitor/test/browser_net_curl-utils.js index a21df0a9e7cf..a34f28a3e149 100644 --- a/devtools/client/netmonitor/test/browser_net_curl-utils.js +++ b/devtools/client/netmonitor/test/browser_net_curl-utils.js @@ -13,7 +13,7 @@ add_task(function* () { let { tab, monitor } = yield initNetMonitor(CURL_UTILS_URL); info("Starting test... "); - let { document, gStore, windowRequire, gNetwork } = monitor.panelWin; + let { gStore, windowRequire, gNetwork } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let { getSortedRequests } = windowRequire("devtools/client/netmonitor/selectors/index"); diff --git a/devtools/client/netmonitor/test/browser_net_cyrillic-02.js b/devtools/client/netmonitor/test/browser_net_cyrillic-02.js index 58094c8a631d..42ecdb1319e5 100644 --- a/devtools/client/netmonitor/test/browser_net_cyrillic-02.js +++ b/devtools/client/netmonitor/test/browser_net_cyrillic-02.js @@ -13,7 +13,6 @@ add_task(function* () { info("Starting test... "); let { document, gStore, windowRequire } = monitor.panelWin; - let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let { getDisplayedRequests, getSortedRequests, diff --git a/devtools/client/netmonitor/test/browser_net_filter-04.js b/devtools/client/netmonitor/test/browser_net_filter-04.js index 418a50dd66c2..b2327c36d535 100644 --- a/devtools/client/netmonitor/test/browser_net_filter-04.js +++ b/devtools/client/netmonitor/test/browser_net_filter-04.js @@ -30,7 +30,8 @@ const REQUESTS_WITH_MEDIA_AND_FLASH_AND_WS = REQUESTS_WITH_MEDIA_AND_FLASH.conca ]); add_task(function* () { - Services.prefs.setCharPref("devtools.netmonitor.filters", '["bogus", "js", "alsobogus"]'); + Services.prefs.setCharPref("devtools.netmonitor.filters", + '["bogus", "js", "alsobogus"]'); let { monitor } = yield initNetMonitor(FILTERING_URL); info("Starting test... "); diff --git a/devtools/client/netmonitor/test/browser_net_footer-summary.js b/devtools/client/netmonitor/test/browser_net_footer-summary.js index 852c2f0a3392..65bd2d9cf38b 100644 --- a/devtools/client/netmonitor/test/browser_net_footer-summary.js +++ b/devtools/client/netmonitor/test/browser_net_footer-summary.js @@ -49,8 +49,9 @@ add_task(function* () { yield teardown(monitor); function testStatus() { - let value = document.querySelector(".requests-list-network-summary-button").textContent; - info("Current summary: " + value); + let value = document.querySelector(".requests-list-network-summary-button") + .textContent; + info("Current summary: " + value); let state = gStore.getState(); let totalRequestsCount = state.requests.requests.size; diff --git a/devtools/client/netmonitor/test/browser_net_frame.js b/devtools/client/netmonitor/test/browser_net_frame.js index c022a18a51cd..e45e5502cd17 100644 --- a/devtools/client/netmonitor/test/browser_net_frame.js +++ b/devtools/client/netmonitor/test/browser_net_frame.js @@ -39,14 +39,14 @@ const EXPECTED_REQUESTS_TOP = [ url: EXAMPLE_URL + "xhr_request", causeType: "xhr", causeUri: TOP_URL, - stack: [{ fn: "performXhrRequest", file: TOP_FILE_NAME, line: 23 }] + stack: [{ fn: "performXhrRequest", file: TOP_FILE_NAME, line: 25 }] }, { method: "GET", url: EXAMPLE_URL + "fetch_request", causeType: "fetch", causeUri: TOP_URL, - stack: [{ fn: "performFetchRequest", file: TOP_FILE_NAME, line: 27 }] + stack: [{ fn: "performFetchRequest", file: TOP_FILE_NAME, line: 29 }] }, { method: "GET", @@ -54,8 +54,8 @@ const EXPECTED_REQUESTS_TOP = [ causeType: "fetch", causeUri: TOP_URL, stack: [ - { fn: "performPromiseFetchRequest", file: TOP_FILE_NAME, line: 39 }, - { fn: null, file: TOP_FILE_NAME, line: 38, asyncCause: "promise callback" }, + { fn: "performPromiseFetchRequest", file: TOP_FILE_NAME, line: 41 }, + { fn: null, file: TOP_FILE_NAME, line: 40, asyncCause: "promise callback" }, ] }, { @@ -64,8 +64,8 @@ const EXPECTED_REQUESTS_TOP = [ causeType: "fetch", causeUri: TOP_URL, stack: [ - { fn: "performTimeoutFetchRequest", file: TOP_FILE_NAME, line: 41 }, - { fn: "performPromiseFetchRequest", file: TOP_FILE_NAME, line: 40, + { fn: "performTimeoutFetchRequest", file: TOP_FILE_NAME, line: 43 }, + { fn: "performPromiseFetchRequest", file: TOP_FILE_NAME, line: 42, asyncCause: "setTimeout handler" }, ] }, @@ -74,7 +74,7 @@ const EXPECTED_REQUESTS_TOP = [ url: EXAMPLE_URL + "beacon_request", causeType: "beacon", causeUri: TOP_URL, - stack: [{ fn: "performBeaconRequest", file: TOP_FILE_NAME, line: 31 }] + stack: [{ fn: "performBeaconRequest", file: TOP_FILE_NAME, line: 33 }] }, ]; @@ -105,14 +105,14 @@ const EXPECTED_REQUESTS_SUB = [ url: EXAMPLE_URL + "xhr_request", causeType: "xhr", causeUri: SUB_URL, - stack: [{ fn: "performXhrRequest", file: SUB_FILE_NAME, line: 22 }] + stack: [{ fn: "performXhrRequest", file: SUB_FILE_NAME, line: 24 }] }, { method: "GET", url: EXAMPLE_URL + "fetch_request", causeType: "fetch", causeUri: SUB_URL, - stack: [{ fn: "performFetchRequest", file: SUB_FILE_NAME, line: 26 }] + stack: [{ fn: "performFetchRequest", file: SUB_FILE_NAME, line: 28 }] }, { method: "GET", @@ -120,8 +120,8 @@ const EXPECTED_REQUESTS_SUB = [ causeType: "fetch", causeUri: SUB_URL, stack: [ - { fn: "performPromiseFetchRequest", file: SUB_FILE_NAME, line: 38 }, - { fn: null, file: SUB_FILE_NAME, line: 37, asyncCause: "promise callback" }, + { fn: "performPromiseFetchRequest", file: SUB_FILE_NAME, line: 40 }, + { fn: null, file: SUB_FILE_NAME, line: 39, asyncCause: "promise callback" }, ] }, { @@ -130,8 +130,8 @@ const EXPECTED_REQUESTS_SUB = [ causeType: "fetch", causeUri: SUB_URL, stack: [ - { fn: "performTimeoutFetchRequest", file: SUB_FILE_NAME, line: 40 }, - { fn: "performPromiseFetchRequest", file: SUB_FILE_NAME, line: 39, + { fn: "performTimeoutFetchRequest", file: SUB_FILE_NAME, line: 42 }, + { fn: "performPromiseFetchRequest", file: SUB_FILE_NAME, line: 41, asyncCause: "setTimeout handler" }, ] }, @@ -140,7 +140,7 @@ const EXPECTED_REQUESTS_SUB = [ url: EXAMPLE_URL + "beacon_request", causeType: "beacon", causeUri: SUB_URL, - stack: [{ fn: "performBeaconRequest", file: SUB_FILE_NAME, line: 30 }] + stack: [{ fn: "performBeaconRequest", file: SUB_FILE_NAME, line: 32 }] }, ]; diff --git a/devtools/client/netmonitor/test/browser_net_header-docs.js b/devtools/client/netmonitor/test/browser_net_header-docs.js index 57a4f155b40b..475ac063488e 100644 --- a/devtools/client/netmonitor/test/browser_net_header-docs.js +++ b/devtools/client/netmonitor/test/browser_net_header-docs.js @@ -16,7 +16,6 @@ add_task(function* () { let { document, gStore, windowRequire } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let { - getDisplayedRequests, getSortedRequests, } = windowRequire("devtools/client/netmonitor/selectors/index"); @@ -40,17 +39,19 @@ add_task(function* () { * and only if a header is documented in MDN. */ function testShowLearnMore(data) { - document.querySelectorAll(".properties-view .treeRow.stringRow").forEach((rowEl, index) => { - let headerName = rowEl.querySelectorAll(".treeLabelCell .treeLabel")[0].textContent; + let selector = ".properties-view .treeRow.stringRow"; + document.querySelectorAll(selector).forEach((rowEl, index) => { + let headerName = rowEl.querySelectorAll(".treeLabelCell .treeLabel")[0] + .textContent; let headerDocURL = getHeadersURL(headerName); let learnMoreEl = rowEl.querySelectorAll(".treeValueCell .learn-more-link"); if (headerDocURL === null) { ok(learnMoreEl.length === 0, - "undocumented header does not include a \"Learn More\" button"); + "undocumented header does not include a \"Learn More\" button"); } else { ok(learnMoreEl[0].getAttribute("title") === headerDocURL, - "documented header includes a \"Learn More\" button with a link to MDN"); + "documented header includes a \"Learn More\" button with a link to MDN"); } }); } diff --git a/devtools/client/netmonitor/test/browser_net_icon-preview.js b/devtools/client/netmonitor/test/browser_net_icon-preview.js index ac872f2f63ab..c3f91bcd90e0 100644 --- a/devtools/client/netmonitor/test/browser_net_icon-preview.js +++ b/devtools/client/netmonitor/test/browser_net_icon-preview.js @@ -64,7 +64,8 @@ add_task(function* () { function checkImageThumbnail() { is(document.querySelectorAll(".requests-list-icon[data-type=thumbnail]").length, 1, "There should be only one image request with a thumbnail displayed."); - is(document.querySelector(".requests-list-icon[data-type=thumbnail]").src, TEST_IMAGE_DATA_URI, + is(document.querySelector(".requests-list-icon[data-type=thumbnail]").src, + TEST_IMAGE_DATA_URI, "The image requests-list-icon thumbnail is displayed correctly."); is(document.querySelector(".requests-list-icon[data-type=thumbnail]").hidden, false, "The image requests-list-icon thumbnail should not be hidden."); diff --git a/devtools/client/netmonitor/test/browser_net_image-tooltip.js b/devtools/client/netmonitor/test/browser_net_image-tooltip.js index 43c031e37bd1..0db076392b43 100644 --- a/devtools/client/netmonitor/test/browser_net_image-tooltip.js +++ b/devtools/client/netmonitor/test/browser_net_image-tooltip.js @@ -16,10 +16,6 @@ add_task(function* 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 { - getDisplayedRequests, - getSortedRequests, - } = windowRequire("devtools/client/netmonitor/selectors/index"); let toolboxDoc = monitor.toolbox.doc; gStore.dispatch(Actions.batchEnable(false)); @@ -31,14 +27,12 @@ add_task(function* test() { yield onThumbnail; info("Checking the image thumbnail after a few requests were made..."); - yield showTooltipAndVerify(toolboxDoc, - document.querySelectorAll(".request-list-item")[0]); + yield showTooltipAndVerify(document.querySelectorAll(".request-list-item")[0]); // Hide tooltip before next test, to avoid the situation that tooltip covers // the icon for the request of the next test. info("Checking the image thumbnail gets hidden..."); - yield hideTooltipAndVerify(monitor.toolbox.doc, - document.querySelectorAll(".request-list-item")[0]); + yield hideTooltipAndVerify(document.querySelectorAll(".request-list-item")[0]); // +1 extra document reload onEvents = waitForNetworkEvents(monitor, IMAGE_TOOLTIP_REQUESTS + 1); @@ -51,12 +45,12 @@ add_task(function* test() { yield onThumbnail; info("Checking the image thumbnail after a reload."); - yield showTooltipAndVerify(toolboxDoc, - document.querySelectorAll(".request-list-item")[1]); + yield showTooltipAndVerify(document.querySelectorAll(".request-list-item")[1]); info("Checking if the image thumbnail is hidden when mouse leaves the menu widget"); let requestsListContents = document.querySelector(".requests-list-contents"); - EventUtils.synthesizeMouse(requestsListContents, 0, 0, { type: "mouseout" }, monitor.panelWin); + EventUtils.synthesizeMouse(requestsListContents, 0, 0, { type: "mouseout" }, + monitor.panelWin); yield waitUntil(() => !toolboxDoc.querySelector(".tooltip-container.tooltip-visible")); yield teardown(monitor); @@ -71,9 +65,9 @@ add_task(function* test() { * Show a tooltip on the {target} and verify that it was displayed * with the expected content. */ - function* showTooltipAndVerify(toolboxDoc, target) { + function* showTooltipAndVerify(target) { let anchor = target.querySelector(".requests-list-file"); - yield showTooltipOn(toolboxDoc, anchor); + yield showTooltipOn(anchor); info("Tooltip was successfully opened for the image request."); is(toolboxDoc.querySelector(".tooltip-panel img").src, TEST_IMAGE_DATA_URI, @@ -84,7 +78,7 @@ add_task(function* test() { * Trigger a tooltip over an element by sending mousemove event. * @return a promise that resolves when the tooltip is shown */ - function* showTooltipOn(toolboxDoc, element) { + function* showTooltipOn(element) { let win = element.ownerDocument.defaultView; EventUtils.synthesizeMouseAtCenter(element, { type: "mousemove" }, win); yield waitUntil(() => toolboxDoc.querySelector(".tooltip-panel img")); @@ -93,13 +87,14 @@ add_task(function* test() { /** * Hide a tooltip on the {target} and verify that it was closed. */ - function* hideTooltipAndVerify(toolboxDoc, target) { + function* hideTooltipAndVerify(target) { // Hovering over the "method" column hides the tooltip. let anchor = target.querySelector(".requests-list-method"); let win = anchor.ownerDocument.defaultView; EventUtils.synthesizeMouseAtCenter(anchor, { type: "mousemove" }, win); - yield waitUntil(() => !toolboxDoc.querySelector(".tooltip-container.tooltip-visible")); + yield waitUntil( + () => !toolboxDoc.querySelector(".tooltip-container.tooltip-visible")); info("Tooltip was successfully closed."); } }); diff --git a/devtools/client/netmonitor/test/browser_net_json-null.js b/devtools/client/netmonitor/test/browser_net_json-null.js index 82b87d3a2477..877881e0ca2b 100644 --- a/devtools/client/netmonitor/test/browser_net_json-null.js +++ b/devtools/client/netmonitor/test/browser_net_json-null.js @@ -15,10 +15,6 @@ add_task(function* () { let { document, gStore, windowRequire } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); - let { - getDisplayedRequests, - getSortedRequests, - } = windowRequire("devtools/client/netmonitor/selectors/index"); gStore.dispatch(Actions.batchEnable(false)); diff --git a/devtools/client/netmonitor/test/browser_net_open_request_in_tab.js b/devtools/client/netmonitor/test/browser_net_open_request_in_tab.js index 842efb7df23a..4c60887d0d3c 100644 --- a/devtools/client/netmonitor/test/browser_net_open_request_in_tab.js +++ b/devtools/client/netmonitor/test/browser_net_open_request_in_tab.js @@ -13,10 +13,6 @@ add_task(function* () { let { document, gStore, windowRequire } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); - let { - getDisplayedRequests, - getSortedRequests, - } = windowRequire("devtools/client/netmonitor/selectors/index"); gStore.dispatch(Actions.batchEnable(false)); diff --git a/devtools/client/netmonitor/test/browser_net_persistent_logs.js b/devtools/client/netmonitor/test/browser_net_persistent_logs.js index 64bc202370cc..789b4e9a7450 100644 --- a/devtools/client/netmonitor/test/browser_net_persistent_logs.js +++ b/devtools/client/netmonitor/test/browser_net_persistent_logs.js @@ -12,7 +12,7 @@ add_task(function* () { let { tab, monitor } = yield initNetMonitor(SINGLE_GET_URL); info("Starting test... "); - let { document, windowRequire } = monitor.panelWin; + let { document } = monitor.panelWin; Services.prefs.setBoolPref("devtools.webconsole.persistlog", false); diff --git a/devtools/client/netmonitor/test/browser_net_post-data-01.js b/devtools/client/netmonitor/test/browser_net_post-data-01.js index bb26d3ec7399..277a929b168f 100644 --- a/devtools/client/netmonitor/test/browser_net_post-data-01.js +++ b/devtools/client/netmonitor/test/browser_net_post-data-01.js @@ -44,8 +44,9 @@ add_task(function* () { fullMimeType: "text/plain; charset=utf-8", size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 12), time: true - }); - verifyRequestItemTarget( + } + ); + verifyRequestItemTarget( document, getDisplayedRequests(gStore.getState()), getSortedRequests(gStore.getState()).get(1), @@ -58,7 +59,8 @@ add_task(function* () { fullMimeType: "text/plain; charset=utf-8", size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 12), time: true - }); + } + ); // Wait for all tree sections updated by react wait = waitForDOM(document, "#params-panel .tree-section", 2); @@ -107,15 +109,18 @@ add_task(function* () { L10N.getStr(type == "urlencoded" ? "paramsFormData" : "paramsPostPayload"), "The post section doesn't have the correct title."); - let labels = tabpanel.querySelectorAll("tr:not(.tree-section) .treeLabelCell .treeLabel"); - let values = tabpanel.querySelectorAll("tr:not(.tree-section) .treeValueCell .objectBox"); + let labels = tabpanel + .querySelectorAll("tr:not(.tree-section) .treeLabelCell .treeLabel"); + let values = tabpanel + .querySelectorAll("tr:not(.tree-section) .treeValueCell .objectBox"); is(labels[0].textContent, "foo", "The first query param name was incorrect."); is(values[0].textContent, "\"bar\"", "The first query param value was incorrect."); is(labels[1].textContent, "baz", "The second query param name was incorrect."); is(values[1].textContent, "\"42\"", "The second query param value was incorrect."); is(labels[2].textContent, "type", "The third query param name was incorrect."); - is(values[2].textContent, "\"" + type + "\"", "The third query param value was incorrect."); + is(values[2].textContent, "\"" + type + "\"", + "The third query param value was incorrect."); if (type == "urlencoded") { checkVisibility("params"); @@ -129,7 +134,8 @@ add_task(function* () { is(labels.length, 3, "There should be 3 param values displayed in this tabpanel."); - let text = editorFrames[0].contentDocument.querySelector(".CodeMirror-code").textContent; + let text = editorFrames[0].contentDocument.querySelector(".CodeMirror-code") + .textContent; ok(text.includes("Content-Disposition: form-data; name=\"text\""), "The text shown in the source editor is incorrect (1.1)."); diff --git a/devtools/client/netmonitor/test/browser_net_post-data-02.js b/devtools/client/netmonitor/test/browser_net_post-data-02.js index 3382deaec316..503fd096305d 100644 --- a/devtools/client/netmonitor/test/browser_net_post-data-02.js +++ b/devtools/client/netmonitor/test/browser_net_post-data-02.js @@ -16,10 +16,6 @@ add_task(function* () { let { document, gStore, windowRequire } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); - let { - getDisplayedRequests, - getSortedRequests, - } = windowRequire("devtools/client/netmonitor/selectors/index"); gStore.dispatch(Actions.batchEnable(false)); diff --git a/devtools/client/netmonitor/test/browser_net_prefs-reload.js b/devtools/client/netmonitor/test/browser_net_prefs-reload.js index fb27d49d776b..4a92350065d1 100644 --- a/devtools/client/netmonitor/test/browser_net_prefs-reload.js +++ b/devtools/client/netmonitor/test/browser_net_prefs-reload.js @@ -11,7 +11,8 @@ add_task(function* () { let { monitor } = yield initNetMonitor(SIMPLE_URL); let { getRequestFilterTypes } = monitor.panelWin .windowRequire("devtools/client/netmonitor/selectors/index"); - let Actions = monitor.panelWin.windowRequire("devtools/client/netmonitor/actions/index"); + let Actions = monitor.panelWin + .windowRequire("devtools/client/netmonitor/actions/index"); info("Starting test... "); // This test reopens the network monitor a bunch of times, for different @@ -22,7 +23,8 @@ add_task(function* () { // 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; + let getPrefs = () => monitor.panelWin + .windowRequire("devtools/client/netmonitor/utils/prefs").Prefs; let getStore = () => monitor.panelWin.gStore; let getState = () => getStore().getState(); @@ -44,15 +46,19 @@ add_task(function* () { newValue: ~~(Math.random() * 200 + 100), validateValue: () => getDoc().querySelector(".monitor-panel .split-box .controlled").clientWidth, - modifyFrontend: (value) => - getDoc().querySelector(".monitor-panel .split-box .controlled").style.width = `${value}px`, + modifyFrontend: function (value) { + getDoc().querySelector(".monitor-panel .split-box .controlled") + .style.width = `${value}px`; + } }, networkDetailsHeight: { newValue: ~~(Math.random() * 300 + 100), validateValue: () => getDoc().querySelector(".monitor-panel .split-box .controlled").clientHeight, - modifyFrontend: (value) => - getDoc().querySelector(".monitor-panel .split-box .controlled").style.height = `${value}px` + modifyFrontend: function (value) { + getDoc().querySelector(".monitor-panel .split-box .controlled") + .style.height = `${value}px`; + } } /* add more prefs here... */ }; @@ -80,7 +86,7 @@ add_task(function* () { for (let name in prefsToCheck) { if ((isVerticalSplitter && name === "networkDetailsHeight") || (!isVerticalSplitter && name === "networkDetailsWidth")) { - continue + continue; } let currentValue = getPrefs()[name]; @@ -100,7 +106,7 @@ add_task(function* () { for (let name in prefsToCheck) { if ((isVerticalSplitter && name === "networkDetailsHeight") || (!isVerticalSplitter && name === "networkDetailsWidth")) { - continue + continue; } let currentValue = getPrefs()[name]; @@ -127,7 +133,7 @@ add_task(function* () { for (let name in prefsToCheck) { if ((isVerticalSplitter && name === "networkDetailsHeight") || (!isVerticalSplitter && name === "networkDetailsWidth")) { - continue + continue; } let currentValue = getPrefs()[name]; @@ -150,7 +156,7 @@ add_task(function* () { for (let name in prefsToCheck) { if ((isVerticalSplitter && name === "networkDetailsHeight") || (!isVerticalSplitter && name === "networkDetailsWidth")) { - continue + continue; } let currentValue = getPrefs()[name]; diff --git a/devtools/client/netmonitor/test/browser_net_reload-markers.js b/devtools/client/netmonitor/test/browser_net_reload-markers.js index 1a7953b9cb01..792b02ea2eeb 100644 --- a/devtools/client/netmonitor/test/browser_net_reload-markers.js +++ b/devtools/client/netmonitor/test/browser_net_reload-markers.js @@ -11,7 +11,7 @@ add_task(function* () { let { monitor } = yield initNetMonitor(SIMPLE_URL); info("Starting test... "); - let { document, windowRequire } = monitor.panelWin; + let { document } = monitor.panelWin; let button = document.querySelector(".requests-list-reload-notice-button"); button.click(); diff --git a/devtools/client/netmonitor/test/browser_net_resend.js b/devtools/client/netmonitor/test/browser_net_resend.js index e52c3c9adbf7..6e08dec9be64 100644 --- a/devtools/client/netmonitor/test/browser_net_resend.js +++ b/devtools/client/netmonitor/test/browser_net_resend.js @@ -74,7 +74,7 @@ add_task(function* () { /* * Test that the New Request form was populated correctly */ - function testCustomForm(data) { + function* testCustomForm(data) { yield waitUntil(() => document.querySelector(".custom-request-panel")); is(document.getElementById("custom-method-value").value, data.method, "new request form showing correct method"); diff --git a/devtools/client/netmonitor/test/browser_net_resend_cors.js b/devtools/client/netmonitor/test/browser_net_resend_cors.js index b4f1ab317bab..cab3854cda20 100644 --- a/devtools/client/netmonitor/test/browser_net_resend_cors.js +++ b/devtools/client/netmonitor/test/browser_net_resend_cors.js @@ -12,10 +12,9 @@ add_task(function* () { let { tab, monitor } = yield initNetMonitor(CORS_URL); info("Starting test... "); - let { document, gStore, windowRequire } = monitor.panelWin; + let { gStore, windowRequire } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let { - getDisplayedRequests, getSortedRequests, } = windowRequire("devtools/client/netmonitor/selectors/index"); @@ -44,7 +43,7 @@ add_task(function* () { let onRequests = waitForNetworkEvents(monitor, 1, 0); ITEMS.forEach((item) => { info(`Selecting the ${item.method} request`); - gStore.dispatch(Actions.selectRequest(item.id)) + gStore.dispatch(Actions.selectRequest(item.id)); info("Cloning the selected request into a custom clone"); gStore.dispatch(Actions.cloneSelectedRequest()); diff --git a/devtools/client/netmonitor/test/browser_net_resend_headers.js b/devtools/client/netmonitor/test/browser_net_resend_headers.js index d118cfc3e81e..011136ef20d7 100644 --- a/devtools/client/netmonitor/test/browser_net_resend_headers.js +++ b/devtools/client/netmonitor/test/browser_net_resend_headers.js @@ -11,10 +11,9 @@ add_task(function* () { let { monitor } = yield initNetMonitor(SIMPLE_SJS); info("Starting test... "); - let { document, gStore, windowRequire, NetMonitorController } = monitor.panelWin; + let { gStore, windowRequire, NetMonitorController } = monitor.panelWin; let Actions = windowRequire("devtools/client/netmonitor/actions/index"); let { - getDisplayedRequests, getSortedRequests, } = windowRequire("devtools/client/netmonitor/selectors/index"); diff --git a/devtools/client/netmonitor/test/browser_net_security-details.js b/devtools/client/netmonitor/test/browser_net_security-details.js index 5d174d42d5c3..ef324d723bc3 100644 --- a/devtools/client/netmonitor/test/browser_net_security-details.js +++ b/devtools/client/netmonitor/test/browser_net_security-details.js @@ -46,8 +46,8 @@ add_task(function* () { // Host is(tabpanel.querySelectorAll(".treeLabel.objectLabel")[1].textContent, - "Host example.com:", - "Label has the expected value."); + "Host example.com:", + "Label has the expected value."); is(textboxes[2].value, "Disabled", "Label has the expected value."); is(textboxes[3].value, "Disabled", "Label has the expected value."); @@ -56,7 +56,8 @@ add_task(function* () { is(textboxes[5].value, "API calls request test