aboutsummaryrefslogtreecommitdiff
path: root/node_modules/stream-http/test
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/stream-http/test')
-rw-r--r--node_modules/stream-http/test/browser/headers.js7
-rw-r--r--node_modules/stream-http/test/server/index.js1
2 files changed, 5 insertions, 3 deletions
diff --git a/node_modules/stream-http/test/browser/headers.js b/node_modules/stream-http/test/browser/headers.js
index 1054eda0b..aee0f7b14 100644
--- a/node_modules/stream-http/test/browser/headers.js
+++ b/node_modules/stream-http/test/browser/headers.js
@@ -90,11 +90,12 @@ test('content-type response header', function (t) {
var browser = (new UAParser()).setUA(navigator.userAgent).getBrowser()
var browserName = browser.name
var browserVersion = browser.major
-var browserMinorVersion = browser.minor
+var browserMinorVersion = browser.minor || 0
// The content-type header is broken when 'prefer-streaming' or 'allow-wrong-content-type'
-// is passed in browsers that rely on xhr.overrideMimeType(), namely older chrome and safari 6-10.0
+// is passed in browsers that rely on xhr.overrideMimeType(), namely older chrome, safari 6-10.0, and the stock Android browser
var wrongMimeType = ((browserName === 'Chrome' && browserVersion <= 42) ||
- ((browserName === 'Safari' || browserName === 'Mobile Safari') && browserVersion >= 6 && (browserVersion < 10 || (browserVersion === 10 && browserMinorVersion === 0))))
+ ((browserName === 'Safari' || browserName === 'Mobile Safari') && browserVersion >= 6 && (browserVersion < 10 || (browserVersion == 10 && browserMinorVersion == 0)))
+ || (browserName === 'Android Browser'))
test('content-type response header with forced streaming', function (t) {
http.get({
diff --git a/node_modules/stream-http/test/server/index.js b/node_modules/stream-http/test/server/index.js
index 8f474b2b5..f9f45de04 100644
--- a/node_modules/stream-http/test/server/index.js
+++ b/node_modules/stream-http/test/server/index.js
@@ -32,6 +32,7 @@ app.get('/testHeaders', function (req, res) {
})
res.setHeader('Content-Type', 'application/json')
+ res.setHeader('Cache-Control', 'no-cache')
// Request headers are sent in the body as json
var reqHeaders = {}