Bug 1356786 - Add waitUntil in browser_webconsole_shows_reqs_in_netmonitor.js r?ntim draft
authorRicky Chien <ricky060709@gmail.com>
Sat, 15 Apr 2017 19:38:00 +0800
changeset 563214 a12232497718dcb4792f2237c4953baf98129b94
parent 563120 9379831bb9c3d9abfea7dbf8dd06dbdab1d81dc4
child 624416 d57a5221789400d0f985a8b8a23e3ffe0e594fca
push id54234
push userbmo:rchien@mozilla.com
push dateSat, 15 Apr 2017 11:38:22 +0000
reviewersntim
bugs1356786
milestone55.0a1
Bug 1356786 - Add waitUntil in browser_webconsole_shows_reqs_in_netmonitor.js r?ntim MozReview-Commit-ID: 1cLwVeaortC
devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
--- a/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
+++ b/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
@@ -25,17 +25,17 @@ add_task(function* () {
   let target = TargetFactory.forTab(tab);
   let toolbox = yield gDevTools.showToolbox(target, "netmonitor");
   info("Network panel is open.");
 
   yield loadDocument(browser);
   info("Document loaded.");
 
   // Test that the request appears in the network panel.
-  testNetmonitor(toolbox);
+  yield testNetmonitor(toolbox);
 
   // Test that the request appears in the console.
   let hud = yield openConsole();
   info("Web console is open");
 
   yield waitForMessages({
     webconsole: hud,
     messages: [
@@ -55,23 +55,21 @@ function loadDocument(browser) {
   browser.addEventListener("load", function () {
     deferred.resolve();
   }, {capture: true, once: true});
   BrowserTestUtils.loadURI(gBrowser.selectedBrowser, TEST_PATH);
 
   return deferred.promise;
 }
 
-function testNetmonitor(toolbox) {
+function* testNetmonitor(toolbox) {
   let monitor = toolbox.getCurrentPanel();
-
   let { gStore, windowRequire } = monitor.panelWin;
-  let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
   let { getSortedRequests } = windowRequire("devtools/client/netmonitor/src/selectors/index");
 
-  gStore.dispatch(Actions.batchEnable(false));
+  yield waitUntil(() => gStore.getState().requests.requests.size > 0);
 
   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.");
 }