From 82d1aa220744d98cd36b5e1677d9f2d4302bb1bd Mon Sep 17 00:00:00 2001 From: Tom Schuster Date: Tue, 8 Jan 2019 12:28:32 +0000 Subject: [PATCH] Bug 1510223 - Test for MIME type warning. r=ckerschb,nchevobbe Turns out we also produced an error instead of a warnings. Good that we added those test \o/ Differential Revision: https://phabricator.services.mozilla.com/D15659 --HG-- extra : moz-landing-system : lando --- .../webconsole/test/mochitest/browser.ini | 4 ++++ ..._webconsole_non_javascript_mime_warning.js | 20 +++++++++++++++++++ .../mochitest/test-non-javascript-mime.html | 13 ++++++++++++ .../mochitest/test-non-javascript-mime.js | 1 + .../test-non-javascript-mime.js^headers^ | 1 + netwerk/protocol/http/nsHttpChannel.cpp | 2 +- 6 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_warning.js create mode 100644 devtools/client/webconsole/test/mochitest/test-non-javascript-mime.html create mode 100644 devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js create mode 100644 devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js^headers^ diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini index a18edbb72914..70d1dbcb2fe4 100644 --- a/devtools/client/webconsole/test/mochitest/browser.ini +++ b/devtools/client/webconsole/test/mochitest/browser.ini @@ -134,6 +134,9 @@ support-files = test-network-exceptions.html test-network-request.html test-network.html + test-non-javascript-mime.html + test-non-javascript-mime.js + test-non-javascript-mime.js^headers^ test-observe-http-ajax.html test-own-console.html test-property-provider.html @@ -344,6 +347,7 @@ skip-if = true # Bug 1438979 [browser_webconsole_network_reset_filter.js] [browser_webconsole_nodes_highlight.js] [browser_webconsole_nodes_select.js] +[browser_webconsole_non_javascript_mime_warning.js] [browser_webconsole_object_ctrl_click.js] [browser_webconsole_object_in_sidebar_keyboard_nav.js] [browser_webconsole_object_inspector.js] diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_warning.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_warning.js new file mode 100644 index 000000000000..1874c99d3cbb --- /dev/null +++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_non_javascript_mime_warning.js @@ -0,0 +1,20 @@ +/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ +/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +// Tests that + + +

Web Console test for script with non-JavaScript MIME type.

+ + diff --git a/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js b/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js new file mode 100644 index 000000000000..4b9e4bb15c7c --- /dev/null +++ b/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js @@ -0,0 +1 @@ +// Not empty. The ^headers^ file is important for this test. diff --git a/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js^headers^ b/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js^headers^ new file mode 100644 index 000000000000..7f77d670054d --- /dev/null +++ b/devtools/client/webconsole/test/mochitest/test-non-javascript-mime.js^headers^ @@ -0,0 +1 @@ +Content-Type: text/plain \ No newline at end of file diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index a54e5c5069e0..f2ec25f4903e 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -1528,7 +1528,7 @@ void WarnWrongMIMEOfScript(nsHttpChannel *aChannel, nsIURI *aURI, NS_ConvertUTF8toUTF16 typeString(contentType); if (!nsContentUtils::IsJavascriptMIMEType(typeString)) { ReportMimeTypeMismatch(aChannel, "WarnScriptWithWrongMimeType", aURI, - contentType, Report::Error); + contentType, Report::Warning); } }