rewrite tests

Author: floatdrop

.travis.yml

@@ -1,5 +1,6 @@
 language: node_js
 node_js:
+  - '6'
   - '5'
   - '4'
   - '0.12'

index.js

@@ -2,10 +2,10 @@
 
 var http = require('http');
 var urlParse = require('url').parse;
+var EventEmitter = require('events').EventEmitter;
 var humanize = require('humanize-number');
 var chalk = require('chalk');
 var monkeypatch = require('monkeypatch');
-var EventEmitter = require('events').EventEmitter;
 
 var colorCodes = {
 	5: 'red',

package.json

@@ -32,8 +32,12 @@
     "url-parse-lax": "^1.0.0"
   },
   "devDependencies": {
-    "ava": "^0.7.0",
-    "xo": "^0.11.0"
+    "ava": "^0.15.0",
+    "get-port": "^2.1.0",
+    "got": "^6.3.0",
+    "pem": "^1.8.3",
+    "pify": "^2.3.0",
+    "xo": "^0.15.0"
   },
   "xo": {
     "ignores": [

test/fn.js

@@ -1,7 +1,7 @@
-import test from 'ava';
 import http from 'http';
 import https from 'https';
 import url from 'url';
+import test from 'ava';
 import debugHttp from '../';
 
 test.cb('calls handler on http request', t => {

test/helpers/server.js

@@ -0,0 +1,38 @@
+'use strict';
+const http = require('http');
+const https = require('https');
+const pify = require('pify');
+const getPort = require('get-port');
+const host = exports.host = 'localhost';
+
+exports.createServer = function () {
+	return getPort().then(port => {
+		const s = http.createServer((req, resp) => s.emit(req.url, req, resp));
+
+		s.host = host;
+		s.port = port;
+		s.url = `http://${host}:${port}`;
+		s.protocol = 'http';
+
+		s.listen = pify(s.listen, Promise);
+		s.close = pify(s.close, Promise);
+
+		return s;
+	});
+};
+
+exports.createSSLServer = function (opts) {
+	return getPort().then(port => {
+		const s = https.createServer(opts, (req, resp) => s.emit(req.url, req, resp));
+
+		s.host = host;
+		s.port = port;
+		s.url = `https://${host}:${port}`;
+		s.protocol = 'https';
+
+		s.listen = pify(s.listen, Promise);
+		s.close = pify(s.close, Promise);
+
+		return s;
+	});
+};

test/http.js

@@ -0,0 +1,34 @@
+import test from 'ava';
+import got from 'got';
+import chalk from 'chalk';
+import debugHttp from '../';
+import {createServer} from './helpers/server';
+
+let s;
+
+test.before('setup', async () => {
+	s = await createServer();
+
+	s.on('/', (req, res) => res.end('ok'));
+
+	await s.listen(s.port);
+});
+
+test('http works', async t => {
+	debugHttp();
+
+	let strs = [];
+	console.log = function (string) {
+		strs.push(chalk.stripColor(string));
+	};
+
+	await got(s.url);
+
+	t.is(strs.length, 2);
+	t.is(strs[0].indexOf(`      → GET ${s.url}`), 0);
+	t.is(strs[1].indexOf(`  200 ← GET ${s.url}`), 0);
+});
+
+test.after('cleanup', async () => {
+	await s.close();
+});

test/https.js

@@ -0,0 +1,63 @@
+import test from 'ava';
+import chalk from 'chalk';
+import pem from 'pem';
+import pify from 'pify';
+import got from 'got';
+import debugHttp from '../';
+import {createSSLServer} from './helpers/server';
+
+let s;
+let caRootCert;
+
+const pemP = pify(pem, Promise);
+
+test.before('setup', async () => {
+	const caKeys = await pemP.createCertificate({days: 1, selfSigned: true});
+
+	const caRootKey = caKeys.serviceKey;
+	caRootCert = caKeys.certificate;
+
+	const keys = await pemP.createCertificate({
+		serviceCertificate: caRootCert,
+		serviceKey: caRootKey,
+		serial: Date.now(),
+		days: 500,
+		country: '',
+		state: '',
+		locality: '',
+		organization: '',
+		organizationUnit: '',
+		commonName: 'sindresorhus.com'
+	});
+
+	const key = keys.clientKey;
+	const cert = keys.certificate;
+
+	s = await createSSLServer({key, cert});
+
+	s.on('/', (req, res) => res.end('ok'));
+
+	await s.listen(s.port);
+});
+
+test('https works', async t => {
+	debugHttp();
+
+	let strs = [];
+	console.log = function (string) {
+		strs.push(chalk.stripColor(string));
+	};
+
+	await got(s.url, {
+		strictSSL: true,
+		ca: caRootCert,
+		headers: {host: 'sindresorhus.com'}
+	});
+
+	t.is(strs.length, 2);
+	t.is(strs[0].indexOf(`      → GET ${s.url}`), 0);
+});
+
+test.after('cleanup', async () => {
+	await s.close();
+});