moment · ichernev · Dec 29, 2013 · Nov 23, 2013 · Nov 23, 2013 · Nov 24, 2013
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ node_modules/
 .DS_Store
 min/moment+customlangs.js
 min/moment+customlangs.min.js
+min/tests.js
+sauce_connect.log
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,13 @@
 language: node_js
 node_js:
   - 0.8
+
+env:
+  global:
+    - secure: "CIzz5komT5c6Y8EoOhYo4CvV8ryQ78gfmZQgSKe2cTeUJU0Hr/kxqqe2W0LYx8bkCqJbuzZQ4Awh6drD+03jCqrHN1r4YHoX61eVnqe2ijAhyRh6i45CzjiUlKROTztFU9mDNAOQpOhItE1Zjj3oL0F/b6AC8UKIRTcHuSOPD34="
+    - secure: "EhJqzT4RueTZ85zbM3MhY6Ziut2t220UsABIwLSWDTgNyn3Kiqx+Z6Lc0YMm1XDe2Srxj3EY77ujzkMp8oYEc5RGW+ZpbJlCyZjNceb/ntb6RuPqXd7ZnE9Ir1cyudCHus8XIBiXWKKVTnPUw6J+ySXyigoi1rz2G5j4guzXXJ0="
+
 before_script:
   - npm install -g grunt-cli
+
+script: grunt build:travis
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,8 +19,87 @@ module.exports = function (grunt) {
             langs: {
                 src: 'lang/*.js',
                 dest: 'min/langs.js'
+            },
+            tests: {
+                src: [
+                    'test/browser-prefix.js',
+                    'test/moment/*.js',
+                    'test/lang/*.js',
+                    'test/browser-suffix.js'
+                ],
+                dest: 'min/tests.js'
+            }
+        },
+        env : {
+            sauceLabs : (grunt.file.exists('.sauce-labs.creds') ?
+                    grunt.file.readJSON('.sauce-labs.creds') : {})
+        },
+        karma : {
+            options: {
+                frameworks: ['nodeunit'],
+                files: [
+                    'min/moment-with-langs.js',
+                    'min/tests.js',
+                    'test/browser.js'
+                ],
+                sauceLabs: {
+                    startConnect: true,
+                    testName: 'MomentJS'
+                },
+                customLaunchers: {
+                    sl_chrome_win_xp: {
+                        base: 'SauceLabs',
+                        browserName: 'chrome',
+                        platform: 'Windows XP'
+                    },
+                    sl_ie9_win7: {
+                        base: 'SauceLabs',
+                        browserName: 'internet explorer',
+                        platform: 'Windows 7',
+                        version: '9'
+                    },
+                    sl_ie8_win7: {
+                        base: 'SauceLabs',
+                        browserName: 'internet explorer',
+                        platform: 'Windows 7',
+                        version: '8'
+                    },
+                    sl_ff_linux: {
+                        base: 'SauceLabs',
+                        browserName: 'firefox',
+                        platform: 'Linux'
+                    },
+                    sl_safari_osx: {
+                        base: 'SauceLabs',
+                        browserName: 'safari',
+                        platform: 'OS X 10.8'
+                    }
+                }
+            },
+            server: {
+                browsers: []
+            },
+            chrome: {
+                singleRun: true,
+                browsers: ['Chrome']
+            },
+            firefox: {
+                singleRun: true,
+                browsers: ['Firefox']
+            },
+            sauce: {
+                options: {reporters: ['dots']},
+                singleRun: true,
+                browsers: [
+                    'sl_chrome_win_xp',
+                    'sl_ie9_win7',
+                    'sl_ie8_win7',
+                    'sl_ff_linux',
+                    'sl_safari_osx'
+                ]
             }
         },
