From e3f9335c407602f7bd5f61a8697198d05cb5653b Mon Sep 17 00:00:00 2001 From: Roman Reiss Date: Sun, 28 Jun 2015 17:42:35 +0200 Subject: [PATCH] tools: re-enable comma-spacing linter rule The rule was disabled because of an eslint bug which is now resolved. All code in lib was already conforming and only test code needed a few changes to make the linter happy with this rule enabled. Ref: https://github.com/eslint/eslint/issues/2408 PR-URL: https://github.com/nodejs/io.js/pull/2072 Reviewed-By: Yosuke Furukawa Reviewed-by: Colin Ihrig Reviewed-By: Alex Kocharin --- .eslintrc | 3 +-- test/parallel/test-dgram-oob-buffer.js | 2 +- test/parallel/test-domain-http-server.js | 2 +- test/parallel/test-fs-mkdir.js | 2 +- test/parallel/test-http-server-multiheaders.js | 6 +++--- test/parallel/test-sys.js | 2 +- test/parallel/test-tls-npn-server-client.js | 6 +++--- test/parallel/test-tls-session-cache.js | 4 ++-- test/parallel/test-util-log.js | 2 +- test/parallel/test-zlib-dictionary-fail.js | 4 ++-- test/sequential/test-tls-honorcipherorder.js | 2 +- 11 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.eslintrc b/.eslintrc index 9ff3f48aece491..c90fa5e57ad13e 100644 --- a/.eslintrc +++ b/.eslintrc @@ -43,8 +43,7 @@ rules: ## 2 space indentation indent: [2, 2] ## add space after comma - ## set to 'warn' because of https://github.com/eslint/eslint/issues/2408 - comma-spacing: 1 + comma-spacing: 2 ## put semi-colon semi: 2 ## require spaces operator like var sum = 1 + 1; diff --git a/test/parallel/test-dgram-oob-buffer.js b/test/parallel/test-dgram-oob-buffer.js index b64c7236afd4bc..e873715e4e14de 100644 --- a/test/parallel/test-dgram-oob-buffer.js +++ b/test/parallel/test-dgram-oob-buffer.js @@ -8,7 +8,7 @@ var assert = require('assert'); var dgram = require('dgram'); var socket = dgram.createSocket('udp4'); -var buf = Buffer([1,2,3,4]); +var buf = Buffer([1, 2, 3, 4]); function ok() {} socket.send(buf, 0, 0, common.PORT, '127.0.0.1', ok); // useful? no diff --git a/test/parallel/test-domain-http-server.js b/test/parallel/test-domain-http-server.js index 7cabf205e8f51c..99dbf413e3a4f8 100644 --- a/test/parallel/test-domain-http-server.js +++ b/test/parallel/test-domain-http-server.js @@ -4,7 +4,7 @@ var http = require('http'); var assert = require('assert'); var common = require('../common'); -var objects = { foo: 'bar', baz: {}, num: 42, arr: [1,2,3] }; +var objects = { foo: 'bar', baz: {}, num: 42, arr: [1, 2, 3] }; objects.baz.asdf = objects; var serverCaught = 0; diff --git a/test/parallel/test-fs-mkdir.js b/test/parallel/test-fs-mkdir.js index 91a5a63fa59f54..ae13b9bc7a071d 100644 --- a/test/parallel/test-fs-mkdir.js +++ b/test/parallel/test-fs-mkdir.js @@ -36,7 +36,7 @@ common.refreshTmpDir(); unlink(pathname); - fs.mkdir(pathname, 511 /*=0777*/, function(err) { + fs.mkdir(pathname, 0o777, function(err) { assert.equal(err, null); assert.equal(common.fileExists(pathname), true); ncalls++; diff --git a/test/parallel/test-http-server-multiheaders.js b/test/parallel/test-http-server-multiheaders.js index 440e10533787fd..7033ef8e7079f2 100644 --- a/test/parallel/test-http-server-multiheaders.js +++ b/test/parallel/test-http-server-multiheaders.js @@ -38,9 +38,9 @@ srv.listen(common.PORT, function() { ['www-authenticate', 'foo'], ['WWW-Authenticate', 'bar'], ['WWW-AUTHENTICATE', 'baz'], - ['proxy-authenticate','foo'], - ['Proxy-Authenticate','bar'], - ['PROXY-AUTHENTICATE','baz'], + ['proxy-authenticate', 'foo'], + ['Proxy-Authenticate', 'bar'], + ['PROXY-AUTHENTICATE', 'baz'], ['x-foo', 'bingo'], ['x-bar', 'banjo'], ['x-bar', 'bango'], diff --git a/test/parallel/test-sys.js b/test/parallel/test-sys.js index a5631a5cb16930..bbc8c092002af6 100644 --- a/test/parallel/test-sys.js +++ b/test/parallel/test-sys.js @@ -75,7 +75,7 @@ assert.equal('{ readonly: [Getter] }', common.inspect({get readonly() {}})); assert.equal('{ readwrite: [Getter/Setter] }', - common.inspect({get readwrite() {},set readwrite(val) {}})); + common.inspect({get readwrite() {}, set readwrite(val) {}})); assert.equal('{ writeonly: [Setter] }', common.inspect({set writeonly(val) {}})); diff --git a/test/parallel/test-tls-npn-server-client.js b/test/parallel/test-tls-npn-server-client.js index bebb6799b9f49c..6e877b7ddef19f 100644 --- a/test/parallel/test-tls-npn-server-client.js +++ b/test/parallel/test-tls-npn-server-client.js @@ -47,20 +47,20 @@ var clientsOptions = [{ crl: serverOptions.crl, NPNProtocols: ['a', 'b', 'c'], rejectUnauthorized: false -},{ +}, { port: serverPort, key: serverOptions.key, cert: serverOptions.cert, crl: serverOptions.crl, NPNProtocols: ['c', 'b', 'e'], rejectUnauthorized: false -},{ +}, { port: serverPort, key: serverOptions.key, cert: serverOptions.cert, crl: serverOptions.crl, rejectUnauthorized: false -},{ +}, { port: serverPort, key: serverOptions.key, cert: serverOptions.cert, diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js index 7ba063a3a029af..9b3da2717096be 100644 --- a/test/parallel/test-tls-session-cache.js +++ b/test/parallel/test-tls-session-cache.js @@ -11,8 +11,8 @@ if (!common.hasCrypto) { process.exit(); } -doTest({ tickets: false } , function() { - doTest({ tickets: true } , function() { +doTest({ tickets: false }, function() { + doTest({ tickets: true }, function() { console.error('all done'); }); }); diff --git a/test/parallel/test-util-log.js b/test/parallel/test-util-log.js index fbe3963348adb9..9285e3e3409e99 100644 --- a/test/parallel/test-util-log.js +++ b/test/parallel/test-util-log.js @@ -21,7 +21,7 @@ var tests = [ {input: function() {}, output: '[Function]'}, {input: parseInt('not a number', 10), output: 'NaN'}, {input: {answer: 42}, output: '{ answer: 42 }'}, - {input: [1,2,3], output: '[ 1, 2, 3 ]'} + {input: [1, 2, 3], output: '[ 1, 2, 3 ]'} ]; // test util.log() diff --git a/test/parallel/test-zlib-dictionary-fail.js b/test/parallel/test-zlib-dictionary-fail.js index ced829f8d49963..b4a344ceef5bb9 100644 --- a/test/parallel/test-zlib-dictionary-fail.js +++ b/test/parallel/test-zlib-dictionary-fail.js @@ -12,7 +12,7 @@ var zlib = require('zlib'); })); // String "test" encoded with dictionary "dict". - stream.write(Buffer([0x78,0xBB,0x04,0x09,0x01,0xA5])); + stream.write(Buffer([0x78, 0xBB, 0x04, 0x09, 0x01, 0xA5])); })(); // Should raise an error, not trigger an assertion in src/node_zlib.cc @@ -24,5 +24,5 @@ var zlib = require('zlib'); })); // String "test" encoded with dictionary "dict". - stream.write(Buffer([0x78,0xBB,0x04,0x09,0x01,0xA5])); + stream.write(Buffer([0x78, 0xBB, 0x04, 0x09, 0x01, 0xA5])); })(); diff --git a/test/sequential/test-tls-honorcipherorder.js b/test/sequential/test-tls-honorcipherorder.js index c33cd9eea63465..7e93ac5a059150 100644 --- a/test/sequential/test-tls-honorcipherorder.js +++ b/test/sequential/test-tls-honorcipherorder.js @@ -57,7 +57,7 @@ test1(); function test1() { // Client has the preference of cipher suites by default - test(false, 'AES256-SHA:DES-CBC-SHA:RC4-SHA','AES256-SHA', test2); + test(false, 'AES256-SHA:DES-CBC-SHA:RC4-SHA', 'AES256-SHA', test2); } function test2() {