Browse Source

linting

master
Lloyd Brookes 8 years ago
parent
commit
86a1787540
  1. 4
      .travis.yml
  2. 1
      bin/cli.js
  3. 6
      example/rewrite/.local-web-server.json
  4. 5
      lib/middleware.js
  5. 4
      test/test.js

4
.travis.yml

@ -1,4 +1,4 @@
language: node_js language: node_js
node_js: node_js:
- 'node'
- '4.2'
- '5'
- '4'

1
bin/cli.js

@ -6,7 +6,6 @@ const commandLineArgs = require('command-line-args')
const ansi = require('ansi-escape-sequences') const ansi = require('ansi-escape-sequences')
const loadConfig = require('config-master') const loadConfig = require('config-master')
const path = require('path') const path = require('path')
const s = require('string-tools')
const os = require('os') const os = require('os')
const arrayify = require('array-back') const arrayify = require('array-back')
const t = require('typical') const t = require('typical')

6
example/rewrite/.local-web-server.json

@ -2,6 +2,10 @@
"rewrite": [ "rewrite": [
{ "from": "/css/*", "to": "/build/styles/$1" }, { "from": "/css/*", "to": "/build/styles/$1" },
{ "from": "/npm/*", "to": "http://registry.npmjs.org/$1" }, { "from": "/npm/*", "to": "http://registry.npmjs.org/$1" },
{ "from": "/:user/repos/:name", "to": "https://api.github.com/repos/:user/:name" }
{ "from": "/:user/repos/:name", "to": "https://api.github.com/repos/:user/:name" },
{
"from": "/lloyd/*",
"to": "http://104.131.40.69/$1"
}
] ]
} }

5
lib/middleware.js

@ -78,7 +78,7 @@ function mime (mimeTypes) {
function mockResponses (route, targets) { function mockResponses (route, targets) {
targets = arrayify(targets) targets = arrayify(targets)
debug('mock route: %s, targets: %s', route, targets.length);
debug('mock route: %s, targets: %s', route, targets.length)
const pathRe = pathToRegexp(route) const pathRe = pathToRegexp(route)
return function mockResponse (ctx, next) { return function mockResponse (ctx, next) {
@ -103,13 +103,12 @@ function mockResponses (route, targets) {
if (target) { if (target) {
if (t.isFunction(target.response)) { if (t.isFunction(target.response)) {
const pathMatches = ctx.path.match(pathRe).slice(1) const pathMatches = ctx.path.match(pathRe).slice(1)
return target.response.apply(null, [ctx].concat(pathMatches))
return target.response.apply(null, [ctx].concat(pathMatches))
} else if (t.isPlainObject(target.response)) { } else if (t.isPlainObject(target.response)) {
Object.assign(ctx.response, target.response) Object.assign(ctx.response, target.response)
} else { } else {
throw new Error(`Invalid response: ${JSON.stringify(target.response)}`) throw new Error(`Invalid response: ${JSON.stringify(target.response)}`)
} }
} }
} else { } else {
return next() return next()

4
test/test.js

@ -259,9 +259,9 @@ test('mock: accepts request filter', function (t) {
}) })
const server = http.createServer(app.callback()) const server = http.createServer(app.callback())
server.listen(8100, () => { server.listen(8100, () => {
request('http://localhost:8100/test', { headers: { Accept: '*/json' }})
request('http://localhost:8100/test', { headers: { Accept: '*/json' } })
.then(checkResponse(t, 404)) .then(checkResponse(t, 404))
.then(() => request('http://localhost:8100/test', { headers: { Accept: 'text/plain' }}))
.then(() => request('http://localhost:8100/test', { headers: { Accept: 'text/plain' } }))
.then(checkResponse(t, 200, /test/)) .then(checkResponse(t, 200, /test/))
.then(server.close.bind(server)) .then(server.close.bind(server))
}) })

Loading…
Cancel
Save