Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update eslint to version 1.7.3 🚀 #1852

Merged
merged 2 commits into from Oct 30, 2015
Merged

Update eslint to version 1.7.3 🚀 #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
727b305
chore(package): update eslint to version 1.7.3
greenkeeperio-bot Oct 21, 2015
cceaa6e
Fix indentation issues according to eslint@1.7.3
simov Oct 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
},
"rules": {
// 2-space indentation
"indent": [2, 2],
"indent": [2, 2, {"SwitchCase": 1}],
// Disallow semi-colons, unless needed to disambiguate statement
"semi": [2, "never"],
// Require strings to use single quotes
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@
"buffer-equal": "^0.0.1",
"codecov.io": "^0.1.6",
"coveralls": "^2.11.4",
"eslint": "0.18.0",
"eslint": "1.7.3",
"function-bind": "^1.0.2",
"istanbul": "^0.4.0",
"karma-browserify": "^4.4.0",
Expand Down
100 changes: 50 additions & 50 deletions tests/test-body.js
View file
Open in desktop
Expand Up @@ -29,76 +29,76 @@ function addTest(name, data) {
}

addTest('testGet', {
resp : server.createGetResponse('TESTING!')
resp : server.createGetResponse('TESTING!')
, expectBody: 'TESTING!'
})

addTest('testGetChunkBreak', {
resp : server.createChunkResponse(
[ new Buffer([239])
, new Buffer([163])
, new Buffer([191])
, new Buffer([206])
, new Buffer([169])
, new Buffer([226])
, new Buffer([152])
, new Buffer([131])
])
resp : server.createChunkResponse(
[ new Buffer([239])
, new Buffer([163])
, new Buffer([191])
, new Buffer([206])
, new Buffer([169])
, new Buffer([226])
, new Buffer([152])
, new Buffer([131])
])
, expectBody: '\uF8FF\u03A9\u2603'
})

addTest('testGetBuffer', {
resp : server.createGetResponse(new Buffer('TESTING!'))
resp : server.createGetResponse(new Buffer('TESTING!'))
, encoding: null
, expectBody: new Buffer('TESTING!')
})

addTest('testGetEncoding', {
resp : server.createGetResponse(new Buffer('efa3bfcea9e29883', 'hex'))
resp : server.createGetResponse(new Buffer('efa3bfcea9e29883', 'hex'))
, encoding: 'hex'
, expectBody: 'efa3bfcea9e29883'
})

addTest('testGetUTF', {
resp: server.createGetResponse(new Buffer([0xEF, 0xBB, 0xBF, 226, 152, 131]))
, encoding: 'utf8'
, expectBody: '\u2603'
resp: server.createGetResponse(new Buffer([0xEF, 0xBB, 0xBF, 226, 152, 131]))
, encoding: 'utf8'
, expectBody: '\u2603'
})

addTest('testGetJSON', {
resp : server.createGetResponse('{"test":true}', 'application/json')
, json : true
, expectBody: {'test':true}
resp : server.createGetResponse('{"test":true}', 'application/json')
, json : true
, expectBody: {'test':true}
})

addTest('testPutString', {
resp : server.createPostValidator('PUTTINGDATA')
resp : server.createPostValidator('PUTTINGDATA')
, method : 'PUT'
, body : 'PUTTINGDATA'
})

addTest('testPutBuffer', {
resp : server.createPostValidator('PUTTINGDATA')
resp : server.createPostValidator('PUTTINGDATA')
, method : 'PUT'
, body : new Buffer('PUTTINGDATA')
})

addTest('testPutJSON', {
resp : server.createPostValidator(JSON.stringify({foo: 'bar'}))
resp : server.createPostValidator(JSON.stringify({foo: 'bar'}))
, method: 'PUT'
, json: {foo: 'bar'}
})

addTest('testPutMultipart', {
resp: server.createPostValidator(
'--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--'
)
resp: server.createPostValidator(
'--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--'
)
, method: 'PUT'
, multipart:
[ {'content-type': 'text/html', 'body': '<html><body>Oh hi.</body></html>'}
Expand All @@ -107,15 +107,15 @@ addTest('testPutMultipart', {
})

addTest('testPutMultipartPreambleCRLF', {
resp: server.createPostValidator(
'\r\n--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--'
)
resp: server.createPostValidator(
'\r\n--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--'
)
, method: 'PUT'
, preambleCRLF: true
, multipart:
Expand All @@ -125,16 +125,16 @@ addTest('testPutMultipartPreambleCRLF', {
})

addTest('testPutMultipartPostambleCRLF', {
resp: server.createPostValidator(
'\r\n--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--' +
'\r\n'
)
resp: server.createPostValidator(
'\r\n--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--' +
'\r\n'
)
, method: 'PUT'
, preambleCRLF: true
, postambleCRLF: true
Expand Down
48 changes: 24 additions & 24 deletions tests/test-https.js
View file
Open in desktop
Expand Up @@ -50,58 +50,58 @@ function runAllTests(strict, s) {
}

runTest('testGet', {
resp : server.createGetResponse('TESTING!')
resp : server.createGetResponse('TESTING!')
, expectBody: 'TESTING!'
})

runTest('testGetChunkBreak', {
resp : server.createChunkResponse(
[ new Buffer([239])
, new Buffer([163])
, new Buffer([191])
, new Buffer([206])
, new Buffer([169])
, new Buffer([226])
, new Buffer([152])
, new Buffer([131])
])
resp : server.createChunkResponse(
[ new Buffer([239])
, new Buffer([163])
, new Buffer([191])
, new Buffer([206])
, new Buffer([169])
, new Buffer([226])
, new Buffer([152])
, new Buffer([131])
])
, expectBody: '\uf8ff\u03a9\u2603'
})

runTest('testGetJSON', {
resp : server.createGetResponse('{"test":true}', 'application/json')
resp : server.createGetResponse('{"test":true}', 'application/json')
, json : true
, expectBody: {'test':true}
})

runTest('testPutString', {
resp : server.createPostValidator('PUTTINGDATA')
resp : server.createPostValidator('PUTTINGDATA')
, method : 'PUT'
, body : 'PUTTINGDATA'
})

runTest('testPutBuffer', {
resp : server.createPostValidator('PUTTINGDATA')
resp : server.createPostValidator('PUTTINGDATA')
, method : 'PUT'
, body : new Buffer('PUTTINGDATA')
})

runTest('testPutJSON', {
resp : server.createPostValidator(JSON.stringify({foo: 'bar'}))
resp : server.createPostValidator(JSON.stringify({foo: 'bar'}))
, method: 'PUT'
, json: {foo: 'bar'}
})

runTest('testPutMultipart', {
resp: server.createPostValidator(
'--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--'
)
resp: server.createPostValidator(
'--__BOUNDARY__\r\n' +
'content-type: text/html\r\n' +
'\r\n' +
'<html><body>Oh hi.</body></html>' +
'\r\n--__BOUNDARY__\r\n\r\n' +
'Oh hi.' +
'\r\n--__BOUNDARY__--'
)
, method: 'PUT'
, multipart:
[ {'content-type': 'text/html', 'body': '<html><body>Oh hi.</body></html>'}
Expand Down
10 changes: 5 additions & 5 deletions tests/test-multipart.js
View file
Open in desktop
Expand Up @@ -72,11 +72,11 @@ function runTest(t, a) {

// @NOTE: multipartData properties must be set here so that my_file read stream does not leak in node v0.8
multipartData = [
{name: 'my_field', body: 'my_value'},
{name: 'my_buffer', body: new Buffer([1, 2, 3])},
{name: 'my_file', body: fs.createReadStream(localFile)},
{name: 'remote_file', body: request('http://localhost:6767/file')}
]
{name: 'my_field', body: 'my_value'},
{name: 'my_buffer', body: new Buffer([1, 2, 3])},
{name: 'my_file', body: fs.createReadStream(localFile)},
{name: 'remote_file', body: request('http://localhost:6767/file')}
]

var reqOptions = {
url: 'http://localhost:6767/upload',
Expand Down