Merge pull request #1852 from request/greenkeeper-eslint-1.7.3

Update eslint to version 1.7.3 🚀
request · Oct 30, 2015 · 1adf200 · 1adf200
2 parents 30fcf67 + cceaa6e
commit 1adf200
Show file tree

Hide file tree

Showing 8 changed files with 147 additions and 147 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -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

diff --git a/package.json b/package.json
@@ -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",

diff --git a/tests/test-body.js b/tests/test-body.js
@@ -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>'}
@@ -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:
@@ -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

diff --git a/tests/test-https.js b/tests/test-https.js
@@ -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>'}

diff --git a/tests/test-multipart.js b/tests/test-multipart.js
@@ -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',