Browse Source

Dont expose port, sslPort and host on app

pull/2/head
Luke Childs 8 years ago
parent
commit
b2a51ea2f1
  1. 14
      src/index.js
  2. 7
      test/create-test-server.js

14
src/index.js

@ -13,21 +13,21 @@ const createTestServer = opts => Promise.all([
createCert(opts && opts.certificate) createCert(opts && opts.certificate)
]) ])
.then(results => { .then(results => {
const port = results[0];
const sslPort = results[1];
const cert = results[2]; const cert = results[2];
const app = express(); const app = express();
app.port = results[0];
app.sslPort = results[1];
app.caCert = cert.caKeys.cert; app.caCert = cert.caKeys.cert;
app.host = 'localhost'; app.url = `http://localhost:${port}`;
app.url = `http://${app.host}:${app.port}`; app.sslUrl = `https://localhost:${sslPort}`;
app.sslUrl = `https://${app.host}:${app.sslPort}`;
const server = http.createServer(app); const server = http.createServer(app);
const sslServer = https.createServer(cert.keys, app); const sslServer = https.createServer(cert.keys, app);
app.listen = () => Promise.all([ app.listen = () => Promise.all([
pify(server.listen.bind(server))(app.port), pify(server.listen.bind(server))(port),
pify(sslServer.listen.bind(sslServer))(app.sslPort) pify(sslServer.listen.bind(sslServer))(sslPort)
]); ]);
app.close = () => Promise.all([ app.close = () => Promise.all([
pify(server.close.bind(server))(), pify(server.close.bind(server))(),

7
test/create-test-server.js

@ -13,11 +13,8 @@ test('createTestServer returns a Promise', t => {
test('server instance exposes useful properties', async t => { test('server instance exposes useful properties', async t => {
const server = await createTestServer(); const server = await createTestServer();
t.is(server.host, 'localhost'); t.true(typeof server.url === 'string');
t.true(typeof server.port === 'number'); t.true(typeof server.sslUrl === 'string');
t.true(typeof server.sslPort === 'number');
t.is(server.url, `http://${server.host}:${server.port}`);
t.is(server.sslUrl, `https://${server.host}:${server.sslPort}`);
t.true(typeof server.caCert === 'string'); t.true(typeof server.caCert === 'string');
t.true(typeof server.listen === 'function'); t.true(typeof server.listen === 'function');
t.true(typeof server.close === 'function'); t.true(typeof server.close === 'function');

Loading…
Cancel
Save