Docs and tests for #99

diff --git a/sitesrc/docs.jade b/sitesrc/docs.jade
index 7f6b9ff60cb78a6a33589469abf247bee909325b..a5a0c606c1fb1cdf04d01f389957f7ae3c85b979 100644 (file)
--- a/sitesrc/docs.jade
+++ b/sitesrc/docs.jade
@@ -51,6 +51,8 @@ block content
           a(href="#/manipulation/add") Add
         li
           a(href="#/manipulation/subtract") Subtract
+        li
+          a(href="#/manipulation/milliseconds") Milliseconds
         li
           a(href="#/manipulation/seconds") Seconds
         li
@@ -79,6 +81,8 @@ block content
           a(href="#/display/native") Native Date
         li
           a(href="#/display/valueOf") Value
+        li
+          a(href="#/display/milliseconds") Milliseconds
         li
           a(href="#/display/seconds") Seconds
         li
@@ -408,17 +412,23 @@ block content
       pre moment().subtract('days', 7);
 
 
-      a(name="/manipulation/seconds")
+      a(name="/manipulation/milliseconds")
       h3
-        span Seconds
+        span Milliseconds
       p There are a number of shortcut getter and setter functions. 
         | Much like in jQuery, calling the function without paremeters causes it to function as a getter, 
         | and calling with a parameter causes it to function as a setter.
       p These map to the corresponding function on the native 
         code Date
         | object.
-      pre moment().seconds(30) === new Date().setSeconds(30);\n
-        | moment().seconds() === new Date().getSeconds();
+      pre moment().milliseconds(30) === new Date().setMilliseconds(30);\n
+        | moment().milliseconds() === new Date().getMilliseconds();
+
+
+      a(name="/manipulation/seconds")
+      h3
+        span Seconds
+      pre moment().seconds(30); // set the seconds to 30
 
 
       a(name="/manipulation/minutes")
@@ -791,16 +801,22 @@ block content
       pre moment(1318874398806).valueOf(); // 1318874398806
 
 
-      a(name="/display/seconds")
+      a(name="/display/milliseconds")
       h3
-        span Seconds
+        span Milliseconds
       p These are the getters mentioned in the 
-        a(href="#/manipulation/seconds") Manipulation
+        a(href="#/manipulation/milliseconds") Manipulation
         | section above.
       p These map to the corresponding function on the native 
         code Date
         | object.
-      pre moment().seconds() === new Date().getSeconds();
+      pre moment().milliseconds() === new Date().getMilliseconds();
+
+
+      a(name="/display/seconds")
+      h3
+        span Seconds
+      pre moment().minutes(); // get the seconds
 
 
       a(name="/display/minutes")

diff --git a/sitesrc/js/unit-tests.js b/sitesrc/js/unit-tests.js
index 48d3056c8d615159241b092cd7914a6a6b6c22ff..eff2c5e919a45b94db8752e6ac3429a15c6b3dde 100755 (executable)
--- a/sitesrc/js/unit-tests.js
+++ b/sitesrc/js/unit-tests.js
@@ -144,9 +144,10 @@ test("add and subtract short", 12, function() {
     a.hours(6);
     a.minutes(7);
     a.seconds(8);
+    a.milliseconds(500);
 
-    equal(a.add({ms:1000}).seconds(), 9, 'Add milliseconds');
-    equal(a.add({s:1}).seconds(), 10, 'Add seconds');
+    equal(a.add({ms:50}).milliseconds(), 550, 'Add milliseconds');
+    equal(a.add({s:1}).seconds(), 9, 'Add seconds');
     equal(a.add({m:1}).minutes(), 8, 'Add minutes');
     equal(a.add({h:1}).hours(), 7, 'Add hours');
     equal(a.add({d:1}).date(), 13, 'Add date');
@@ -171,9 +172,10 @@ test("add and subtract long", 8, function() {
     a.hours(6);
     a.minutes(7);
     a.seconds(8);
+    a.milliseconds(500);
 
-    equal(a.add({milliseconds:1000}).seconds(), 9, 'Add milliseconds');
-    equal(a.add({seconds:1}).seconds(), 10, 'Add seconds');
+    equal(a.add({milliseconds:50}).milliseconds(), 550, 'Add milliseconds');
+    equal(a.add({seconds:1}).seconds(), 9, 'Add seconds');
     equal(a.add({minutes:1}).minutes(), 8, 'Add minutes');
     equal(a.add({hours:1}).hours(), 7, 'Add hours');
     equal(a.add({days:1}).date(), 13, 'Add date');
@@ -190,9 +192,10 @@ test("add and subtract string short", 8, function() {
     a.hours(6);
     a.minutes(7);
     a.seconds(8);
+    a.milliseconds(500);
 
-    equal(a.add('milliseconds', 1000).seconds(), 9, 'Add milliseconds');
-    equal(a.add('seconds', 1).seconds(), 10, 'Add seconds');
+    equal(a.add('milliseconds', 50).milliseconds(), 550, 'Add milliseconds');
+    equal(a.add('seconds', 1).seconds(), 9, 'Add seconds');
     equal(a.add('minutes', 1).minutes(), 8, 'Add minutes');
     equal(a.add('hours', 1).hours(), 7, 'Add hours');
     equal(a.add('days', 1).date(), 13, 'Add date');
@@ -209,9 +212,10 @@ test("add and subtract string short", 8, function() {
     a.hours(6);
     a.minutes(7);
     a.seconds(8);
+    a.milliseconds(500);
 
-    equal(a.add('ms', 1000).seconds(), 9, 'Add milliseconds');
-    equal(a.add('s', 1).seconds(), 10, 'Add seconds');
+    equal(a.add('ms', 50).milliseconds(), 550, 'Add milliseconds');
+    equal(a.add('s', 1).seconds(), 9, 'Add seconds');
     equal(a.add('m', 1).minutes(), 8, 'Add minutes');
     equal(a.add('h', 1).hours(), 7, 'Add hours');
     equal(a.add('d', 1).date(), 13, 'Add date');
@@ -296,8 +300,8 @@ test("leap year", 4, function() {
 module("getters and setters");
 
 
-test("getters", 7, function() {
-    var a = moment([2011, 9, 12, 6, 7, 8]);
+test("getters", 8, function() {
+    var a = moment([2011, 9, 12, 6, 7, 8, 9]);
     equal(a.year(), 2011, 'year');
     equal(a.month(), 9, 'month');
     equal(a.date(), 12, 'date');
@@ -305,9 +309,10 @@ test("getters", 7, function() {
     equal(a.hours(), 6, 'hour');
     equal(a.minutes(), 7, 'minute');
     equal(a.seconds(), 8, 'second');
+    equal(a.milliseconds(), 9, 'milliseconds');
 });
 
-test("setters", 7, function() {
+test("setters", 8, function() {
     var a = moment();
     a.year(2011);
     a.month(9);
@@ -315,6 +320,7 @@ test("setters", 7, function() {
     a.hours(6);
     a.minutes(7);
     a.seconds(8);
+    a.milliseconds(9);
     equal(a.year(), 2011, 'year');
     equal(a.month(), 9, 'month');
     equal(a.date(), 12, 'date');
@@ -322,6 +328,7 @@ test("setters", 7, function() {
     equal(a.hours(), 6, 'hour');
     equal(a.minutes(), 7, 'minute');
     equal(a.seconds(), 8, 'second');
+    equal(a.milliseconds(), 9, 'milliseconds');
 });
 
 test("setters - falsey values", 1, function() {