Revert "allow e2e tests to pass https options"

This reverts commit 06efeffdb8.
This commit is contained in:
Zach Bloomquist
2020-01-09 10:29:18 -05:00
parent 06efeffdb8
commit f4e3b12541
3 changed files with 6 additions and 7 deletions

View File

@@ -10,7 +10,7 @@ module.exports = {
reset: ->
Server.reset()
httpsServer: (onRequest, options) ->
require("../test/helpers/https_server").create(onRequest, options)
httpsServer: (onRequest) ->
require("../test/helpers/https_server").create(onRequest)
}

View File

@@ -1,4 +1,3 @@
_ = require('lodash')
https = require("https")
Promise = require("bluebird")
{ allowDestroy } = require("@packages/network")
@@ -14,8 +13,8 @@ defaultOnRequest = (req, res) ->
servers = []
create = (onRequest, options) ->
https.createServer(_.merge({}, certs, options), onRequest ? defaultOnRequest)
create = (onRequest) ->
https.createServer(certs, onRequest ? defaultOnRequest)
module.exports = {
create

View File

@@ -151,14 +151,14 @@ const ensurePort = function (port) {
const startServer = function (obj) {
let s; let srv
const { onServer, port, https, httpsOptions } = obj
const { onServer, port, https } = obj
ensurePort(port)
const app = express()
if (https) {
srv = httpsProxy.httpsServer(app, httpsOptions)
srv = httpsProxy.httpsServer(app)
} else {
srv = http.Server(app)
}