Skip to content

Commit 1a1049a

Browse files
dougwilsondougwilson
committed
lint: apply standard 11 style
1 parent 8fc5dcb commit 1a1049a

File tree

3 files changed

+79
-79
lines changed

3 files changed

+79
-79
lines changed

‎index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ exports.title = 'Connect'
165165

166166
function escapeHtmlBlock (str) {
167167
return escapeHtml(str)
168-
.replace(DOUBLE_SPACE_REGEXP, '  ')
169-
.replace(NEW_LINE_REGEXP, '<br>')
168+
.replace(DOUBLE_SPACE_REGEXP, ' &nbsp;')
169+
.replace(NEW_LINE_REGEXP, '<br>')
170170
}
171171

172172
/**

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
},
1515
"devDependencies": {
1616
"after": "0.8.2",
17-
"eslint": "3.19.0",
18-
"eslint-config-standard": "10.2.1",
19-
"eslint-plugin-import": "2.8.0",
17+
"eslint": "4.19.1",
18+
"eslint-config-standard": "11.0.0",
19+
"eslint-plugin-import": "2.10.0",
2020
"eslint-plugin-markdown": "1.0.0-beta.6",
21-
"eslint-plugin-node": "5.2.1",
22-
"eslint-plugin-promise": "3.6.0",
21+
"eslint-plugin-node": "6.0.1",
22+
"eslint-plugin-promise": "3.7.0",
2323
"eslint-plugin-standard": "3.0.1",
2424
"istanbul": "0.4.5",
2525
"mocha": "2.5.3",

‎test/test.js‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,45 @@ describe('errorHandler()', function () {
1212
it('should set nosniff header', function (done) {
1313
var server = createServer(new Error('boom!'))
1414
request(server)
15-
.get('/')
16-
.expect('X-Content-Type-Options', 'nosniff')
17-
.expect(500, done)
15+
.get('/')
16+
.expect('X-Content-Type-Options', 'nosniff')
17+
.expect(500, done)
1818
})
1919

2020
describe('status code', function () {
2121
describe('when non-error status code', function () {
2222
it('should set the status code to 500', function (done) {
2323
var server = createServer({status: 200})
2424
request(server)
25-
.get('/')
26-
.expect(500, done)
25+
.get('/')
26+
.expect(500, done)
2727
})
2828
})
2929

3030
describe('when err.status exists', function () {
3131
it('should set res.statusCode', function (done) {
3232
var server = createServer({status: 404})
3333
request(server)
34-
.get('/')
35-
.expect(404, done)
34+
.get('/')
35+
.expect(404, done)
3636
})
3737
})
3838

3939
describe('when err.statusCode exists', function () {
4040
it('should set res.statusCode', function (done) {
4141
var server = createServer({statusCode: 404})
4242
request(server)
43-
.get('/')
44-
.expect(404, done)
43+
.get('/')
44+
.expect(404, done)
4545
})
4646
})
4747

4848
describe('when err.statusCode and err.status exist', function () {
4949
it('should prefer err.status', function (done) {
5050
var server = createServer({statusCode: 400, status: 404})
5151
request(server)
52-
.get('/')
53-
.expect(404, done)
52+
.get('/')
53+
.expect(404, done)
5454
})
5555
})
5656
})
@@ -61,49 +61,49 @@ describe('errorHandler()', function () {
6161
var error = new TypeError('boom!')
6262
var server = createServer(error)
6363
request(server)
64-
.get('/')
65-
.set('Accept', 'text/plain')
66-
.expect(500, error.stack.toString(), done)
64+
.get('/')
65+
.set('Accept', 'text/plain')
66+
.expect(500, error.stack.toString(), done)
6767
})
6868
})
6969

7070
describe('when string', function () {
7171
it('should pass-through string', function (done) {
7272
var server = createServer('boom!')
7373
request(server)
74-
.get('/')
75-
.set('Accept', 'text/plain')
76-
.expect(500, 'boom!', done)
74+
.get('/')
75+
.set('Accept', 'text/plain')
76+
.expect(500, 'boom!', done)
7777
})
7878
})
7979

8080
describe('when number', function () {
8181
it('should stringify number', function (done) {
8282
var server = createServer(42.1)
8383
request(server)
84-
.get('/')
85-
.set('Accept', 'text/plain')
86-
.expect(500, '42.1', done)
84+
.get('/')
85+
.set('Accept', 'text/plain')
86+
.expect(500, '42.1', done)
8787
})
8888
})
8989

9090
describe('when object', function () {
9191
it('should use util.inspect', function (done) {
9292
var server = createServer({hop: 'pop'})
9393
request(server)
94-
.get('/')
95-
.set('Accept', 'text/plain')
96-
.expect(500, '{ hop: \'pop\' }', done)
94+
.get('/')
95+
.set('Accept', 'text/plain')
96+
.expect(500, '{ hop: \'pop\' }', done)
9797
})
9898
})
9999

100100
describe('with "toString" property', function () {
101101
it('should use "toString" value', function (done) {
102102
var server = createServer({toString: function () { return 'boom!' }})
103103
request(server)
104-
.get('/')
105-
.set('Accept', 'text/plain')
106-
.expect(500, 'boom!', done)
104+
.get('/')
105+
.set('Accept', 'text/plain')
106+
.expect(500, 'boom!', done)
107107
})
108108
})
109109
})
@@ -121,24 +121,24 @@ describe('errorHandler()', function () {
121121
describe('when "Accept: text/html"', function () {
122122
it('should return a html response', function (done) {
123123
request(server)
124-
.get('/')
125-
.set('Accept', 'text/html')
126-
.expect('Content-Type', /text\/html/)
127-
.expect(/<title>Error: boom!<\/title>/)
128-
.expect(/<h2><em>500<\/em> Error: boom!<\/h2>/)
129-
.expect(/<li> &nbsp; &nbsp;at/)
130-
.expect(500, done)
124+
.get('/')
125+
.set('Accept', 'text/html')
126+
.expect('Content-Type', /text\/html/)
127+
.expect(/<title>Error: boom!<\/title>/)
128+
.expect(/<h2><em>500<\/em> Error: boom!<\/h2>/)
129+
.expect(/<li> &nbsp; &nbsp;at/)
130+
.expect(500, done)
131131
})
132132

133133
it('should contain inspected object', function (done) {
134134
request(createServer({ foo: 'bar', fizz: 'buzz' }))
135-
.get('/')
136-
.set('Accept', 'text/html')
137-
.expect('Content-Type', /text\/html/)
138-
.expect(/<title>Error<\/title>/)
139-
.expect(/<h2><em>500<\/em> Error<\/h2>/)
140-
.expect(/<li>{ foo: &#39;bar&#39;, fizz: &#39;buzz&#39; }<\/li>/)
141-
.expect(500, done)
135+
.get('/')
136+
.set('Accept', 'text/html')
137+
.expect('Content-Type', /text\/html/)
138+
.expect(/<title>Error<\/title>/)
139+
.expect(/<h2><em>500<\/em> Error<\/h2>/)
140+
.expect(/<li>{ foo: &#39;bar&#39;, fizz: &#39;buzz&#39; }<\/li>/)
141+
.expect(500, done)
142142
})
143143
})
144144

@@ -153,30 +153,30 @@ describe('errorHandler()', function () {
153153
}
154154

155155
request(server)
156-
.get('/')
157-
.set('Accept', 'application/json')
158-
.expect('Content-Type', /application\/json/)
159-
.expect(500, body, done)
156+
.get('/')
157+
.set('Accept', 'application/json')
158+
.expect('Content-Type', /application\/json/)
159+
.expect(500, body, done)
160160
})
161161
})
162162

163163
describe('when "Accept: text/plain"', function () {
164164
it('should return a plain text response', function (done) {
165165
request(server)
166-
.get('/')
167-
.set('Accept', 'text/plain')
168-
.expect('Content-Type', /text\/plain/)
169-
.expect(500, error.stack.toString(), done)
166+
.get('/')
167+
.set('Accept', 'text/plain')
168+
.expect('Content-Type', /text\/plain/)
169+
.expect(500, error.stack.toString(), done)
170170
})
171171
})
172172

173173
describe('when "Accept: x-unknown"', function () {
174174
it('should return a plain text response', function (done) {
175175
request(server)
176-
.get('/')
177-
.set('Accept', 'x-unknown')
178-
.expect('Content-Type', /text\/plain/)
179-
.expect(500, error.stack.toString(), done)
176+
.get('/')
177+
.set('Accept', 'x-unknown')
178+
.expect('Content-Type', /text\/plain/)
179+
.expect(500, error.stack.toString(), done)
180180
})
181181
})
182182
})
@@ -200,8 +200,8 @@ describe('errorHandler()', function () {
200200

201201
it('should not die', function (done) {
202202
request(server)
203-
.get('/')
204-
.expect(200, done)
203+
.get('/')
204+
.expect(200, done)
205205
})
206206
})
207207

@@ -233,9 +233,9 @@ describe('errorHandler()', function () {
233233
}
234234

235235
request(server)
236-
.get('/')
237-
.set('Accept', 'text/plain')
238-
.expect(500, error.stack.toString(), cb)
236+
.get('/')
237+
.set('Accept', 'text/plain')
238+
.expect(500, error.stack.toString(), cb)
239239
})
240240
})
241241
})
@@ -274,9 +274,9 @@ describe('errorHandler(options)', function () {
274274
}
275275

276276
request(server)
277-
.get('/')
278-
.set('Accept', 'text/plain')
279-
.expect(500, error.stack.toString(), done)
277+
.get('/')
278+
.set('Accept', 'text/plain')
279+
.expect(500, error.stack.toString(), done)
280280
})
281281
})
282282

@@ -299,9 +299,9 @@ describe('errorHandler(options)', function () {
299299
}
300300

301301
request(server)
302-
.get('/')
303-
.set('Accept', 'text/plain')
304-
.expect(500, error.stack.toString(), cb)
302+
.get('/')
303+
.set('Accept', 'text/plain')
304+
.expect(500, error.stack.toString(), cb)
305305
})
306306
})
307307
})
@@ -332,9 +332,9 @@ describe('errorHandler(options)', function () {
332332
}
333333

334334
request(server)
335-
.get('/')
336-
.set('Accept', 'text/plain')
337-
.expect(500, error.stack.toString(), cb)
335+
.get('/')
336+
.set('Accept', 'text/plain')
337+
.expect(500, error.stack.toString(), cb)
338338
})
339339
})
340340

@@ -364,9 +364,9 @@ describe('errorHandler(options)', function () {
364364
}
365365

366366
request(server)
367-
.get('/')
368-
.set('Accept', 'text/plain')
369-
.expect(500, error.stack.toString(), done)
367+
.get('/')
368+
.set('Accept', 'text/plain')
369+
.expect(500, error.stack.toString(), done)
370370
})
371371
})
372372

@@ -385,9 +385,9 @@ describe('errorHandler(options)', function () {
385385
}
386386

387387
request(server)
388-
.get('/')
389-
.set('Accept', 'text/plain')
390-
.expect(500, error.stack.toString(), cb)
388+
.get('/')
389+
.set('Accept', 'text/plain')
390+
.expect(500, error.stack.toString(), cb)
391391
})
392392
})
393393
})

0 commit comments

Comments
 (0)