Skip to content

Commit 771d019

Browse files
committed
Standard
1 parent 0118ab6 commit 771d019

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

index.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,14 @@ Router.prototype._insert = function _insert (method, path, kind, params, handler
215215
// let's split the node and add a new child
216216
if (len < prefixLen) {
217217
node = new Node(
218-
{ prefix: prefix.slice(len),
218+
{
219+
prefix: prefix.slice(len),
219220
children: currentNode.children,
220221
kind: currentNode.kind,
221222
handlers: new Node.Handlers(currentNode.handlers),
222223
regex: currentNode.regex,
223-
versions: currentNode.versions }
224+
versions: currentNode.versions
225+
}
224226
)
225227
if (currentNode.wildcardChild !== null) {
226228
node.wildcardChild = currentNode.wildcardChild
@@ -585,7 +587,7 @@ Router.prototype.prettyPrint = function () {
585587
}
586588

587589
for (var i in http.METHODS) {
588-
if (!http.METHODS.hasOwnProperty(i)) continue
590+
if (!http.METHODS.hasOwnProperty(i)) continue // eslint-disable-line
589591
const m = http.METHODS[i]
590592
const methodName = m.toLowerCase()
591593

test/errors.test.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ test('Method already declared', t => {
181181
findMyWay.on('GET', '/test', () => {})
182182
t.fail('method already declared')
183183
} catch (e) {
184-
t.is(e.message, `Method 'GET' already declared for route '/test'`)
184+
t.is(e.message, 'Method \'GET\' already declared for route \'/test\'')
185185
}
186186
})
187187

@@ -198,14 +198,14 @@ test('Method already declared [ignoreTrailingSlash=true]', t => {
198198
findMyWay.on('GET', '/test', () => {})
199199
t.fail('method already declared')
200200
} catch (e) {
201-
t.is(e.message, `Method 'GET' already declared for route '/test'`)
201+
t.is(e.message, 'Method \'GET\' already declared for route \'/test\'')
202202
}
203203

204204
try {
205205
findMyWay.on('GET', '/test/', () => {})
206206
t.fail('method already declared')
207207
} catch (e) {
208-
t.is(e.message, `Method 'GET' already declared for route '/test/'`)
208+
t.is(e.message, 'Method \'GET\' already declared for route \'/test/\'')
209209
}
210210
})
211211

@@ -219,14 +219,14 @@ test('Method already declared [ignoreTrailingSlash=true]', t => {
219219
findMyWay.on('GET', '/test', () => {})
220220
t.fail('method already declared')
221221
} catch (e) {
222-
t.is(e.message, `Method 'GET' already declared for route '/test'`)
222+
t.is(e.message, 'Method \'GET\' already declared for route \'/test\'')
223223
}
224224

225225
try {
226226
findMyWay.on('GET', '/test/', () => {})
227227
t.fail('method already declared')
228228
} catch (e) {
229-
t.is(e.message, `Method 'GET' already declared for route '/test/'`)
229+
t.is(e.message, 'Method \'GET\' already declared for route \'/test/\'')
230230
}
231231
})
232232
})
@@ -243,7 +243,7 @@ test('Method already declared nested route', t => {
243243
findMyWay.on('GET', '/test/hello', () => {})
244244
t.fail('method already delcared in nested route')
245245
} catch (e) {
246-
t.is(e.message, `Method 'GET' already declared for route '/test/hello'`)
246+
t.is(e.message, 'Method \'GET\' already declared for route \'/test/hello\'')
247247
}
248248
})
249249

@@ -262,14 +262,14 @@ test('Method already declared nested route [ignoreTrailingSlash=true]', t => {
262262
findMyWay.on('GET', '/test/hello', () => {})
263263
t.fail('method already declared')
264264
} catch (e) {
265-
t.is(e.message, `Method 'GET' already declared for route '/test/hello'`)
265+
t.is(e.message, 'Method \'GET\' already declared for route \'/test/hello\'')
266266
}
267267

268268
try {
269269
findMyWay.on('GET', '/test/hello/', () => {})
270270
t.fail('method already declared')
271271
} catch (e) {
272-
t.is(e.message, `Method 'GET' already declared for route '/test/hello/'`)
272+
t.is(e.message, 'Method \'GET\' already declared for route \'/test/hello/\'')
273273
}
274274
})
275275

@@ -285,14 +285,14 @@ test('Method already declared nested route [ignoreTrailingSlash=true]', t => {
285285
findMyWay.on('GET', '/test/hello', () => {})
286286
t.fail('method already declared')
287287
} catch (e) {
288-
t.is(e.message, `Method 'GET' already declared for route '/test/hello'`)
288+
t.is(e.message, 'Method \'GET\' already declared for route \'/test/hello\'')
289289
}
290290

291291
try {
292292
findMyWay.on('GET', '/test/hello/', () => {})
293293
t.fail('method already declared')
294294
} catch (e) {
295-
t.is(e.message, `Method 'GET' already declared for route '/test/hello/'`)
295+
t.is(e.message, 'Method \'GET\' already declared for route \'/test/hello/\'')
296296
}
297297
})
298298
})

test/version.custom-versioning.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const customVersioning = {
1717
}
1818
},
1919
deriveVersion: (req, ctx) => {
20-
return req.headers['accept']
20+
return req.headers.accept
2121
}
2222
}
2323

0 commit comments

Comments
 (0)