Browse Source

update tests

master
Lloyd Brookes 9 years ago
parent
commit
71b2f4dcb4
  1. 2
      bin/cli.js
  2. 2
      lib/local-web-server.js
  3. 13
      lib/middleware-stack.js
  4. 2
      lib/middleware.js
  5. 2
      package.json
  6. 22
      test/common.js
  7. 0
      test/compress/big-file.txt
  8. 22
      test/compress/compress.js
  9. 21
      test/forbid/forbid.js
  10. 0
      test/forbid/one.html
  11. 0
      test/forbid/two.php
  12. 25
      test/log/log.js
  13. 22
      test/mime/mime.js
  14. 0
      test/mime/something.php
  15. 150
      test/mock/mock.js
  16. 1
      test/mock/one.html
  17. 29
      test/proxy/rewrite-proxy.js
  18. 1
      test/rewrite/one.html
  19. 19
      test/rewrite/rewrite.js
  20. 18
      test/serve-index/serve-index.js
  21. 1
      test/spa/one.txt
  22. 28
      test/spa/spa.js
  23. 1
      test/spa/two.txt
  24. 33
      test/static.js
  25. 1
      test/static/file.txt
  26. 18
      test/static/static.js
  27. 305
      test/test.js

2
bin/cli.js

@ -9,7 +9,7 @@ ws.addCors()
.addBodyParser()
.addBlacklist()
.addCache()
.addMimeType()
.addMimeOverride()
.addCompression()
.addLogging()
.addMockResponses()

2
lib/local-web-server.js

@ -30,7 +30,7 @@ class LocalWebServer extends MiddlewareStack {
app.on('error', err => {
if (options['log-format']) {
console.error(ansi.format(err.message, 'red'))
console.error(ansi.format(err.stack, 'red'))
}
})

13
lib/middleware-stack.js

@ -82,8 +82,7 @@ class MiddlewareStack extends Array {
debug('forbid', forbidList.join(', '))
return function blacklist (ctx, next) {
if (forbidList.some(expression => pathToRegexp(expression).test(ctx.path))) {
const http = require('http')
ctx.throw(403, http.STATUS_CODES[403])
ctx.status = 403
} else {
return next()
}
@ -115,7 +114,7 @@ class MiddlewareStack extends Array {
}
/* mime-type overrides */
addMimeType (mime) {
addMimeOverride (mime) {
this.push({
middleware: function (cliOptions) {
mime = cliOptions.mime || mime
@ -229,8 +228,12 @@ class MiddlewareStack extends Array {
debug('SPA', spa)
return _.get('*', function spaMw (ctx, route, next) {
const root = path.resolve(cliOptions.directory || process.cwd())
debug(`SPA request. Route: ${route}, isAsset: ${assetTest.test(route)}`)
return send(ctx, assetTest.test(route) ? route : spa, { root: root }).then(next)
if (ctx.accepts('text/html') && !assetTest.test(route)) {
debug(`SPA request. Route: ${route}, isAsset: ${assetTest.test(route)}`)
return send(ctx, spa, { root: root }).then(next)
} else {
return send(ctx, route, { root: root }).then(next)
}
})
}
}

2
lib/middleware.js

@ -83,7 +83,7 @@ function mockResponses (route, targets) {
target = targets.find(target => !target.request)
}
debug(`mock path: ${ctx.path} target: ${target.name || 'unnamed'}`)
debug(`mock path: ${ctx.path} target: ${target && target.name || 'unnamed'}`)
if (target) {
if (t.isFunction(target.response)) {

2
package.json

@ -22,7 +22,7 @@
"node": ">=4.0.0"
},
"scripts": {
"test": "tape test/*.js",
"test": "tape test/*/*.js",
"docs": "jsdoc2md -t jsdoc2md/README.hbs -p list lib/*.js > README.md; echo",
"cover": "istanbul cover ./node_modules/.bin/tape test/*.js && cat coverage/lcov.info | coveralls && rm -rf coverage; echo"
},

22
test/common.js

@ -0,0 +1,22 @@
'use strict'
const arrayify = require('array-back')
exports.checkResponse = checkResponse
exports.fail = fail
function checkResponse (t, status, bodyTests) {
return function (response) {
if (status) t.strictEqual(response.res.statusCode, status)
if (bodyTests) {
arrayify(bodyTests).forEach(body => {
t.ok(body.test(response.data), 'correct data')
})
}
}
}
function fail (t) {
return function (err) {
t.fail('failed: ' + err.stack)
}
}

0
test/fixture/big-file.txt → test/compress/big-file.txt

22
test/compress/compress.js

@ -0,0 +1,22 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('compress', function (t) {
t.plan(2)
const ws = new LocalWebServer()
ws.addCompression(true)
ws.addStatic(__dirname)
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/big-file.txt', { headers: { 'Accept-Encoding': 'gzip' } })
.then(response => {
t.strictEqual(response.res.statusCode, 200)
t.strictEqual(response.res.headers['content-encoding'], 'gzip')
})
.then(server.close.bind(server))
.catch(c.fail(t))
})
})

21
test/forbid/forbid.js

@ -0,0 +1,21 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('forbid', function (t) {
t.plan(2)
const ws = new LocalWebServer()
ws.addBlacklist([ '*.php', '*.html' ])
ws.addStatic(__dirname)
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/two.php')
.then(c.checkResponse(t, 403))
.then(() => request('http://localhost:8100/one.html'))
.then(c.checkResponse(t, 403))
.then(server.close.bind(server))
.catch(c.fail(t))
})
})

0
test/fixture/forbid/one.html → test/forbid/one.html

0
test/fixture/forbid/two.php → test/forbid/two.php

25
test/log/log.js

@ -0,0 +1,25 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('logging', function (t) {
t.plan(2)
const ws = new LocalWebServer()
const stream = require('stream').PassThrough()
stream.on('readable', () => {
let chunk = stream.read()
if (chunk) t.ok(/GET/.test(chunk.toString()))
})
ws.addLogging('common', { stream: stream })
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/')
.then(c.checkResponse(t, 404))
.then(server.close.bind(server))
.catch(c.fail(t))
})
})

22
test/mime/mime.js

@ -0,0 +1,22 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('mime override', function (t) {
t.plan(2)
const ws = new LocalWebServer()
ws.addMimeOverride({ 'text/plain': [ 'php' ] })
ws.addStatic(__dirname)
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/something.php')
.then(response => {
t.strictEqual(response.res.statusCode, 200)
t.ok(/text\/plain/.test(response.res.headers['content-type']))
})
.then(server.close.bind(server))
.catch(c.fail(t))
})
})

