cleaned up expected numberSequence error message grammar

youngnh · Apr 8, 2010 · a6b6326 · a6b6326
1 parent ad238d1
commit a6b6326
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/QuickPietJS/lib/validations.js b/QuickPietJS/lib/validations.js
@@ -23,7 +23,8 @@ Validations = {
 	    results.push(parseInt(value));
 	});
 	if(length && results.length != length) {
-	    throw new SyntaxError("Expected " + length + " integers, but found " + results.length);
+	    var clause = length == 1 ? (length + " integer,") : (length + " integers,");
+	    throw new SyntaxError("Expected " + clause + " but found " + results.length);
 	}
 	return results;
     },

diff --git a/QuickPietJS/spec/unit/validations.spec.js b/QuickPietJS/spec/unit/validations.spec.js
@@ -38,6 +38,10 @@ describe 'Validations'
 	    -{ Validations.numberSequence('9 3 2', 2)}.should.throw_error SyntaxError, "Expected 2 integers, but found 3"
 	    Validations.numberSequence('9 3', 2).should.eql [9, 3]
 	end
+
+	it 'should use proper grammar in exception message'
+	    -{ Validations.numberSequence('9 1', 1)}.should.throw_error SyntaxError, "Expected 1 integer, but found 2"
+	end
     end
 
     describe 'positive'