From 75159e0ad3a6d2c2659186016db13ac6148ff824 Mon Sep 17 00:00:00 2001
From: Jan Odvarko <odvarko@gmail.com>
Date: Thu, 19 Oct 2017 14:53:23 +0200
Subject: [PATCH] Bug 1403927 - Test for HTTPi Params panel; r=nchevobbe

MozReview-Commit-ID: 1DzpCgxlrQg

--HG--
extra : rebase_source : de3a5e16f136d42bfc1197c64c12fc50608bb9b0
---
 ...wser_webconsole_network_messages_expand.js | 59 +++++++++++++------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js
index 14b84679dfc7..ee54efb1cae2 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js
@@ -3,16 +3,14 @@
 
 "use strict";
 
-const TEST_URI = "data:text/html;charset=utf8,Test that clicking on a network message " +
-                 "in the console toggles the HTTP inspection.";
-
 const TEST_FILE = "test-network-request.html";
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/";
+const TEST_URI = TEST_PATH + TEST_FILE;
 
 const NET_PREF = "devtools.webconsole.filter.net";
 const XHR_PREF = "devtools.webconsole.filter.netxhr";
 
-Services.prefs.setBoolPref(NET_PREF, true);
+Services.prefs.setBoolPref(NET_PREF, false);
 Services.prefs.setBoolPref(XHR_PREF, true);
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref(NET_PREF);
@@ -26,15 +24,21 @@ add_task(async function task() {
   let target = TargetFactory.forTab(currentTab);
   let toolbox = gDevTools.getToolbox(target);
 
-  const documentUrl = TEST_PATH + TEST_FILE;
-  await loadDocument(documentUrl);
-  info("Document loaded.");
+  // Fire an XHR POST request.
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function () {
+    content.wrappedJSObject.testXhrPost();
+  });
 
-  let messageNode = await waitFor(() => findMessage(hud, documentUrl));
+  info("XHR executed");
+
+  await waitForRequestUpdates(toolbox);
+
+  let xhrUrl = TEST_PATH + "test-data.json";
+  let messageNode = await waitFor(() => findMessage(hud, xhrUrl));
   let urlNode = messageNode.querySelector(".url");
   info("Network message found.");
 
-  let updates = waitForNetworkUpdates(toolbox);
+  let updates = waitForPayloadReady(toolbox);
 
   // Expand network log
   urlNode.click();
@@ -61,10 +65,21 @@ async function testNetworkMessage(messageNode) {
     "#headers-panel .headers-overview");
   ok(headersContent, "Headers content is available");
 
+  // Select Params tab and check the content. CodeMirror initialization
+  // is delayed to prevent UI freeze, so wait for a little while.
+  paramsTab.click();
+  let paramsPanel = messageNode.querySelector("#params-panel");
+  await waitForSourceEditor(paramsPanel);
+  let paramsContent = messageNode.querySelector(
+    "#params-panel .panel-container .CodeMirror");
+  ok(paramsContent, "Params content is available");
+  ok(paramsContent.textContent.includes("Hello world!"), "Post body is correct");
+
   // Select Response tab and check the content. CodeMirror initialization
-  // is delayed  to prevent UI freeze, so wait for a little while.
+  // is delayed, so again wait for a little while.
   responseTab.click();
-  await waitForSourceEditor(messageNode);
+  let responsePanel = messageNode.querySelector("#response-panel");
+  await waitForSourceEditor(responsePanel);
   let responseContent = messageNode.querySelector(
     "#response-panel .editor-row-container .CodeMirror");
   ok(responseContent, "Response content is available");
@@ -78,11 +93,8 @@ async function testNetworkMessage(messageNode) {
   ok(timingsContent.textContent, "Timings text is available");
 }
 
-async function waitForNetworkUpdates(toolbox) {
-  let panel = toolbox.getCurrentPanel();
-  let hud = panel.hud;
-  let ui = hud.ui;
-
+async function waitForPayloadReady(toolbox) {
+  let {ui} = toolbox.getCurrentPanel().hud;
   return new Promise(resolve => {
     ui.jsterm.hud.on("network-request-payload-ready", () => {
       info("network-request-payload-ready received");
@@ -91,9 +103,18 @@ async function waitForNetworkUpdates(toolbox) {
   });
 }
 
-async function waitForSourceEditor(messageNode) {
+async function waitForSourceEditor(panel) {
   return waitUntil(() => {
-    return !!messageNode.querySelector(
-      "#response-panel .editor-row-container .CodeMirror");
+    return !!panel.querySelector(".CodeMirror");
+  });
+}
+
+async function waitForRequestUpdates(toolbox) {
+  let {ui} = toolbox.getCurrentPanel().hud;
+  return new Promise(resolve => {
+    ui.jsterm.hud.on("network-message-updated", () => {
+      info("network-message-updated received");
+      resolve();
+    });
   });
 }