0
test/fixture/something.php → test/mime/something.php

150
test/mock/mock.js

@ -0,0 +1,150 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('mock: simple response', function (t) {
t.plan(2)
const ws = new LocalWebServer()
ws.addMockResponses([
{ route: '/test', response: { body: 'test' } }
])
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(c.checkResponse(t, 200, /test/))
.then(server.close.bind(server))
.catch(c.fail(t))
})
})
test('mock: method request filter', function (t) {
t.plan(3)
const ws = new LocalWebServer()
ws.addMockResponses([
{
route: '/test',
request: { method: 'POST' },
response: { body: 'test' }
}
])
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(c.checkResponse(t, 404))
.then(() => request('http://localhost:8100/test', { data: 'something' }))
.then(c.checkResponse(t, 200, /test/))
.then(server.close.bind(server))
.catch(c.fail(t))
})
})
test('mock: accepts request filter', function (t) {
t.plan(3)
const ws = new LocalWebServer()
ws.addMockResponses([
{
route: '/test',
request: { accepts: 'text' },
response: { body: 'test' }
}
])
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test', { headers: { Accept: '*/json' } })
.then(c.checkResponse(t, 404))
.then(() => request('http://localhost:8100/test', { headers: { Accept: 'text/plain' } }))
.then(c.checkResponse(t, 200, /test/))
.then(server.close.bind(server))
})
})
test('mock: responses array', function (t) {
t.plan(4)
const ws = new LocalWebServer()
ws.addMockResponses([
{
route: '/test',
responses: [
{ request: { method: 'GET' }, response: { body: 'get' } },
{ request: { method: 'POST' }, response: { body: 'post' } }
]
}
])
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(c.checkResponse(t, 200, /get/))
.then(() => request('http://localhost:8100/test', { method: 'POST' }))
.then(c.checkResponse(t, 200, /post/))
.then(server.close.bind(server))
})
})
test('mock: response function', function (t) {
t.plan(4)
const ws = new LocalWebServer()
ws.addMockResponses([
{
route: '/test',
responses: [
{ request: { method: 'GET' }, response: ctx => ctx.body = 'get' },
{ request: { method: 'POST' }, response: ctx => ctx.body = 'post' }
]
}
])
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(c.checkResponse(t, 200, /get/))
.then(() => request('http://localhost:8100/test', { method: 'POST' }))
.then(c.checkResponse(t, 200, /post/))
.then(server.close.bind(server))
})
})
test('mock: response function args', function (t) {
t.plan(2)
const ws = new LocalWebServer()
ws.addMockResponses([
{
route: '/test/:one',
responses: [
{ request: { method: 'GET' }, response: (ctx, one) => ctx.body = one }
]
}
])
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test/yeah')
.then(c.checkResponse(t, 200, /yeah/))
.then(server.close.bind(server))
})
})
test('mock: async response function', function (t) {
t.plan(2)
const ws = new LocalWebServer()
ws.addMockResponses([
{
route: '/test',
responses: {
response: function (ctx) {
return new Promise((resolve, reject) => {
setTimeout(() => {
ctx.body = 'test'
resolve()
}, 10)
})
}
}
}
])
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(c.checkResponse(t, 200, /test/))
.then(server.close.bind(server))
})
})

