Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions test/support/utils.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
var assert = require('assert')
var finalhandler = require('../..')
var http = require('http')

var http2

try {
http2 = require('http2')
} catch (_err) {
// Nothing
}
var http2 = require('http2')

var request = require('supertest')
var SlowWriteStream = require('./sws')
Expand Down
18 changes: 2 additions & 16 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ var Buffer = require('safe-buffer').Buffer
var finalhandler = require('..')
var http = require('http')

var http2

try {
http2 = require('http2')
} catch (_err) {
// Nothing
}

var utils = require('./support/utils')

var assert = utils.assert
Expand Down Expand Up @@ -673,16 +665,10 @@ var topDescribe = function (type, createServer) {
}

var servers = [
['http', createHTTPServer]
['http', createHTTPServer],
['http2', createHTTP2Server]
]

var nodeVersion = process.versions.node.split('.').map(Number)

// `superagent` only supports `http2` since Node.js@10
if (http2 && nodeVersion[0] >= 10) {
servers.push(['http2', createHTTP2Server])
}

for (var i = 0; i < servers.length; i++) {
var tests = topDescribe.bind(undefined, servers[i][0], servers[i][1])

Expand Down