From: Tim Fish <tim@timfishy.co.uk>
Date: Sun, 5 Mar 2017 10:01:27 +0000 (+0100)
Subject: Add localeData tests
X-Git-Tag: 2.18.0~18^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53101f3ca8bc6279b8f29b2be22f1979bb693ab8;p=thirdparty%2Fmoment.git

Add localeData tests
---

diff --git a/src/test/locale/af.js b/src/test/locale/af.js
index 9e6c34bc7..9cd330276 100644
--- a/src/test/locale/af.js
+++ b/src/test/locale/af.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),    '2 02 2de', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ar-dz.js b/src/test/locale/ar-dz.js
index dd7f6c1c5..4ad983de9 100644
--- a/src/test/locale/ar-dz.js
+++ b/src/test/locale/ar-dz.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2016,  0, 14]).format('w ww wo'), '2 02 2', 'Jan 14 2016 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ar-ly.js b/src/test/locale/ar-ly.js
index a3d1ae717..fc419735d 100644
--- a/src/test/locale/ar-ly.js
+++ b/src/test/locale/ar-ly.js
@@ -240,3 +240,11 @@ test('no leading zeros in long date formats', function (assert) {
         }
     }
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ar-ma.js b/src/test/locale/ar-ma.js
index 4d6d829db..1e3c84518 100644
--- a/src/test/locale/ar-ma.js
+++ b/src/test/locale/ar-ma.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', 'Jan 14 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ar-sa.js b/src/test/locale/ar-sa.js
index c59ade75c..c247e27c7 100644
--- a/src/test/locale/ar-sa.js
+++ b/src/test/locale/ar-sa.js
@@ -215,3 +215,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0, 14]).format('w ww wo'), '٢ ٠٢ ٢', '2012 0 14');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ar-tn.js b/src/test/locale/ar-tn.js
index 942010f8b..82b386d8d 100644
--- a/src/test/locale/ar-tn.js
+++ b/src/test/locale/ar-tn.js
@@ -284,3 +284,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ar.js b/src/test/locale/ar.js
index dc847ab65..967fe24d1 100644
--- a/src/test/locale/ar.js
+++ b/src/test/locale/ar.js
@@ -240,3 +240,11 @@ test('no leading zeros in long date formats', function (assert) {
         }
     }
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/az.js b/src/test/locale/az.js
index b87736fd0..3accd7033 100644
--- a/src/test/locale/az.js
+++ b/src/test/locale/az.js
@@ -218,3 +218,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-üncü', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/be.js b/src/test/locale/be.js
index 93a5ea555..a3c72b52d 100644
--- a/src/test/locale/be.js
+++ b/src/test/locale/be.js
@@ -263,3 +263,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-і', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/bg.js b/src/test/locale/bg.js
index e705d0bbb..7cfaea959 100644
--- a/src/test/locale/bg.js
+++ b/src/test/locale/bg.js
@@ -223,3 +223,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-ти', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/bn.js b/src/test/locale/bn.js
index eee53bda0..4a82c5804 100644
--- a/src/test/locale/bn.js
+++ b/src/test/locale/bn.js
@@ -222,3 +222,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 14]).format('w ww wo'), '২ ০২ ২', 'Jan 14 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '৩ ০৩ ৩', 'Jan 15 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
\ No newline at end of file
diff --git a/src/test/locale/bo.js b/src/test/locale/bo.js
index 9fbcb4439..0a819f965 100644
--- a/src/test/locale/bo.js
+++ b/src/test/locale/bo.js
@@ -224,3 +224,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '༣ ༠༣ ༣', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/br.js b/src/test/locale/br.js
index 7fa5aee35..476d6e45f 100644
--- a/src/test/locale/br.js
+++ b/src/test/locale/br.js
@@ -225,3 +225,10 @@ test('special mutations for years', function (assert) {
     assert.equal(start.from(moment([2007, 1, 28]).add({y: 261}), true), '261 bloaz', 'mutation 261 years');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/bs.js b/src/test/locale/bs.js
index e35d0176d..98f6b054e 100644
--- a/src/test/locale/bs.js
+++ b/src/test/locale/bs.js
@@ -239,3 +239,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ca.js b/src/test/locale/ca.js
index cefe2e7c8..a92dfbce1 100644
--- a/src/test/locale/ca.js
+++ b/src/test/locale/ca.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2a', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/cs.js b/src/test/locale/cs.js
index a4088d188..b369bf1e1 100644
--- a/src/test/locale/cs.js
+++ b/src/test/locale/cs.js
@@ -305,3 +305,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/cv.js b/src/test/locale/cv.js
index fed9804a5..d0e45c0f0 100644
--- a/src/test/locale/cv.js
+++ b/src/test/locale/cv.js
@@ -213,3 +213,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-мӗш', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/cy.js b/src/test/locale/cy.js
index d142de666..6cfe440af 100644
--- a/src/test/locale/cy.js
+++ b/src/test/locale/cy.js
@@ -206,3 +206,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2il', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/da.js b/src/test/locale/da.js
index 1b68b3ef5..e60efb7f9 100644
--- a/src/test/locale/da.js
+++ b/src/test/locale/da.js
@@ -209,3 +209,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
\ No newline at end of file
diff --git a/src/test/locale/de-at.js b/src/test/locale/de-at.js
index 86e00514e..3a732018c 100644
--- a/src/test/locale/de-at.js
+++ b/src/test/locale/de-at.js
@@ -204,3 +204,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/de.js b/src/test/locale/de.js
index 51ed99918..1e1d3d2a1 100644
--- a/src/test/locale/de.js
+++ b/src/test/locale/de.js
@@ -203,3 +203,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/dv.js b/src/test/locale/dv.js
index 071ea3971..4eb90ae4c 100644
--- a/src/test/locale/dv.js
+++ b/src/test/locale/dv.js
@@ -202,3 +202,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', 'Jan  9 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '3 03 3', 'Jan 15 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/el.js b/src/test/locale/el.js
index 738490dc3..75d735b23 100644
--- a/src/test/locale/el.js
+++ b/src/test/locale/el.js
@@ -258,3 +258,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2η', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/en-au.js b/src/test/locale/en-au.js
index db7aef2c9..bfeb0d853 100644
--- a/src/test/locale/en-au.js
+++ b/src/test/locale/en-au.js
@@ -207,3 +207,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2nd', 'Jan  9 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', 'Jan 15 2012 should be week 2');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/en-ca.js b/src/test/locale/en-ca.js
index 54516e894..65fbc7354 100644
--- a/src/test/locale/en-ca.js
+++ b/src/test/locale/en-ca.js
@@ -217,3 +217,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3rd', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/en-gb.js b/src/test/locale/en-gb.js
index 0b98fe4b3..1efc23041 100644
--- a/src/test/locale/en-gb.js
+++ b/src/test/locale/en-gb.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/en-ie.js b/src/test/locale/en-ie.js
index 6f5a78183..0e6edbff5 100644
--- a/src/test/locale/en-ie.js
+++ b/src/test/locale/en-ie.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/en-nz.js b/src/test/locale/en-nz.js
index 1f596cf49..ca303e3ff 100644
--- a/src/test/locale/en-nz.js
+++ b/src/test/locale/en-nz.js
@@ -207,3 +207,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2nd', 'Jan  9 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', 'Jan 15 2012 should be week 2');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/en.js b/src/test/locale/en.js
index b8a16c584..3a6343865 100644
--- a/src/test/locale/en.js
+++ b/src/test/locale/en.js
@@ -233,3 +233,10 @@ test('weekdays strict parsing', function (assert) {
     }
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/eo.js b/src/test/locale/eo.js
index d9b979a52..1ea6566d2 100644
--- a/src/test/locale/eo.js
+++ b/src/test/locale/eo.js
@@ -209,3 +209,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3a', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/es-do.js b/src/test/locale/es-do.js
index 89454e86c..142eeb0f9 100644
--- a/src/test/locale/es-do.js
+++ b/src/test/locale/es-do.js
@@ -211,3 +211,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2º', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/es.js b/src/test/locale/es.js
index f9ee15c50..a26609f5e 100644
--- a/src/test/locale/es.js
+++ b/src/test/locale/es.js
@@ -211,3 +211,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2º', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
+
diff --git a/src/test/locale/et.js b/src/test/locale/et.js
index cdccead26..70a99b5ec 100644
--- a/src/test/locale/et.js
+++ b/src/test/locale/et.js
@@ -231,3 +231,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/eu.js b/src/test/locale/eu.js
index c84823265..fca966e00 100644
--- a/src/test/locale/eu.js
+++ b/src/test/locale/eu.js
@@ -207,3 +207,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/fa.js b/src/test/locale/fa.js
index aca2a6913..2977892d2 100644
--- a/src/test/locale/fa.js
+++ b/src/test/locale/fa.js
@@ -200,3 +200,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0, 14]).format('w ww wo'), '۳ ۰۳ ۳م', 'Jan 14 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/fi.js b/src/test/locale/fi.js
index 78b67d62e..82240189e 100644
--- a/src/test/locale/fi.js
+++ b/src/test/locale/fi.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/fo.js b/src/test/locale/fo.js
index 31cc36d3f..6234f1f7f 100644
--- a/src/test/locale/fo.js
+++ b/src/test/locale/fo.js
@@ -209,3 +209,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/fr-ca.js b/src/test/locale/fr-ca.js
index e9144608c..ec1bbf525 100644
--- a/src/test/locale/fr-ca.js
+++ b/src/test/locale/fr-ca.js
@@ -214,3 +214,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3e', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/fr-ch.js b/src/test/locale/fr-ch.js
index 6a3aa8f47..1e9072d8a 100644
--- a/src/test/locale/fr-ch.js
+++ b/src/test/locale/fr-ch.js
@@ -214,3 +214,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2e', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/fr.js b/src/test/locale/fr.js
index 83297df40..c63f6f91f 100644
--- a/src/test/locale/fr.js
+++ b/src/test/locale/fr.js
@@ -206,3 +206,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/fy.js b/src/test/locale/fy.js
index 50f025953..2e300bda7 100644
--- a/src/test/locale/fy.js
+++ b/src/test/locale/fy.js
@@ -212,3 +212,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),    '2 02 2de', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/gd.js b/src/test/locale/gd.js
index 30718a86b..c82e5df14 100644
--- a/src/test/locale/gd.js
+++ b/src/test/locale/gd.js
@@ -220,3 +220,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2na', 'Faoi 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/gl.js b/src/test/locale/gl.js
index b010a74f4..14a6ddd3c 100644
--- a/src/test/locale/gl.js
+++ b/src/test/locale/gl.js
@@ -216,3 +216,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2º', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
\ No newline at end of file
diff --git a/src/test/locale/he.js b/src/test/locale/he.js
index b6aefbe54..10b2af65e 100644
--- a/src/test/locale/he.js
+++ b/src/test/locale/he.js
@@ -172,3 +172,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/hi.js b/src/test/locale/hi.js
index d1ff58aa8..ee57f8a30 100644
--- a/src/test/locale/hi.js
+++ b/src/test/locale/hi.js
@@ -223,3 +223,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '३ ०३ ३', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/hr.js b/src/test/locale/hr.js
index 6beb023bd..1055de287 100644
--- a/src/test/locale/hr.js
+++ b/src/test/locale/hr.js
@@ -239,3 +239,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/hu.js b/src/test/locale/hu.js
index 091902b85..4649e0bc1 100644
--- a/src/test/locale/hu.js
+++ b/src/test/locale/hu.js
@@ -221,3 +221,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '2 02 2.', 'Jan  9 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/hy-am.js b/src/test/locale/hy-am.js
index 6964c408a..6ed5d82e7 100644
--- a/src/test/locale/hy-am.js
+++ b/src/test/locale/hy-am.js
@@ -277,3 +277,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-րդ', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/id.js b/src/test/locale/id.js
index 017739a81..dd3b00c1c 100644
--- a/src/test/locale/id.js
+++ b/src/test/locale/id.js
@@ -170,4 +170,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', 'Jan  9 2012 should be week 3');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/is.js b/src/test/locale/is.js
index 31758af99..0a8f49d9c 100644
--- a/src/test/locale/is.js
+++ b/src/test/locale/is.js
@@ -214,3 +214,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/it.js b/src/test/locale/it.js
index 035276e01..7fe6babbe 100644
--- a/src/test/locale/it.js
+++ b/src/test/locale/it.js
@@ -206,3 +206,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2º', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ja.js b/src/test/locale/ja.js
index 2435e13a1..9112a3afc 100644
--- a/src/test/locale/ja.js
+++ b/src/test/locale/ja.js
@@ -170,3 +170,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/jv.js b/src/test/locale/jv.js
index 0b46076f2..84e019f87 100644
--- a/src/test/locale/jv.js
+++ b/src/test/locale/jv.js
@@ -173,4 +173,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', 'Jan  9 2012 should be week 3');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ka.js b/src/test/locale/ka.js
index c216a7171..f79540bfe 100644
--- a/src/test/locale/ka.js
+++ b/src/test/locale/ka.js
@@ -220,3 +220,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 მე-3', 'იან  9 2012 უნდა იყოს კვირა 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/kk.js b/src/test/locale/kk.js
index b048060d5..3e73720c9 100644
--- a/src/test/locale/kk.js
+++ b/src/test/locale/kk.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '3 03 3-ші', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/km.js b/src/test/locale/km.js
index 556c68c4a..b68f3f7c6 100644
--- a/src/test/locale/km.js
+++ b/src/test/locale/km.js
@@ -228,3 +228,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/kn.js b/src/test/locale/kn.js
index 5fbba1021..da526b484 100644
--- a/src/test/locale/kn.js
+++ b/src/test/locale/kn.js
@@ -223,3 +223,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '೩ ೦೩ ೩ನೇ', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ko.js b/src/test/locale/ko.js
index 25e331f3f..8c32ce6c2 100644
--- a/src/test/locale/ko.js
+++ b/src/test/locale/ko.js
@@ -242,3 +242,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3일', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ky.js b/src/test/locale/ky.js
index 12385add4..364faa636 100644
--- a/src/test/locale/ky.js
+++ b/src/test/locale/ky.js
@@ -207,3 +207,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '3 03 3-чү', 'Jan  9 2012 should be week 3');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '3 03 3-чү', 'Jan 15 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/lb.js b/src/test/locale/lb.js
index d54cc4fd5..7c15e47be 100644
--- a/src/test/locale/lb.js
+++ b/src/test/locale/lb.js
@@ -184,3 +184,11 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2.',   'Jan 14 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2.',   'Jan 15 2012 should be week 2');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/lo.js b/src/test/locale/lo.js
index 9e5f57d38..eea2dc975 100644
--- a/src/test/locale/lo.js
+++ b/src/test/locale/lo.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 ທີ່3', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/lt.js b/src/test/locale/lt.js
index 002785b00..978f47900 100644
--- a/src/test/locale/lt.js
+++ b/src/test/locale/lt.js
@@ -227,3 +227,11 @@ test('weeks year starting sunday formatted', function (assert) {
 test('month cases', function (assert) {
     assert.equal(moment([2015, 4, 1]).format('LL'), '2015 m. gegužės 1 d.', 'uses format instead of standalone form');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
\ No newline at end of file
diff --git a/src/test/locale/lv.js b/src/test/locale/lv.js
index 4f83439af..a8d9eb05d 100644
--- a/src/test/locale/lv.js
+++ b/src/test/locale/lv.js
@@ -234,3 +234,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/me.js b/src/test/locale/me.js
index 994b9d797..4fa2666a3 100644
--- a/src/test/locale/me.js
+++ b/src/test/locale/me.js
@@ -244,3 +244,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
\ No newline at end of file
diff --git a/src/test/locale/mi.js b/src/test/locale/mi.js
index 9c5a1650a..9e203d540 100644
--- a/src/test/locale/mi.js
+++ b/src/test/locale/mi.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2º', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/mk.js b/src/test/locale/mk.js
index 702c3fe37..bf401ab8e 100644
--- a/src/test/locale/mk.js
+++ b/src/test/locale/mk.js
@@ -222,3 +222,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-ти', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ml.js b/src/test/locale/ml.js
index b1588fb66..2ad8841f8 100644
--- a/src/test/locale/ml.js
+++ b/src/test/locale/ml.js
@@ -223,3 +223,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/mr.js b/src/test/locale/mr.js
index 2122b1655..001adedfa 100644
--- a/src/test/locale/mr.js
+++ b/src/test/locale/mr.js
@@ -223,4 +223,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '३ ०३ ३', 'Jan 15 2012 should be week 3');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ms-my.js b/src/test/locale/ms-my.js
index 12576be8a..2836f4b0d 100644
--- a/src/test/locale/ms-my.js
+++ b/src/test/locale/ms-my.js
@@ -216,4 +216,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 sepatutnya minggu 3');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ms.js b/src/test/locale/ms.js
index 005114974..623f60999 100644
--- a/src/test/locale/ms.js
+++ b/src/test/locale/ms.js
@@ -216,4 +216,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 sepatutnya minggu 3');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/my.js b/src/test/locale/my.js
index 64f40bc25..95b17d6d0 100644
--- a/src/test/locale/my.js
+++ b/src/test/locale/my.js
@@ -285,3 +285,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '၂ ၀၂ ၂', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/nb.js b/src/test/locale/nb.js
index b9aa97052..4de4779c0 100644
--- a/src/test/locale/nb.js
+++ b/src/test/locale/nb.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ne.js b/src/test/locale/ne.js
index 8f61e19ca..c44184bd7 100644
--- a/src/test/locale/ne.js
+++ b/src/test/locale/ne.js
@@ -222,4 +222,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '२ ०२ २', 'Jan  9 2012 should be week 2');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/nl-be.js b/src/test/locale/nl-be.js
index a772b34f3..2aeef6b12 100644
--- a/src/test/locale/nl-be.js
+++ b/src/test/locale/nl-be.js
@@ -214,3 +214,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),    '2 02 2de', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/nl.js b/src/test/locale/nl.js
index 21fca332f..489978883 100644
--- a/src/test/locale/nl.js
+++ b/src/test/locale/nl.js
@@ -214,3 +214,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),    '2 02 2de', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/nn.js b/src/test/locale/nn.js
index 08b9c8410..ec7f1c37e 100644
--- a/src/test/locale/nn.js
+++ b/src/test/locale/nn.js
@@ -207,3 +207,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/pa-in.js b/src/test/locale/pa-in.js
index 73f45a96e..e7142be37 100644
--- a/src/test/locale/pa-in.js
+++ b/src/test/locale/pa-in.js
@@ -319,3 +319,11 @@ test('strict ordinal parsing', function (assert) {
         assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
     }
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/pl.js b/src/test/locale/pl.js
index 0211a2ef9..ae6c1a59b 100644
--- a/src/test/locale/pl.js
+++ b/src/test/locale/pl.js
@@ -251,3 +251,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/pt-br.js b/src/test/locale/pt-br.js
index 85f94ecd0..af4e49a94 100644
--- a/src/test/locale/pt-br.js
+++ b/src/test/locale/pt-br.js
@@ -205,3 +205,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3º', 'Jan 15 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/pt.js b/src/test/locale/pt.js
index 85fabb518..94783b414 100644
--- a/src/test/locale/pt.js
+++ b/src/test/locale/pt.js
@@ -203,3 +203,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2º', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ro.js b/src/test/locale/ro.js
index 1713d376e..dbabca95b 100644
--- a/src/test/locale/ro.js
+++ b/src/test/locale/ro.js
@@ -215,3 +215,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ru.js b/src/test/locale/ru.js
index 144167961..c6a84d507 100644
--- a/src/test/locale/ru.js
+++ b/src/test/locale/ru.js
@@ -353,3 +353,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-я', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/sd.js b/src/test/locale/sd.js
index 6f2b48433..cc4f0aa4a 100644
--- a/src/test/locale/sd.js
+++ b/src/test/locale/sd.js
@@ -220,3 +220,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', 'Jan  9 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/se.js b/src/test/locale/se.js
index af28e5045..f977976fc 100644
--- a/src/test/locale/se.js
+++ b/src/test/locale/se.js
@@ -218,3 +218,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/si.js b/src/test/locale/si.js
index 4b0332459..41f698518 100644
--- a/src/test/locale/si.js
+++ b/src/test/locale/si.js
@@ -202,3 +202,10 @@ test('calendar all else', function (assert) {
     assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/sk.js b/src/test/locale/sk.js
index 1714ae85c..81170bb30 100644
--- a/src/test/locale/sk.js
+++ b/src/test/locale/sk.js
@@ -295,3 +295,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/sl.js b/src/test/locale/sl.js
index eda64dbac..f6fc90661 100644
--- a/src/test/locale/sl.js
+++ b/src/test/locale/sl.js
@@ -330,3 +330,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/sq.js b/src/test/locale/sq.js
index 37bf74bdf..b408ee3b7 100644
--- a/src/test/locale/sq.js
+++ b/src/test/locale/sq.js
@@ -223,3 +223,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/sr-cyrl.js b/src/test/locale/sr-cyrl.js
index cf3cb4a31..e6c28d558 100644
--- a/src/test/locale/sr-cyrl.js
+++ b/src/test/locale/sr-cyrl.js
@@ -241,3 +241,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/sr.js b/src/test/locale/sr.js
index 6d889c0bc..49e305e74 100644
--- a/src/test/locale/sr.js
+++ b/src/test/locale/sr.js
@@ -241,3 +241,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ss.js b/src/test/locale/ss.js
index e33681a97..7bf254ede 100644
--- a/src/test/locale/ss.js
+++ b/src/test/locale/ss.js
@@ -240,3 +240,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/sv.js b/src/test/locale/sv.js
index dfa2b2b1b..1e5166fcf 100644
--- a/src/test/locale/sv.js
+++ b/src/test/locale/sv.js
@@ -207,3 +207,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2a', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/sw.js b/src/test/locale/sw.js
index c39fb71cc..adb344448 100644
--- a/src/test/locale/sw.js
+++ b/src/test/locale/sw.js
@@ -207,3 +207,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ta.js b/src/test/locale/ta.js
index 305457a5e..97a7c4246 100644
--- a/src/test/locale/ta.js
+++ b/src/test/locale/ta.js
@@ -210,4 +210,10 @@ test('meridiem', function (assert) {
     assert.equal(moment([2011, 2, 23, 23, 30]).format('a'), ' யாமம்', '(before) midnight');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/te.js b/src/test/locale/te.js
index 59f6352ce..567902ac0 100644
--- a/src/test/locale/te.js
+++ b/src/test/locale/te.js
@@ -222,3 +222,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2à°µ', 'Jan 14 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3à°µ', 'Jan 15 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/tet.js b/src/test/locale/tet.js
index 1d35ff913..f3a0fd640 100644
--- a/src/test/locale/tet.js
+++ b/src/test/locale/tet.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/th.js b/src/test/locale/th.js
index 3ba27c669..4480407e6 100644
--- a/src/test/locale/th.js
+++ b/src/test/locale/th.js
@@ -169,3 +169,11 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', 'Jan 14 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
\ No newline at end of file
diff --git a/src/test/locale/tl-ph.js b/src/test/locale/tl-ph.js
index e2cb7328d..09be0b00c 100644
--- a/src/test/locale/tl-ph.js
+++ b/src/test/locale/tl-ph.js
@@ -206,3 +206,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/tlh.js b/src/test/locale/tlh.js
index 35ca6c043..5dc7a4135 100644
--- a/src/test/locale/tlh.js
+++ b/src/test/locale/tlh.js
@@ -223,3 +223,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/tr.js b/src/test/locale/tr.js
index e16c3bcea..6f2390d7f 100644
--- a/src/test/locale/tr.js
+++ b/src/test/locale/tr.js
@@ -218,3 +218,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3\'üncü', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/tzl.js b/src/test/locale/tzl.js
index 2b0412c02..789e616bb 100644
--- a/src/test/locale/tzl.js
+++ b/src/test/locale/tzl.js
@@ -211,3 +211,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/tzm-latn.js b/src/test/locale/tzm-latn.js
index 2131427cf..48ac0458e 100644
--- a/src/test/locale/tzm-latn.js
+++ b/src/test/locale/tzm-latn.js
@@ -207,3 +207,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', 'Jan 14 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/tzm.js b/src/test/locale/tzm.js
index ea7df54ca..1d0865b09 100644
--- a/src/test/locale/tzm.js
+++ b/src/test/locale/tzm.js
@@ -207,3 +207,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', 'Jan 14 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/uk.js b/src/test/locale/uk.js
index b2eefc80e..42b2b96f1 100644
--- a/src/test/locale/uk.js
+++ b/src/test/locale/uk.js
@@ -240,3 +240,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-й', 'Jan  9 2012 should be week 3');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/ur.js b/src/test/locale/ur.js
index 6c1cab66f..6c6b95d32 100644
--- a/src/test/locale/ur.js
+++ b/src/test/locale/ur.js
@@ -221,3 +221,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', 'Jan  9 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/uz-latn.js b/src/test/locale/uz-latn.js
index 48f2d30e7..3927f0208 100644
--- a/src/test/locale/uz-latn.js
+++ b/src/test/locale/uz-latn.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '3 03 3', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/uz.js b/src/test/locale/uz.js
index fbf81386d..7e8da9bc0 100644
--- a/src/test/locale/uz.js
+++ b/src/test/locale/uz.js
@@ -208,3 +208,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '3 03 3', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/vi.js b/src/test/locale/vi.js
index c1893dbce..3856ae251 100644
--- a/src/test/locale/vi.js
+++ b/src/test/locale/vi.js
@@ -218,3 +218,10 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
 });
 
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/x-pseudo.js b/src/test/locale/x-pseudo.js
index 2ab8ae8d3..b738d30d2 100644
--- a/src/test/locale/x-pseudo.js
+++ b/src/test/locale/x-pseudo.js
@@ -207,3 +207,11 @@ test('weeks year starting sunday formatted', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2nd', 'Jan  9 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', 'Jan 15 2012 should be week 2');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
\ No newline at end of file
diff --git a/src/test/locale/yo.js b/src/test/locale/yo.js
index 46bf1c212..760a4be33 100644
--- a/src/test/locale/yo.js
+++ b/src/test/locale/yo.js
@@ -210,3 +210,11 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 ọjọ́ 2', 'Jan  9 2012 should be week 2');
     assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 ọjọ́ 2', 'Jan 15 2012 should be week 2');
 });
+
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/zh-cn.js b/src/test/locale/zh-cn.js
index 311336128..e58fcb65d 100644
--- a/src/test/locale/zh-cn.js
+++ b/src/test/locale/zh-cn.js
@@ -182,4 +182,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2周', 'Jan 14 2012 应该是第 2周');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/zh-hk.js b/src/test/locale/zh-hk.js
index 903d932c9..2a26856a6 100644
--- a/src/test/locale/zh-hk.js
+++ b/src/test/locale/zh-hk.js
@@ -189,4 +189,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3週', 'Jan 15 2012 應該是第 3週');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});
diff --git a/src/test/locale/zh-tw.js b/src/test/locale/zh-tw.js
index 4cd415c3d..1ca170a2b 100644
--- a/src/test/locale/zh-tw.js
+++ b/src/test/locale/zh-tw.js
@@ -189,4 +189,10 @@ test('weeks year starting sunday format', function (assert) {
     assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3週', 'Jan 15 2012 應該是第 3週');
 });
 
-
+test('valid localeData', function (assert) {
+    assert.equal(moment().localeData().months().length, 12, 'months should return 12 months');
+    assert.equal(moment().localeData().monthsShort().length, 12, 'monthsShort should return 12 months');
+    assert.equal(moment().localeData().weekdays().length, 7, 'weekdays should return 7 days');
+    assert.equal(moment().localeData().weekdaysShort().length, 7, 'weekdaysShort should return 7 days');
+    assert.equal(moment().localeData().weekdaysMin().length, 7, 'monthsShort should return 7 days');
+});