+
         uglify : {
             target: {
                 files: {
@@ -43,10 +122,13 @@ module.exports = function (grunt) {
             }
         },
         nodeunit : {
-            all : ["test/**/*.js"]
+            all : ["test/moment/**/*.js", "test/lang/**/*.js"]
         },
         jshint: {
-            all: ["Gruntfile.js", "moment.js", "lang/**/*.js", "test/**/*.js"],
+            all: [
+                "Gruntfile.js", "moment.js", "lang/**/*.js", "test/**/*.js",
+                "!test/browser*.js"
+            ],
             options: {
                 "node"     : true,
                 "browser"  : true,
@@ -71,6 +153,7 @@ module.exports = function (grunt) {
                 "sub"      : true,
                 "strict"   : false,
                 "white"    : true,
+                "es3"      : true,
                 "globals": {
                     "define": false
                 }
@@ -105,12 +188,28 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-env');
+    grunt.loadNpmTasks('grunt-karma');
 
     // Default task.
     grunt.registerTask('default', ['jshint', 'nodeunit']);
-    grunt.registerTask('test', ['nodeunit']);
+
+    //test tasks
+    grunt.registerTask('test', ['test:node', 'test:browser']);
+    grunt.registerTask('test:node', ['nodeunit']);
+    grunt.registerTask('test:server', ['concat', 'embed_languages', 'karma:server']);
+    grunt.registerTask('test:browser', ['concat', 'embed_languages', 'karma:chrome', 'karma:firefox']);
+    grunt.registerTask('test:sauce-browser', ['concat', 'embed_languages', 'env:sauceLabs', 'karma:sauce']);
+    grunt.registerTask('test:travis-sauce-browser', ['concat', 'embed_languages', 'karma:sauce']);
+
+    // travis build task
+    grunt.registerTask('build:travis', [
+        'jshint', 'test:node', 'test:travis-sauce-browser'
+    ]);
 
     // Task to be run when releasing a new version
-    grunt.registerTask('release', ['jshint', 'nodeunit', 'concat',
+    grunt.registerTask('release', [
-            'embed_languages', 'component', 'uglify']);
+        'jshint', 'nodeunit', 'concat', 'embed_languages',
+        'component', 'uglify'
+    ]);
 };
diff --git a/min/moment-with-langs.js b/min/moment-with-langs.js
@@ -62,15 +62,16 @@
 
         // iso 8601 regex
         // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
-        isoRegex = /^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
+        isoRegex = /^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
 
         isoFormat = 'YYYY-MM-DDTHH:mm:ssZ',
 
         isoDates = [
-            'YYYY-MM-DD',
+            ['YYYYYY-MM-DD', /[+-]\d{6}-\d{2}-\d{2}/],
-            'GGGG-[W]WW',
+            ['YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/],
-            'GGGG-[W]WW-E',
+            ['GGGG-[W]WW-E', /\d{4}-W\d{2}-\d/],
-            'YYYY-DDD'
+            ['GGGG-[W]WW', /\d{4}-W\d{2}/],
+            ['YYYY-DDD', /\d{4}-\d{3}/]
         ],
 
         // iso time formats and regexes
@@ -366,7 +367,7 @@
     // left zero fill a number
     // see http://jsperf.com/left-zero-filling for performance comparison
     function leftZeroFill(number, targetLength, forceSign) {
-        var output = Math.abs(number) + '',
+        var output = '' + Math.abs(number),
             sign = number >= 0;
 
         while (output.length < targetLength) {
@@ -1342,20 +1343,20 @@
 
     // date from iso format
     function makeDateFromString(config) {
-        var i,
+        var i, l,
             string = config._i,
             match = isoRegex.exec(string);
 
         if (match) {
             config._pf.iso = true;
-            for (i = 4; i > 0; i--) {
+            for (i = 0, l = isoDates.length; i < l; i++) {
-                if (match[i]) {
+                if (isoDates[i][1].exec(string)) {
                     // match[5] should be "T" or undefined
-                    config._f = isoDates[i - 1] + (match[6] || " ");
+                    config._f = isoDates[i][0] + (match[6] || " ");
                     break;
                 }
             }
-            for (i = 0; i < 4; i++) {
+            for (i = 0, l = isoTimes.length; i < l; i++) {
                 if (isoTimes[i][1].exec(string)) {
                     config._f += isoTimes[i][0];
                     break;
@@ -1496,11 +1497,7 @@
 
     //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
     function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) {
-        // The only solid way to create an iso date from year is to use
+        var d = makeUTCDate(year, 0, 1).getUTCDay(), daysToAdd, dayOfYear;
-        // a string format (Date.UTC handles only years > 1900). Don't ask why
-        // it doesn't need Z at the end.
-        var d = new Date(leftZeroFill(year, 6, true) + '-01-01').getUTCDay(),
-            daysToAdd, dayOfYear;
 
         weekday = weekday != null ? weekday : firstDayOfWeek;
         daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0);

diff --git a/moment.js b/moment.js
@@ -71,7 +71,7 @@
             ['YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/],
             ['GGGG-[W]WW-E', /\d{4}-W\d{2}-\d/],
             ['GGGG-[W]WW', /\d{4}-W\d{2}/],
-            ['YYYY-DDD', /\d{4}-\d{3}/],
+            ['YYYY-DDD', /\d{4}-\d{3}/]
         ],
 
         // iso time formats and regexes
@@ -367,7 +367,7 @@
     // left zero fill a number
     // see http://jsperf.com/left-zero-filling for performance comparison
     function leftZeroFill(number, targetLength, forceSign) {
-        var output = Math.abs(number) + '',
+        var output = '' + Math.abs(number),
             sign = number >= 0;
 
         while (output.length < targetLength) {
@@ -1497,11 +1497,7 @@
 
     //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
     function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) {
-        // The only solid way to create an iso date from year is to use
+        var d = makeUTCDate(year, 0, 1).getUTCDay(), daysToAdd, dayOfYear;
-        // a string format (Date.UTC handles only years > 1900). Don't ask why
-        // it doesn't need Z at the end.
-        var d = new Date(leftZeroFill(year, 6, true) + '-01-01').getUTCDay(),
-            daysToAdd, dayOfYear;
 
         weekday = weekday != null ? weekday : firstDayOfWeek;
         daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0);

diff --git a/package.json b/package.json
@@ -37,19 +37,26 @@
             "type" : "MIT"
         }
     ],
-    "devDependencies" : {
+    "devDependencies": {
-        "uglify-js" : "latest",
+        "uglify-js": "latest",
-        "grunt"     : "latest",
+        "grunt": "latest",
-        "nodeunit"  : "latest",
+        "nodeunit": "latest",
-        "grunt-contrib-jshint"    : "latest",
+        "grunt-contrib-jshint": "latest",
-        "grunt-contrib-nodeunit"  : "latest",
+        "grunt-contrib-nodeunit": "latest",
-        "grunt-contrib-concat"    : "latest",
+        "grunt-contrib-concat": "latest",
-        "grunt-contrib-uglify"    : "latest",
+        "grunt-contrib-uglify": "latest",
-        "grunt-contrib-watch"     : "latest",
+        "grunt-contrib-watch": "latest",
-        "grunt-lib-legacyhelpers" : "latest"
+        "grunt-env": "latest",
-    },
+        "grunt-lib-legacyhelpers": "latest",
+        "grunt-karma": "~0.7.2",
+        "karma": "~0.11.0",
+        "karma-chrome-launcher": "latest",
+        "karma-firefox-launcher": "latest",
+        "karma-nodeunit": "~0.1.1",
+        "karma-sauce-launcher": "~0.1"
+  },
     "scripts": {
-        "test": "grunt"
+        "test": "grunt test:node"
     },
     "ender": "./ender.js",
     "dojoBuild": "package.js",

diff --git a/test/browser-prefix.js b/test/browser-prefix.js
@@ -0,0 +1,4 @@
+(function () {
+    var global = this,
+        require = function() { return global.moment; },
+        exports = global.NPM_TESTS = {};
diff --git a/test/browser-suffix.js b/test/browser-suffix.js
@@ -0,0 +1 @@
+}(this));
diff --git a/test/browser.js b/test/browser.js
@@ -0,0 +1,3 @@
+/* global nodeunit */
+
+nodeunit.run(NPM_TESTS);
diff --git a/test/moment/create.js b/test/moment/create.js
@@ -746,8 +746,12 @@ exports.create = {
         //can parse other stuff too
         test.equal(moment('1999-W37-4 3:30', 'GGGG-[W]WW-E HH:mm').format('YYYY MM DD HH:mm'), '1999 09 16 03:30', "parsing weeks and hours");
 
-        // Years less than 100
+        // In safari, all years before 1300 are shifted back with one day.
-        ver('0098-06', 'GGGG-WW', "0098 02 03", "small years work", true);
+        // http://stackoverflow.com/questions/20768975/safari-subtracts-1-day-from-dates-before-1300
+        if (new Date("1300-01-01").getUTCFullYear() === 1300) {
+            // Years less than 100
+            ver('0098-06', 'GGGG-WW', "0098 02 03", "small years work", true);
+        }
 
         test.done();
     },

diff --git a/test/moment/diff.js b/test/moment/diff.js
@@ -121,7 +121,6 @@ exports.diff = {
     "diff across DST" : function (test) {
         var dst = dstForYear(2012), a, b, daysInMonth;
         if (!dst) {
-            console.log("No DST?");
             test.done();
             return;
         }

diff --git a/test/moment/is_valid.js b/test/moment/is_valid.js
@@ -259,5 +259,5 @@ exports.is_valid = {
         test.ok(moment("3:25", ["h:mma", "hh:mma", "H:mm", "HH:mm"]).isValid());
 
         test.done();
-    },
+    }
 };