1
test/mock/one.html

@ -0,0 +1 @@
one

29
test/proxy/rewrite-proxy.js

@ -3,19 +3,7 @@ const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const http = require('http')
function checkResponse (t, status, body) {
return function (response) {
if (status) t.strictEqual(response.res.statusCode, status)
if (body) t.ok(body.test(response.data), 'correct data')
}
}
function fail (t) {
return function (err) {
t.fail('failed: ' + err.stack)
}
}
const c = require('../common')
test('rewrite: proxy', function (t) {
t.plan(2)
@ -26,9 +14,9 @@ test('rewrite: proxy', function (t) {
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test/')
.then(checkResponse(t, 200, /db_name/))
.then(c.checkResponse(t, 200, /db_name/))
.then(server.close.bind(server))
.catch(fail(t))
.catch(c.fail(t))
})
})
@ -41,9 +29,9 @@ test('rewrite: proxy, POST', function (t) {
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/test/', { data: {} })
.then(checkResponse(t, 405))
.then(c.checkResponse(t, 405))
.then(server.close.bind(server))
.catch(fail(t))
.catch(c.fail(t))
})
})
@ -56,9 +44,9 @@ test('rewrite: proxy, two url tokens', function (t) {
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/command-line-args/1.0.0')
.then(checkResponse(t, 200, /command-line-args/))
.then(c.checkResponse(t, 200, /command-line-args/))
.then(server.close.bind(server))
.catch(fail(t))
.catch(c.fail(t))
})
})
@ -76,9 +64,10 @@ test('rewrite: proxy with port', function (t) {
server1.listen(9000, () => {
server2.listen(8100, () => {
request('http://localhost:8100/test/file.txt')
.then(checkResponse(t, 200, /one/))
.then(c.checkResponse(t, 200, /one/))
.then(server1.close.bind(server1))
.then(server2.close.bind(server2))
.catch(c.fail(t))
})
})
})

1
test/rewrite/one.html

@ -0,0 +1 @@
one

19
test/rewrite/rewrite.js

@ -0,0 +1,19 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('rewrite local', function (t) {
t.plan(2)
const ws = new LocalWebServer()
ws.addRewrite([ { from: '/two.html', to: '/one.html' } ])
ws.addStatic(__dirname)
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/two.html')
.then(c.checkResponse(t, 200, /one/))
.then(server.close.bind(server))
.catch(c.fail(t))
})
})

18
test/serve-index/serve-index.js

@ -0,0 +1,18 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('static', function (t) {
t.plan(3)
const ws = new LocalWebServer()
ws.addIndex(__dirname, { icons: true })
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/')
.then(c.checkResponse(t, 200, [ /listing directory/, /class="icon/ ]))
.then(server.close.bind(server))
.catch(c.fail(t))
})
})

1
test/spa/one.txt

@ -0,0 +1 @@
one

28
test/spa/spa.js

@ -0,0 +1,28 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('spa', function (t) {
t.plan(6)
const ws = new LocalWebServer()
ws.addSpa('one.txt')
ws.addStatic(__dirname)
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/asdf', { headers: { accept: 'text/html' } })
.then(c.checkResponse(t, 200, /one/))
/* html requests for missing files with extensions do not redirect to spa */
.then(() => request('http://localhost:8100/asdf.txt', { headers: { accept: 'text/html' } }))
.then(c.checkResponse(t, 404))
/* existing static file */
.then(() => request('http://localhost:8100/two.txt'))
.then(c.checkResponse(t, 200, /two/))
/* not a text/html request - does not redirect to spa */
.then(() => request('http://localhost:8100/asdf', { headers: { accept: 'application/json' } }))
.then(c.checkResponse(t, 404))
.then(server.close.bind(server))
.catch(c.fail(t))
})
})

1
test/spa/two.txt

