Improve validateParameterSeparator rule

Fix parameter separator validation Closes gh-633
jscs-dev · Sep 16, 2014 · 15dee23 · 15dee23
1 parent 20220f6
commit 15dee23
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/lib/rules/validate-parameter-separator.js b/lib/rules/validate-parameter-separator.js
@@ -6,7 +6,7 @@ module.exports.prototype = {
 
     configure: function(validateParameterSeparator) {
         assert(
-            typeof validateParameterSeparator === 'string' && / ?, ?/.test(validateParameterSeparator),
+            typeof validateParameterSeparator === 'string' && /^[ ]?,[ ]?$/.test(validateParameterSeparator),
             'validateParameterSpacing option requires string value containing only a comma and optional spaces'
         );
 

diff --git a/test/test.validate-parameter-separator.js b/test/test.validate-parameter-separator.js
@@ -9,6 +9,35 @@ describe('rules/validate-parameter-separator', function() {
         checker.registerDefaultRules();
     });
 
+    it('accepts valid separator', function() {
+        var validSeparators = [
+            ',',
+            ' ,',
+            ', ',
+            ' , ',
+        ];
+        validSeparators.forEach(function(sep) {
+            assert.doesNotThrow(function() {
+                checker.configure({ validateParameterSeparator: sep });
+            });
+        });
+    });
+
+    it('rejects invalid separator', function() {
+        var invalidSeparators = [
+            'x,',
+            ',x',
+            'x,x',
+            '  ,',
+            ',  ',
+        ];
+        invalidSeparators.forEach(function(sep) {
+            assert.throws(function() {
+                checker.configure({ validateParameterSeparator: sep });
+            }, assert.AssertionError);
+        });
+    });
+
     describe('(comma)', function() {
         it('should report unexpected space for function a(b, c) {}', function() {
             checker.configure({ validateParameterSeparator: ',' });