Bug 1352035 - Removed the dependency on the test case preview-panel settings. r=Honza
authorLocke Chen <locke12456@gmail.com>
Fri, 31 Mar 2017 19:21:55 +0800
changeset 555300 9cb3f1aee96782a74e4fe8119da8930eda19142a
parent 555299 d5c4cf3eeb84a8a2351e64ddfc7ee35d3b91cdfd
child 555301 ce87577c5da8e0983c2e2d53352439439b984de0
push id52211
push userbmo:jaws@mozilla.com
push dateTue, 04 Apr 2017 01:40:08 +0000
reviewersHonza
bugs1352035
milestone55.0a1
Bug 1352035 - Removed the dependency on the test case preview-panel settings. r=Honza MozReview-Commit-ID: yiNyfPYnFD
devtools/client/netmonitor/test/browser.ini
devtools/client/netmonitor/test/head.js
devtools/client/netmonitor/test/html_content-type-test-page.html
--- a/devtools/client/netmonitor/test/browser.ini
+++ b/devtools/client/netmonitor/test/browser.ini
@@ -1,16 +1,15 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
   dropmarker.svg
   head.js
   html_cause-test-page.html
-  html_content-type-test-page.html
   html_content-type-without-cache-test-page.html
   html_brotli-test-page.html
   html_image-tooltip-test-page.html
   html_cors-test-page.html
   html_custom-get-page.html
   html_cyrillic-test-page.html
   html_frame-test-page.html
   html_frame-subdocument.html
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -23,17 +23,16 @@ const {
 
 /* 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";
-const CONTENT_TYPE_URL = EXAMPLE_URL + "html_content-type-test-page.html";
 const CONTENT_TYPE_WITHOUT_CACHE_URL = EXAMPLE_URL + "html_content-type-without-cache-test-page.html";
 const CONTENT_TYPE_WITHOUT_CACHE_REQUESTS = 8;
 const CYRILLIC_URL = EXAMPLE_URL + "html_cyrillic-test-page.html";
 const STATUS_CODES_URL = EXAMPLE_URL + "html_status-codes-test-page.html";
 const POST_DATA_URL = EXAMPLE_URL + "html_post-data-test-page.html";
 const POST_JSON_URL = EXAMPLE_URL + "html_post-json-test-page.html";
 const POST_RAW_URL = EXAMPLE_URL + "html_post-raw-test-page.html";
 const POST_RAW_WITH_HEADERS_URL = EXAMPLE_URL + "html_post-raw-with-headers-test-page.html";
deleted file mode 100644
--- a/devtools/client/netmonitor/test/html_content-type-test-page.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/ -->
-<!doctype html>
-
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>Network Monitor test page</title>
-  </head>
-
-  <body>
-    <p>Content type test</p>
-
-    <script type="text/javascript">
-      /* exported performRequests */
-      "use strict";
-
-      function get(address, callback) {
-        let xhr = new XMLHttpRequest();
-        xhr.open("GET", address, true);
-
-        xhr.onreadystatechange = function () {
-          if (this.readyState == this.DONE) {
-            callback();
-          }
-        };
-        xhr.send(null);
-      }
-
-      function performRequests() {
-        /* eslint-disable max-nested-callbacks */
-        get("sjs_content-type-test-server.sjs?fmt=xml", function () {
-          get("sjs_content-type-test-server.sjs?fmt=css", function () {
-            get("sjs_content-type-test-server.sjs?fmt=js", function () {
-              get("sjs_content-type-test-server.sjs?fmt=json", function () {
-                get("sjs_content-type-test-server.sjs?fmt=bogus", function () {
-                  get("test-image.png", function () {
-                    // Done.
-                  });
-                });
-              });
-            });
-          });
-        });
-        /* eslint-enable max-nested-callbacks */
-      }
-    </script>
-  </body>
-
-</html>