@ -0,0 +1 @@
two

33
test/static.js

@ -1,33 +0,0 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const localWebServer = require('../')
const http = require('http')
function launchServer (app, options) {
options = options || {}
const path = `http://localhost:8100${options.path || '/'}`
const server = http.createServer(app.callback())
return server.listen(options.port || 8100, () => {
const req = request(path, options.reqOptions)
if (options.onSuccess) req.then(options.onSuccess)
if (!options.leaveOpen) req.then(() => server.close())
req.catch(err => console.error('LAUNCH ERROR', err.stack))
})
}
test('static', function (t) {
t.plan(1)
const app = localWebServer({
log: { format: 'none' },
static: {
root: __dirname + '/fixture',
options: {
index: 'file.txt'
}
}
})
launchServer(app, { onSuccess: response => {
t.ok(/test/.test(response.data))
}})
})

1
test/static/file.txt

@ -0,0 +1 @@
test

18
test/static/static.js

@ -0,0 +1,18 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const LocalWebServer = require('../../')
const c = require('../common')
test('static', function (t) {
t.plan(2)
const ws = new LocalWebServer()
ws.addStatic(__dirname, { index: 'file.txt' })
const server = ws.getServer()
server.listen(8100, () => {
request('http://localhost:8100/')
.then(c.checkResponse(t, 200, /test/))
.then(server.close.bind(server))
.catch(c.fail(t))
})
})

305
test/test.js

