From bbff7403fbf46f9ad92240ac213df8d30ef31b64 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Sep 2018 02:56:13 +0200 Subject: update packages --- .../stream-http/test/browser/binary-streaming.js | 4 +-- .../stream-http/test/browser/post-binary.js | 3 +- .../stream-http/test/browser/text-streaming.js | 4 +-- node_modules/stream-http/test/browser/text.js | 3 +- .../stream-http/test/browser/timeout.js.disabled | 33 ---------------------- node_modules/stream-http/test/browser/webworker.js | 3 +- .../stream-http/test/node/http-browserify.js | 16 ++++++++++- node_modules/stream-http/test/server/index.js | 2 +- 8 files changed, 23 insertions(+), 45 deletions(-) delete mode 100644 node_modules/stream-http/test/browser/timeout.js.disabled (limited to 'node_modules/stream-http/test') diff --git a/node_modules/stream-http/test/browser/binary-streaming.js b/node_modules/stream-http/test/browser/binary-streaming.js index 4d2d63e00..d1221dfe2 100644 --- a/node_modules/stream-http/test/browser/binary-streaming.js +++ b/node_modules/stream-http/test/browser/binary-streaming.js @@ -8,8 +8,8 @@ var http = require('../..') var browser = (new UAParser()).setUA(navigator.userAgent).getBrowser() var browserName = browser.name var browserVersion = browser.major -// Binary streaming doesn't work in IE10 or below or in Opera -var skipStreamingCheck = (browserName === 'Opera' || (browserName === 'IE' && browserVersion <= 10)) +// Binary streaming doesn't work in IE10 or below +var skipStreamingCheck = (browserName === 'IE' && browserVersion <= 10) // Binary data gets corrupted in IE8 or below var skipVerification = (browserName === 'IE' && browserVersion <= 8) diff --git a/node_modules/stream-http/test/browser/post-binary.js b/node_modules/stream-http/test/browser/post-binary.js index 31b465caa..52f3d7ea6 100644 --- a/node_modules/stream-http/test/browser/post-binary.js +++ b/node_modules/stream-http/test/browser/post-binary.js @@ -9,8 +9,7 @@ var browser = (new UAParser()).setUA(navigator.userAgent).getBrowser() var browserName = browser.name var browserVersion = browser.major // Binary request bodies don't work in a bunch of browsers -var skipVerification = ((browserName === 'Opera' && browserVersion <= 11) || - (browserName === 'IE' && browserVersion <= 10) || +var skipVerification = ((browserName === 'IE' && browserVersion <= 10) || (browserName === 'Safari' && browserVersion <= 5) || (browserName === 'WebKit' && browserVersion <= 534) || // Old mobile safari (browserName === 'Android Browser' && browserVersion <= 4)) diff --git a/node_modules/stream-http/test/browser/text-streaming.js b/node_modules/stream-http/test/browser/text-streaming.js index 812ef1457..21693afd4 100644 --- a/node_modules/stream-http/test/browser/text-streaming.js +++ b/node_modules/stream-http/test/browser/text-streaming.js @@ -8,8 +8,8 @@ var http = require('../..') var browser = (new UAParser()).setUA(navigator.userAgent).getBrowser() var browserName = browser.name var browserVersion = browser.major -// Streaming doesn't work in IE9 or below or in Opera -var skipStreamingCheck = (browserName === 'Opera' || (browserName === 'IE' && browserVersion <= 9)) +// Streaming doesn't work in IE9 or below +var skipStreamingCheck = (browserName === 'IE' && browserVersion <= 9) var COPIES = 1000 var MIN_PIECES = 5 diff --git a/node_modules/stream-http/test/browser/text.js b/node_modules/stream-http/test/browser/text.js index 6cc1c8148..568380ce6 100644 --- a/node_modules/stream-http/test/browser/text.js +++ b/node_modules/stream-http/test/browser/text.js @@ -10,8 +10,7 @@ var browser = (new UAParser()).setUA(navigator.userAgent).getBrowser() var browserName = browser.name var browserVersion = browser.major // Response urls don't work on many browsers -var skipResponseUrl = ((browserName === 'Opera') || - (browserName === 'IE') || +var skipResponseUrl = ((browserName === 'IE') || (browserName === 'Edge') || (browserName === 'Chrome' && browserVersion <= 36) || (browserName === 'Firefox' && browserVersion <= 31) || diff --git a/node_modules/stream-http/test/browser/timeout.js.disabled b/node_modules/stream-http/test/browser/timeout.js.disabled deleted file mode 100644 index a49efdfb3..000000000 --- a/node_modules/stream-http/test/browser/timeout.js.disabled +++ /dev/null @@ -1,33 +0,0 @@ -var Buffer = require('buffer').Buffer -var fs = require('fs') -var test = require('tape') -var UAParser = require('ua-parser-js') -var url = require('url') - -var http = require('../..') - -var browser = (new UAParser()).setUA(navigator.userAgent).getBrowser() -var browserName = browser.name -var browserVersion = browser.major - -var skipTimeout = ((browserName === 'Opera' && browserVersion <= 12) || - (browserName === 'Safari' && browserVersion <= 5)) - - -test('emits timeout events', function (t) { - if (skipTimeout) { - return t.skip('Browser does not support setting timeouts') - } - - var req = http.request({ - path: '/basic.txt', - timeout: 1 - }) - - req.on('timeout', function () { - t.pass('timeout caught') - t.end() // the test will timeout if this does not happen - }) - - req.end() -}) diff --git a/node_modules/stream-http/test/browser/webworker.js b/node_modules/stream-http/test/browser/webworker.js index b1df06471..063706cf0 100644 --- a/node_modules/stream-http/test/browser/webworker.js +++ b/node_modules/stream-http/test/browser/webworker.js @@ -8,8 +8,7 @@ var browser = (new UAParser()).setUA(navigator.userAgent).getBrowser() var browserName = browser.name var browserVersion = browser.major // Skip browsers with poor or nonexistant WebWorker support -var skip = ((browserName === 'Opera' && browserVersion <= 12) || - (browserName === 'IE' && browserVersion <= 10) || +var skip = ((browserName === 'IE' && browserVersion <= 10) || (browserName === 'Safari' && browserVersion <= 5) || (browserName === 'WebKit' && browserVersion <= 534) || // Old mobile safari (browserName === 'Android Browser' && browserVersion <= 4)) diff --git a/node_modules/stream-http/test/node/http-browserify.js b/node_modules/stream-http/test/node/http-browserify.js index fda851232..42a718f08 100644 --- a/node_modules/stream-http/test/node/http-browserify.js +++ b/node_modules/stream-http/test/node/http-browserify.js @@ -1,4 +1,4 @@ -// These tests are teken from http-browserify to ensure compatibility with +// These tests are taken from http-browserify to ensure compatibility with // that module var test = require('tape') var url = require('url') @@ -17,6 +17,20 @@ var moduleName = require.resolve('../../') delete require.cache[moduleName] var http = require('../../') +test('Make sure http object has correct properties', function (t) { + t.ok(http.Agent, 'Agent defined') + t.ok(http.ClientRequest, 'ClientRequest defined') + t.ok(http.ClientRequest.prototype, 'ClientRequest.prototype defined') + t.ok(http.IncomingMessage, 'IncomingMessage defined') + t.ok(http.IncomingMessage.prototype, 'IncomingMessage.prototype defined') + t.ok(http.METHODS, 'METHODS defined') + t.ok(http.STATUS_CODES, 'STATUS_CODES defined') + t.ok(http.get, 'get defined') + t.ok(http.globalAgent, 'globalAgent defined') + t.ok(http.request, 'request defined') + t.end() +}) + test('Test simple url string', function(t) { var testUrl = { path: '/api/foo' } var request = http.get(testUrl, noop) diff --git a/node_modules/stream-http/test/server/index.js b/node_modules/stream-http/test/server/index.js index f9f45de04..0a74aed85 100644 --- a/node_modules/stream-http/test/server/index.js +++ b/node_modules/stream-http/test/server/index.js @@ -132,6 +132,6 @@ app.use(function (req, res, next) { app.use(express.static(path.join(__dirname, 'static'))) -var port = parseInt(process.env.ZUUL_PORT) || 8199 +var port = parseInt(process.env.AIRTAP_PORT) || 8199 console.log('Test server listening on port', port) server.listen(port) -- cgit v1.2.3