escape periods in regex when that's what you mean

zackdever · Sep 16, 2012 · 744e8ea · 744e8ea
1 parent d90d12e
commit 744e8ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/test/time.test.js b/test/time.test.js
@@ -41,6 +41,15 @@ describe('Time', function() {
       }
     });
 
+    it('should fail with bogus am/pm values', function() {
+      time('8ap').isValid().should.not.be.ok;
+      time('ap').isValid().should.not.be.ok;
+      time('a').isValid().should.not.be.ok;
+      time('am').isValid().should.not.be.ok;
+      time('a.m.').isValid().should.not.be.ok;
+      time('2 ama').isValid().should.not.be.ok;
+    });
+
     it('should pass all the hours with all the minutes 1:00 - 12:59', function() {
       var hour, minute, result, input;
       for (var i = 0; i < hours.length; i++) {

diff --git a/time.js b/time.js
@@ -1,8 +1,5 @@
 (function() {
 
-  // TODO support military time
-  // TODO make military time optional
-  // TODO make british delineation optional
   var am = 'am'
     , pm = 'pm';
 
@@ -11,7 +8,7 @@
   else window.Time = Time;
 
   // what you might expect to be a valid time e.g. 2, 2:00a, 12:18, 4.23 p.m.
-  Time.re = /^(10|11|12|[1-9])(?::|\.)?([0-5][0-9])?([ap].?(m.?)?)?$/;
+  Time.re = /^(10|11|12|[1-9])(?::|\.)?([0-5][0-9])?([ap]\.?(m\.?)?)?$/;
 
   /*
    * Time constructor works with(out) 'new'