Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 09:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1557083 - Emit actions from netmonitor store after requests are blocked/unblocked r=Honza

Browse Source 
Depends on D45498
This makes the test run fine on top of the changes for the session history rewrite.

Differential Revision: https://phabricator.services.mozilla.com/D45499

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Julian Descottes 2019-09-13 13:38:03 +00:00
parent fa1aa153b3
commit 1dc087a788
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devtools/client/netmonitor/src/actions/requests.js
View File

@ -6,6 +6,7 @@
const {
ADD_REQUEST,
BLOCK_SELECTED_REQUEST_DONE,
CLEAR_REQUESTS,
CLONE_REQUEST,
CLONE_SELECTED_REQUEST,
@ -13,6 +14,7 @@ const {
RIGHT_CLICK_REQUEST,
SEND_CUSTOM_REQUEST,
TOGGLE_RECORDING,
UNBLOCK_SELECTED_REQUEST_DONE,
UPDATE_REQUEST,
} = require("../constants");
const { getSelectedRequest, getRequestById } = require("../selectors/index");
@ -109,13 +111,16 @@ function sendCustomRequest(connector, requestId = null) {
* Tell the backend to block future requests that match the URL of the selected one.
*/
function blockSelectedRequestURL(connector, clickedRequest) {
return () => {
return async dispatch => {
if (!clickedRequest) {
return;
}
const { url } = clickedRequest;
connector.blockRequest({ url });
await connector.blockRequest({ url });
dispatch({
type: BLOCK_SELECTED_REQUEST_DONE,
});
};
}
@ -123,13 +128,16 @@ function blockSelectedRequestURL(connector, clickedRequest) {
* Tell the backend to unblock future requests that match the URL of the selected one.
*/
function unblockSelectedRequestURL(connector, clickedRequest) {
return () => {
return async dispatch => {
if (!clickedRequest) {
return;
}
const { url } = clickedRequest;
connector.unblockRequest({ url });
await connector.unblockRequest({ url });
dispatch({
type: UNBLOCK_SELECTED_REQUEST_DONE,
});
};
}

2
devtools/client/netmonitor/src/constants.js
View File

@ -10,6 +10,7 @@ const actionTypes = {
BATCH_ACTIONS: "BATCH_ACTIONS",
BATCH_ENABLE: "BATCH_ENABLE",
BATCH_FLUSH: "BATCH_FLUSH",
BLOCK_SELECTED_REQUEST_DONE: "BLOCK_SELECTED_REQUEST_DONE",
CLEAR_REQUESTS: "CLEAR_REQUESTS",
CLEAR_TIMING_MARKERS: "CLEAR_TIMING_MARKERS",
CLONE_REQUEST: "CLONE_REQUEST",
@ -31,6 +32,7 @@ const actionTypes = {
TOGGLE_COLUMN: "TOGGLE_COLUMN",
TOGGLE_RECORDING: "TOGGLE_RECORDING",
TOGGLE_REQUEST_FILTER_TYPE: "TOGGLE_REQUEST_FILTER_TYPE",
UNBLOCK_SELECTED_REQUEST_DONE: "UNBLOCK_SELECTED_REQUEST_DONE",
UPDATE_REQUEST: "UPDATE_REQUEST",
WATERFALL_RESIZE: "WATERFALL_RESIZE",
SET_COLUMNS_WIDTH: "SET_COLUMNS_WIDTH",

17
devtools/client/netmonitor/test/browser_net_block.js
View File

@ -43,8 +43,14 @@ add_task(async function() {
monitor,
"request-list-context-block-url"
);
const onRequestBlocked = waitForDispatch(
store,
"BLOCK_SELECTED_REQUEST_DONE"
);
contextBlock.click();
info("Set request to blocked");
info("Wait for selected request to be blocked");
await onRequestBlocked;
info("Selected request is now blocked");
}
// Reload to have one request in the list
@ -72,8 +78,15 @@ add_task(async function() {
monitor,
"request-list-context-unblock-url"
);
const onRequestUnblocked = waitForDispatch(
store,
"UNBLOCK_SELECTED_REQUEST_DONE"
);
contextUnblock.click();
info("Set request to unblocked");
info("Wait for selected request to be unblocked");
await onRequestUnblocked;
info("Selected request is now unblocked");
}
// Reload to have one request in the list