@ -1,305 +0,0 @@
'use strict'
const test = require('tape')
const request = require('req-then')
const localWebServer = require('../')
const http = require('http')
const PassThrough = require('stream').PassThrough
function launchServer (app, options) {
options = options || {}
const path = `http://localhost:8100${options.path || '/'}`
const server = http.createServer(app.callback())
return server.listen(options.port || 8100, () => {
const req = request(path, options.reqOptions)
if (options.onSuccess) req.then(options.onSuccess)
if (!options.leaveOpen) req.then(() => server.close())
req.catch(err => console.error('LAUNCH ERROR', err.stack))
})
}
function checkResponse (t, status, body) {
return function (response) {
if (status) t.strictEqual(response.res.statusCode, status)
if (body) t.ok(body.test(response.data))
}
}
test('serve-index', function (t) {
t.plan(2)
const app = localWebServer({
log: { format: 'none' },
serveIndex: {
path: __dirname + '/fixture',
options: {
icons: true
}
}
})
launchServer(app, { onSuccess: response => {
t.ok(/listing directory/.test(response.data))
t.ok(/class="icon/.test(response.data))
}})
})
test('single page app', function (t) {
t.plan(6)
const app = localWebServer({
log: { format: 'none' },
static: { root: __dirname + '/fixture/spa' },
spa: 'one.txt'
})
const server = http.createServer(app.callback())
server.listen(8100, () => {
/* text/html requests for missing files redirect to spa */
request('http://localhost:8100/asdf', { headers: { accept: 'text/html' } })
.then(checkResponse(t, 200, /one/))
/* html requests for missing files with extensions do not redirect to spa */
.then(() => request('http://localhost:8100/asdf.txt', { headers: { accept: 'text/html' } }))
.then(checkResponse(t, 404))
/* existing static file */
.then(() => request('http://localhost:8100/two.txt'))
.then(checkResponse(t, 200, /two/))
/* not a text/html request - does not redirect to spa */
.then(() => request('http://localhost:8100/asdf'))
.then(checkResponse(t, 404))
.then(server.close.bind(server))
})
})
test('log: common', function (t) {
t.plan(1)
const stream = PassThrough()
stream.on('readable', () => {
let chunk = stream.read()
if (chunk) t.ok(/GET/.test(chunk.toString()))
})
const app = localWebServer({
log: {
format: 'common',
options: {
stream: stream
}
}
})
launchServer(app)
})
test('compress', function (t) {
t.plan(1)
const app = localWebServer({
compress: true,
log: { format: 'none' },
static: { root: __dirname + '/fixture' }
})
launchServer(
app,
{
reqOptions: { headers: { 'Accept-Encoding': 'gzip' } },
path: '/big-file.txt',
onSuccess: response => {
t.strictEqual(response.res.headers['content-encoding'], 'gzip')
}
}
)
})
test('mime', function (t) {
t.plan(2)
const app = localWebServer({
log: { format: 'none' },
static: { root: __dirname + '/fixture' },
mime: { 'text/plain': [ 'php' ] }
})
launchServer(app, { path: '/something.php', onSuccess: response => {
t.strictEqual(response.res.statusCode, 200)
t.ok(/text\/plain/.test(response.res.headers['content-type']))
}})
})
test('forbid', function (t) {
t.plan(2)
const app = localWebServer({
log: { format: 'none' },
static: { root: __dirname + '/fixture/forbid' },
forbid: [ '*.php', '*.html' ]
})
const server = launchServer(app, { leaveOpen: true })
request('http://localhost:8100/two.php')
.then(response => {
t.strictEqual(response.res.statusCode, 403)
request('http://localhost:8100/one.html')
.then(response => {
t.strictEqual(response.res.statusCode, 403)
server.close()
})
})
})
test('rewrite: local', function (t) {
t.plan(1)
const app = localWebServer({
log: { format: 'none' },
static: { root: __dirname + '/fixture/rewrite' },
rewrite: [ { from: '/two.html', to: '/one.html' } ]
})
launchServer(app, { path: '/two.html', onSuccess: response => {
t.ok(/one/.test(response.data))
}})
})
test('mock: simple response', function (t) {
t.plan(2)
const app = localWebServer({
log: { format: 'none' },
mocks: [
{ route: '/test', response: { body: 'test' } }
]
})
launchServer(app, { path: '/test', onSuccess: response => {
t.strictEqual(response.res.statusCode, 200)
t.ok(/test/.test(response.data))
}})
})
test('mock: method request filter', function (t) {
t.plan(3)
const app = localWebServer({
log: { format: 'none' },
mocks: [
{
route: '/test',
request: { method: 'POST' },
response: { body: 'test' }
}
]
})
const server = http.createServer(app.callback())
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(checkResponse(t, 404))
.then(() => request('http://localhost:8100/test', { data: 'something' }))
.then(checkResponse(t, 200, /test/))
.then(server.close.bind(server))
})
})
test('mock: accepts request filter', function (t) {
t.plan(3)
const app = localWebServer({
log: { format: 'none' },
mocks: [
{
route: '/test',
request: { accepts: 'text' },
response: { body: 'test' }
}
]
})
const server = http.createServer(app.callback())
server.listen(8100, () => {
request('http://localhost:8100/test', { headers: { Accept: '*/json' } })
.then(checkResponse(t, 404))
.then(() => request('http://localhost:8100/test', { headers: { Accept: 'text/plain' } }))
.then(checkResponse(t, 200, /test/))
.then(server.close.bind(server))
})
})
test('mock: responses array', function (t) {
t.plan(4)
const app = localWebServer({
log: { format: 'none' },
mocks: [
{
route: '/test',
responses: [
{ request: { method: 'GET' }, response: { body: 'get' } },
{ request: { method: 'POST' }, response: { body: 'post' } }
]
}
]
})
const server = http.createServer(app.callback())
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(checkResponse(t, 200, /get/))
.then(() => request('http://localhost:8100/test', { method: 'POST' }))
.then(checkResponse(t, 200, /post/))
.then(server.close.bind(server))
})
})
test('mock: response function', function (t) {
t.plan(4)
const app = localWebServer({
log: { format: 'none' },
mocks: [
{
route: '/test',
responses: [
{ request: { method: 'GET' }, response: ctx => ctx.body = 'get' },
{ request: { method: 'POST' }, response: ctx => ctx.body = 'post' }
]
}
]
})
const server = http.createServer(app.callback())
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(checkResponse(t, 200, /get/))
.then(() => request('http://localhost:8100/test', { method: 'POST' }))
.then(checkResponse(t, 200, /post/))
.then(server.close.bind(server))
})
})
test('mock: response function args', function (t) {
t.plan(2)
const app = localWebServer({
log: { format: 'none' },
mocks: [
{
route: '/test/:one',
responses: [
{ request: { method: 'GET' }, response: (ctx, one) => ctx.body = one }
]
}
]
})
const server = http.createServer(app.callback())
server.listen(8100, () => {
request('http://localhost:8100/test/yeah')
.then(checkResponse(t, 200, /yeah/))
.then(server.close.bind(server))
})
})
test('mock: async response function', function (t) {
t.plan(2)
const app = localWebServer({
log: { format: 'none' },
mocks: [
{
route: '/test',
responses: {
response: function (ctx) {
return new Promise((resolve, reject) => {
setTimeout(() => {
ctx.body = 'test'
resolve()
}, 10)
})
}
}
}
]
})
const server = http.createServer(app.callback())
server.listen(8100, () => {
request('http://localhost:8100/test')
.then(checkResponse(t, 200, /test/))
.then(server.close.bind(server))
})
})
Loading…
Cancel
Save