Skip to content

Commit b60f955

Browse files
committed
move _server.js to helpers
1 parent 56f63b2 commit b60f955

File tree

16 files changed

+52
-59
lines changed

16 files changed

+52
-59
lines changed

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@
6969
"xo": "*"
7070
},
7171
"xo": {
72-
"esnext": true,
73-
"ignores": [
74-
"test/_*"
75-
]
72+
"esnext": true
7673
}
7774
}

test/_server.js

Lines changed: 0 additions & 42 deletions
This file was deleted.

test/arguments.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import test from 'ava';
22
import got from '../';
3-
import {createServer} from './_server';
3+
import {createServer} from './helpers/server';
44

55
let s;
66

test/error.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import test from 'ava';
22
import got from '../';
3-
import {createServer} from './_server';
3+
import {createServer} from './helpers/server';
44

55
let s;
66

test/gzip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import zlib from 'zlib';
22
import test from 'ava';
33
import got from '../';
4-
import {createServer} from './_server';
4+
import {createServer} from './helpers/server';
55

66
const testContent = 'Compressible response content.\n';
77

test/headers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import test from 'ava';
22
import got from '../';
3-
import {createServer} from './_server';
3+
import {createServer} from './helpers/server';
44

55
let s;
66

test/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import test from 'ava';
22
import got from '../';
3-
import {createServer} from './_server';
3+
import {createServer} from './helpers/server';
44

55
let s;
66

test/helpers/server.js

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
'use strict';
2+
const http = require('http');
3+
const https = require('https');
4+
const pify = require('pify');
5+
const getPort = require('get-port');
6+
const host = exports.host = 'localhost';
7+
8+
exports.createServer = function () {
9+
return getPort().then(port => {
10+
const s = http.createServer((req, resp) => s.emit(req.url, req, resp));
11+
12+
s.host = host;
13+
s.port = port;
14+
s.url = `http://${host}:${port}`;
15+
s.protocol = 'http';
16+
17+
s.listen = pify(s.listen, Promise);
18+
s.close = pify(s.close, Promise);
19+
20+
return s;
21+
});
22+
};
23+
24+
exports.createSSLServer = function (opts) {
25+
return getPort().then(port => {
26+
const s = https.createServer(opts, (req, resp) => s.emit(req.url, req, resp));
27+
28+
s.host = host;
29+
s.port = port;
30+
s.url = `https://${host}:${port}`;
31+
s.protocol = 'https';
32+
33+
s.listen = pify(s.listen, Promise);
34+
s.close = pify(s.close, Promise);
35+
36+
return s;
37+
});
38+
};

test/http.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import test from 'ava';
22
import got from '../';
3-
import {createServer} from './_server';
3+
import {createServer} from './helpers/server';
44

55
let s;
66

test/https.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import test from 'ava';
22
import pem from 'pem';
33
import pify from 'pify';
44
import got from '../';
5-
import {createSSLServer} from './_server';
5+
import {createSSLServer} from './helpers/server';
66

77
let s;
88
let key;

0 commit comments

Comments
 (0)