From: Isaac Cambron <isaac@isaaccambron.com>
Date: Wed, 23 Jul 2014 03:52:55 +0000 (-0400)
Subject: defineLocale() now returns the actual locale. Removed tests for the return statement... 
X-Git-Tag: 2.8.0~12^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1394ac61301b1d0d487361fb4de74a8059bf15f;p=thirdparty%2Fmoment.git

defineLocale() now returns the actual locale. Removed tests for the return statement in the locale definitions.
---

diff --git a/moment.js b/moment.js
index 3b2fd4a58..4596ea877 100644
--- a/moment.js
+++ b/moment.js
@@ -1906,10 +1906,11 @@
         var data;
         if (key) {
             if (typeof(values) !== "undefined") {
-                moment.defineLocale(key, values);
+                data = moment.defineLocale(key, values);
+            }
+            else {
+                data = moment.localeData(key);
             }
-
-            data = moment.localeData(key);
 
             if (data) {
                 moment.duration.fn._locale = moment.fn._locale = data;
@@ -1926,7 +1927,7 @@
                 locales[name] = new Locale();
             }
             locales[name].set(values);
-            return locales[name]._abbr;
+            return locales[name];
         } else {
             delete locales[name];
             return null;
diff --git a/test/locale/ar-ma.js b/test/locale/ar-ma.js
index d6f2c49a0..8d45d7a7c 100644
--- a/test/locale/ar-ma.js
+++ b/test/locale/ar-ma.js
@@ -309,13 +309,6 @@ exports["locale:ar-ma"] = {
         test.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', "Jan 13 2012 should be week 2");
         test.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', "Jan 14 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ar-ma'), 'ar-ma', "module should export ar-ma");
-        }
         test.done();
     }
 };
diff --git a/test/locale/ar-sa.js b/test/locale/ar-sa.js
index b3c7c3ca9..963f49ed7 100644
--- a/test/locale/ar-sa.js
+++ b/test/locale/ar-sa.js
@@ -351,13 +351,6 @@ exports["locale:ar-sa"] = {
         test.equal(moment([2012,  0, 13]).format('w ww wo'), '٢ ٠٢ ٢', "Jan 13 2012 should be week 2");
         test.equal(moment([2012,  0, 14]).format('w ww wo'), '٣ ٠٣ ٣', "Jan 14 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ar-sa'), 'ar-sa', "module should export ar-sa");
-        }
         test.done();
     }
 };
diff --git a/test/locale/ar.js b/test/locale/ar.js
index 005184595..e663396a3 100644
--- a/test/locale/ar.js
+++ b/test/locale/ar.js
@@ -314,13 +314,6 @@ exports["locale:ar"] = {
         test.equal(moment([2012,  0, 13]).format('w ww wo'), '٢ ٠٢ ٢', "Jan 13 2012 should be week 2");
         test.equal(moment([2012,  0, 14]).format('w ww wo'), '٣ ٠٣ ٣', "Jan 14 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ar'), 'ar', "module should export ar");
-        }
         test.done();
     }
 };
diff --git a/test/locale/az.js b/test/locale/az.js
index 8280e2037..b1944f0dc 100644
--- a/test/locale/az.js
+++ b/test/locale/az.js
@@ -360,14 +360,6 @@ exports["locale:az"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), "2 02 2-nci", "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), "3 03 3-üncü", "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/az'), 'az', "module should export az");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/bg.js b/test/locale/bg.js
index 8fa821086..162c06ba3 100644
--- a/test/locale/bg.js
+++ b/test/locale/bg.js
@@ -328,14 +328,6 @@ exports["locale:bg"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-ри', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-ти', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/bg'), 'bg', "module should export bg");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/bn.js b/test/locale/bn.js
index 15cb3611b..9f6f0637f 100644
--- a/test/locale/bn.js
+++ b/test/locale/bn.js
@@ -369,14 +369,6 @@ exports["locale:bn"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '২ ০২ ২', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '৩ ০৩ ৩', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the localeuage" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/bn'), 'bn', "module should export bn");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/br.js b/test/locale/br.js
index cd0649e4c..5a98d8e73 100644
--- a/test/locale/br.js
+++ b/test/locale/br.js
@@ -253,14 +253,6 @@ exports["locale:br"] = {
         test.equal(start.from(moment([2007, 1, 28]).add({y: 133}), true), "133 bloaz", "mutation 133 years");
         test.equal(start.from(moment([2007, 1, 28]).add({y: 148}), true), "148 vloaz", "mutation 148 years");
         test.equal(start.from(moment([2007, 1, 28]).add({y: 261}), true), "261 bloaz", "mutation 261 years");
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/br'), 'br', "module should export br");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/bs.js b/test/locale/bs.js
index 48a36f491..367239bd2 100644
--- a/test/locale/bs.js
+++ b/test/locale/bs.js
@@ -347,14 +347,6 @@ exports["locale:bs"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/bs'), 'bs', "module should export bs");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ca.js b/test/locale/ca.js
index 5dc47e145..7c53f95d3 100644
--- a/test/locale/ca.js
+++ b/test/locale/ca.js
@@ -282,14 +282,6 @@ exports["locale:ca"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2º', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2º', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ca'), 'ca', "module should export ca");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/cs.js b/test/locale/cs.js
index 68efebcd7..5ab6a3589 100644
--- a/test/locale/cs.js
+++ b/test/locale/cs.js
@@ -403,14 +403,6 @@ exports["locale:cs"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/cs'), 'cs', "module should export cs");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/cv.js b/test/locale/cv.js
index f72dde378..a8340983e 100644
--- a/test/locale/cv.js
+++ b/test/locale/cv.js
@@ -316,14 +316,6 @@ exports["locale:cv"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-мĕш', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-мĕш', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/cv'), 'cv', "module should export cv");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/cy.js b/test/locale/cy.js
index ec78aa82e..cd0d1ea3c 100644
--- a/test/locale/cy.js
+++ b/test/locale/cy.js
@@ -311,14 +311,6 @@ exports["locale:cy"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2il', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2il', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the localeuage" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/cy'), 'cy', "module should export cy");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/da.js b/test/locale/da.js
index cc95d402b..f18da149d 100644
--- a/test/locale/da.js
+++ b/test/locale/da.js
@@ -260,14 +260,6 @@ exports["locale:da"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the localeuage" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/da'), 'da', "module should export da");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/de-at.js b/test/locale/de-at.js
index 30c7385d2..bd4a63925 100644
--- a/test/locale/de-at.js
+++ b/test/locale/de-at.js
@@ -346,14 +346,6 @@ exports["locale:de-at"] = {
         test.equal(moment([2012, 0, 9]).format('w ww wo'), '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the localeuage": function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/de-at'), 'de-at', "module should export de-at");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/de.js b/test/locale/de.js
index b9f9abd0c..92df50c75 100644
--- a/test/locale/de.js
+++ b/test/locale/de.js
@@ -309,14 +309,6 @@ exports["locale:de"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the localeuage" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/de'), 'de', "module should export de");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/el.js b/test/locale/el.js
index 3de17e6b8..84a4228c1 100644
--- a/test/locale/el.js
+++ b/test/locale/el.js
@@ -338,14 +338,6 @@ exports["locale:el"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'),   '2 02 2η', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2η', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the localeuage" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/el'), 'el', "module should export el");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/en-au.js b/test/locale/en-au.js
index 790cdf99c..7601ab46d 100644
--- a/test/locale/en-au.js
+++ b/test/locale/en-au.js
@@ -315,14 +315,6 @@ exports["locale:en-au"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2nd', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/en-au'), 'en-au', "module should export en-au");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/en-ca.js b/test/locale/en-ca.js
index 090a738c7..8bb5bc5c2 100644
--- a/test/locale/en-ca.js
+++ b/test/locale/en-ca.js
@@ -332,14 +332,6 @@ exports["locale:en-ca"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2nd', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3rd', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/en-ca'), 'en-ca', "module should export en-ca");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/en-gb.js b/test/locale/en-gb.js
index 8226600e1..9476e3b64 100644
--- a/test/locale/en-gb.js
+++ b/test/locale/en-gb.js
@@ -315,14 +315,6 @@ exports["locale:en-gb"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2nd', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/en-gb'), 'en-gb', "module should export en-gb");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/eo.js b/test/locale/eo.js
index 8c30bc21e..378fb2e18 100644
--- a/test/locale/eo.js
+++ b/test/locale/eo.js
@@ -316,14 +316,6 @@ exports["locale:eo"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2a', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3a', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/eo'), 'eo', "module should export eo");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/es.js b/test/locale/es.js
index 6d405b15d..909ded4dc 100644
--- a/test/locale/es.js
+++ b/test/locale/es.js
@@ -318,14 +318,6 @@ exports["locale:es"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2º', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2º', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/es'), 'es', "module should export es");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/et.js b/test/locale/et.js
index 39be05f91..a2b315da3 100644
--- a/test/locale/et.js
+++ b/test/locale/et.js
@@ -338,14 +338,6 @@ exports["locale:et"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/et'), 'et', "module should export et");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/eu.js b/test/locale/eu.js
index fa178bd51..0a5f280c4 100644
--- a/test/locale/eu.js
+++ b/test/locale/eu.js
@@ -313,14 +313,6 @@ exports["locale:eu"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/eu'), 'eu', "module should export eu");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/fa.js b/test/locale/fa.js
index eada0124e..3695de308 100644
--- a/test/locale/fa.js
+++ b/test/locale/fa.js
@@ -302,14 +302,6 @@ exports["locale:fa"] = {
         test.equal(moment([2012,  0, 13]).format('w ww wo'), '۲ ۰۲ ۲م', "Jan 13 2012 should be week 2");
         test.equal(moment([2012,  0, 14]).format('w ww wo'), '۳ ۰۳ ۳م', "Jan 14 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/fa'), 'fa', "module should export fa");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/fi.js b/test/locale/fi.js
index 38c656104..e93894139 100644
--- a/test/locale/fi.js
+++ b/test/locale/fi.js
@@ -314,14 +314,6 @@ exports["locale:fi"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/fi'), 'fi', "module should export fi");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/fo.js b/test/locale/fo.js
index c7acb0718..4a825dc9e 100644
--- a/test/locale/fo.js
+++ b/test/locale/fo.js
@@ -260,14 +260,6 @@ exports["locale:fo"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/fo'), 'fo', "module should export fo");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/fr-ca.js b/test/locale/fr-ca.js
index be0b1086a..938e46a78 100644
--- a/test/locale/fr-ca.js
+++ b/test/locale/fr-ca.js
@@ -327,14 +327,6 @@ exports["locale:fr-ca"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/fr-ca'), 'fr-ca', "module should export fr-ca");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/fr.js b/test/locale/fr.js
index e4e14f5a1..ed7aaa0e8 100644
--- a/test/locale/fr.js
+++ b/test/locale/fr.js
@@ -311,14 +311,6 @@ exports["locale:fr"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/fr'), 'fr', "module should export fr");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/gl.js b/test/locale/gl.js
index a387e095c..04656d7ee 100644
--- a/test/locale/gl.js
+++ b/test/locale/gl.js
@@ -291,14 +291,6 @@ exports["locale:gl"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2º', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3º', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/gl'), 'gl', "module should export gl");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/he.js b/test/locale/he.js
index e566ec3f6..f2780485e 100644
--- a/test/locale/he.js
+++ b/test/locale/he.js
@@ -276,14 +276,6 @@ exports["locale:he"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/he'), 'he', "module should export he");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/hi.js b/test/locale/hi.js
index 2f18b8704..f349a1d98 100644
--- a/test/locale/hi.js
+++ b/test/locale/hi.js
@@ -332,14 +332,6 @@ exports["locale:hi"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '२ ०२ २', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '३ ०३ ३', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/hi'), 'hi', "module should export hi");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/hr.js b/test/locale/hr.js
index 6ee0e9033..b376c6b18 100644
--- a/test/locale/hr.js
+++ b/test/locale/hr.js
@@ -347,14 +347,6 @@ exports["locale:hr"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/hr'), 'hr', "module should export hr");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/hu.js b/test/locale/hu.js
index 68790687a..a00366fe4 100644
--- a/test/locale/hu.js
+++ b/test/locale/hu.js
@@ -330,14 +330,6 @@ exports["locale:hu"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/hu'), 'hu', "module should export hu");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/hy-am.js b/test/locale/hy-am.js
index 2b2ec5387..fd4392432 100644
--- a/test/locale/hy-am.js
+++ b/test/locale/hy-am.js
@@ -390,14 +390,6 @@ exports["locale:hy-am"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-րդ', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-րդ', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/hy-am'), 'hy-am', "module should export hy");
-        }
-
         test.done();
     }
 
diff --git a/test/locale/id.js b/test/locale/id.js
index dc2154ecc..1d5b7b4c3 100644
--- a/test/locale/id.js
+++ b/test/locale/id.js
@@ -275,14 +275,6 @@ exports["locale:id"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/id'), 'id', "module should export id");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/is.js b/test/locale/is.js
index 206f775d8..8532e9d61 100644
--- a/test/locale/is.js
+++ b/test/locale/is.js
@@ -321,14 +321,6 @@ exports["locale:is"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/is'), 'is', "module should export is");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/it.js b/test/locale/it.js
index 32731c530..d3a715024 100644
--- a/test/locale/it.js
+++ b/test/locale/it.js
@@ -308,14 +308,6 @@ exports["locale:it"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2º', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2º', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/it'), 'it', "module should export it");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ja.js b/test/locale/ja.js
index 11dc390fb..125730f19 100644
--- a/test/locale/ja.js
+++ b/test/locale/ja.js
@@ -275,14 +275,6 @@ exports["locale:ja"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ja'), 'ja', "module should export ja");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ka.js b/test/locale/ka.js
index 5248d35a7..732a91833 100644
--- a/test/locale/ka.js
+++ b/test/locale/ka.js
@@ -331,14 +331,6 @@ exports["locale:ka"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 მე-2', "იან  8 2012 უნდა იყოს კვირა 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 მე-3', "იან  9 2012 უნდა იყოს კვირა 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ka'), 'ka', "module should export ka");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/km.js b/test/locale/km.js
index 45c41b2fa..8bae123f6 100644
--- a/test/locale/km.js
+++ b/test/locale/km.js
@@ -342,14 +342,6 @@ exports["locale:km"] = {
         test.equal(moment([2012, 0, 9]).format('w ww wo'), '2 02 2', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale": function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/km'), 'km', "module should export km");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ko.js b/test/locale/ko.js
index 00bae77e8..4025b0f1a 100644
--- a/test/locale/ko.js
+++ b/test/locale/ko.js
@@ -355,14 +355,6 @@ exports["locale:ko"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2일', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3일', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ko'), 'ko', "module should export ko");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/lb.js b/test/locale/lb.js
index c2b7a039f..179e45e91 100644
--- a/test/locale/lb.js
+++ b/test/locale/lb.js
@@ -159,14 +159,6 @@ exports["locale:lb"] = {
             m.hours(23).minutes(59).seconds(59).milliseconds(999);
             test.equal(m.calendar(), m.format(datestring), "Today + " + i + " days end of day");
         }
-        test.done();
-    },
-
-    "returns the name of the locale": function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/lb'), 'lb', "module should export lb");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/lt.js b/test/locale/lt.js
index 157979c7b..42d8416bc 100644
--- a/test/locale/lt.js
+++ b/test/locale/lt.js
@@ -331,14 +331,6 @@ exports["locale:lt"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2-oji', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2-oji', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/lt'), 'lt', "module should export lt");
-        }
-
         test.done();
     }
 
diff --git a/test/locale/lv.js b/test/locale/lv.js
index b381893d5..c9c6a00e3 100644
--- a/test/locale/lv.js
+++ b/test/locale/lv.js
@@ -313,14 +313,6 @@ exports["locale:lv"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/lv'), 'lv', "module should export lv");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/mk.js b/test/locale/mk.js
index f818a36f9..c8ca218be 100644
--- a/test/locale/mk.js
+++ b/test/locale/mk.js
@@ -328,14 +328,6 @@ exports["locale:mk"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-ри', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-ти', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/mk'), 'mk', "module should export mk");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ml.js b/test/locale/ml.js
index 5e8c7a94d..724d76ed1 100644
--- a/test/locale/ml.js
+++ b/test/locale/ml.js
@@ -332,14 +332,6 @@ exports["locale:ml"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ml'), 'ml', "module should export ml");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/mr.js b/test/locale/mr.js
index 467802307..5fd7041f5 100644
--- a/test/locale/mr.js
+++ b/test/locale/mr.js
@@ -332,14 +332,6 @@ exports["locale:mr"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '२ ०२ २', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '३ ०३ ३', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/mr'), 'mr', "module should export mr");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ms-my.js b/test/locale/ms-my.js
index ae3941728..c0aa20f26 100644
--- a/test/locale/ms-my.js
+++ b/test/locale/ms-my.js
@@ -331,14 +331,6 @@ exports["locale:ms-my"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '3 03 3', "Jan 14 2012 sepatutnya minggu 3");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', "Jan 15 2012 sepatutnya minggu 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ms-my'), 'ms-my', "module should export ms-my");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/nb.js b/test/locale/nb.js
index 1aefcf7b5..12ae3ff8f 100644
--- a/test/locale/nb.js
+++ b/test/locale/nb.js
@@ -314,14 +314,6 @@ exports["locale:nb"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/nb'), 'nb', "module should export nb");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ne.js b/test/locale/ne.js
index 7f0227f8d..003a3a768 100644
--- a/test/locale/ne.js
+++ b/test/locale/ne.js
@@ -331,14 +331,6 @@ exports["locale:ne"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '२ ०२ २', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '३ ०३ ३', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ne'), 'ne', "module should export ne");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/nl.js b/test/locale/nl.js
index 0df21c97f..5a002133a 100644
--- a/test/locale/nl.js
+++ b/test/locale/nl.js
@@ -321,14 +321,6 @@ exports["locale:nl"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),    '2 02 2de', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),    '2 02 2de', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/nl'), 'nl', "module should export nl");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/nn.js b/test/locale/nn.js
index a9807dedf..8576dba35 100644
--- a/test/locale/nn.js
+++ b/test/locale/nn.js
@@ -313,14 +313,6 @@ exports["locale:nn"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/nn'), 'nn', "module should export nn");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/pl.js b/test/locale/pl.js
index 99b7a640c..749f3d9aa 100644
--- a/test/locale/pl.js
+++ b/test/locale/pl.js
@@ -335,14 +335,6 @@ exports["locale:pl"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/pl'), 'pl', "module should export pl");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/pt-br.js b/test/locale/pt-br.js
index 82215e67d..302069a54 100644
--- a/test/locale/pt-br.js
+++ b/test/locale/pt-br.js
@@ -312,14 +312,6 @@ exports["locale:pt-br"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2º', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3º', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/pt-br'), 'pt-br', "module should export pt-br");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/pt.js b/test/locale/pt.js
index 5c87c8e66..0d6bd8585 100644
--- a/test/locale/pt.js
+++ b/test/locale/pt.js
@@ -309,14 +309,6 @@ exports["locale:pt"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2º', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2º', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/pt'), 'pt', "module should export pt");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ro.js b/test/locale/ro.js
index 9f3b4f242..3165aa324 100644
--- a/test/locale/ro.js
+++ b/test/locale/ro.js
@@ -322,14 +322,6 @@ exports["locale:ro"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ro'), 'ro', "module should export ro");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ru.js b/test/locale/ru.js
index 8c060e2e7..eb6ecdf57 100644
--- a/test/locale/ru.js
+++ b/test/locale/ru.js
@@ -404,14 +404,6 @@ exports["locale:ru"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-я', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-я', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ru'), 'ru', "module should export ru");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/sk.js b/test/locale/sk.js
index a530f179f..09c89d9ca 100644
--- a/test/locale/sk.js
+++ b/test/locale/sk.js
@@ -403,14 +403,6 @@ exports["locale:sk"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/sk'), 'sk', "module should export sk");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/sl.js b/test/locale/sl.js
index 0b0020820..e971f2a51 100644
--- a/test/locale/sl.js
+++ b/test/locale/sl.js
@@ -346,14 +346,6 @@ exports["locale:sl"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/sl'), 'sl', "module should export sl");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/sq.js b/test/locale/sq.js
index c9966eb1e..37829c42f 100644
--- a/test/locale/sq.js
+++ b/test/locale/sq.js
@@ -339,14 +339,6 @@ exports["locale:sq"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/sq'), 'sq', "module should export sq");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/sr-cyrl.js b/test/locale/sr-cyrl.js
index e24a838f6..d4ba40a0c 100644
--- a/test/locale/sr-cyrl.js
+++ b/test/locale/sr-cyrl.js
@@ -349,14 +349,6 @@ exports["locale:sr-cyrl"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/sr-cyrl'), 'sr-cyrl', "module should export sr-cyrl");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/sr.js b/test/locale/sr.js
index b272e5154..e22d3bc55 100644
--- a/test/locale/sr.js
+++ b/test/locale/sr.js
@@ -349,14 +349,6 @@ exports["locale:sr"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/sr'), 'sr', "module should export sr");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/sv.js b/test/locale/sv.js
index 24d452f37..98deea98e 100644
--- a/test/locale/sv.js
+++ b/test/locale/sv.js
@@ -313,14 +313,6 @@ exports["locale:sv"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2a', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2a', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/sv'), 'sv', "module should export sv");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/ta.js b/test/locale/ta.js
index ad59bdb4d..e5779cd24 100644
--- a/test/locale/ta.js
+++ b/test/locale/ta.js
@@ -318,14 +318,6 @@ exports["locale:ta"] = {
         test.equal(moment([2011, 2, 23, 17, 30]).format('a'), " எற்பாடு", "evening");
         test.equal(moment([2011, 2, 23, 19, 30]).format('a'), " மாலை", "late evening");
         test.equal(moment([2011, 2, 23, 21, 20]).format('a'), " இரவு", "night");
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/ta'), 'ta', "module should export ta");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/th.js b/test/locale/th.js
index 596dbe7f1..a46ccd071 100644
--- a/test/locale/th.js
+++ b/test/locale/th.js
@@ -275,14 +275,6 @@ exports["locale:th"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', "Jan 14 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', "Jan 15 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/th'), 'th', "module should export th");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/tl-ph.js b/test/locale/tl-ph.js
index f8280dc0b..19d436e7a 100644
--- a/test/locale/tl-ph.js
+++ b/test/locale/tl-ph.js
@@ -311,14 +311,6 @@ exports["locale:tl-ph"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/tl-ph'), 'tl-ph', "module should export tl-ph");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/tr.js b/test/locale/tr.js
index d36d38d16..ee5a5a94b 100644
--- a/test/locale/tr.js
+++ b/test/locale/tr.js
@@ -325,14 +325,6 @@ exports["locale:tr"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), "2 02 2'nci", "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), "3 03 3'üncü", "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/tr'), 'tr', "module should export tr");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/tzm-latn.js b/test/locale/tzm-latn.js
index 1d2be0d33..5cf9f4b0f 100644
--- a/test/locale/tzm-latn.js
+++ b/test/locale/tzm-latn.js
@@ -310,14 +310,6 @@ exports["locale:tzm-latn"] = {
         test.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', "Jan 13 2012 should be week 2");
         test.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', "Jan 14 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/tzm-latn'), 'tzm-latn', "module should export tzm-latn");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/tzm.js b/test/locale/tzm.js
index 2bc67a675..c46b81d8b 100644
--- a/test/locale/tzm.js
+++ b/test/locale/tzm.js
@@ -310,13 +310,6 @@ exports["locale:tzm"] = {
         test.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', "Jan 13 2012 should be week 2");
         test.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', "Jan 14 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/tzm'), 'tzm', "module should export tzm");
-        }
         test.done();
     }
 };
diff --git a/test/locale/uk.js b/test/locale/uk.js
index 45c12b4ef..e0b0255a5 100644
--- a/test/locale/uk.js
+++ b/test/locale/uk.js
@@ -348,14 +348,6 @@ exports["locale:uk"] = {
         test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-й', "Jan  8 2012 should be week 2");
         test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-й', "Jan  9 2012 should be week 3");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/uk'), 'uk', "module should export uk");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/uz.js b/test/locale/uz.js
index acece2d45..3b150dd4e 100644
--- a/test/locale/uz.js
+++ b/test/locale/uz.js
@@ -315,14 +315,6 @@ exports["locale:uz"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '3 03 3', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '3 03 3', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/uz'), 'uz', "module should export uz");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/vi.js b/test/locale/vi.js
index f1d531b6f..921d0c989 100644
--- a/test/locale/vi.js
+++ b/test/locale/vi.js
@@ -333,14 +333,6 @@ exports["locale:vi"] = {
         test.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', "Jan  9 2012 should be week 2");
         test.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', "Jan 15 2012 should be week 2");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/vi'), 'vi', "module should export vi");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/zh-cn.js b/test/locale/zh-cn.js
index 3edfe3d87..7f1dc425c 100644
--- a/test/locale/zh-cn.js
+++ b/test/locale/zh-cn.js
@@ -307,14 +307,6 @@ exports["locale:zh-cn"] = {
         test.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1周', "Jan  7 2012 应该是第 1周");
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2周', "Jan 14 2012 应该是第 2周");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/zh-cn'), 'zh-cn', "module should export zh-cn");
-        }
-
         test.done();
     }
 };
diff --git a/test/locale/zh-tw.js b/test/locale/zh-tw.js
index fb65c35ab..5363a45a2 100644
--- a/test/locale/zh-tw.js
+++ b/test/locale/zh-tw.js
@@ -305,14 +305,6 @@ exports["locale:zh-tw"] = {
         test.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2週', "Jan 14 2012 應該是第 2週");
         test.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3週', "Jan 15 2012 應該是第 3週");
 
-        test.done();
-    },
-
-    "returns the name of the locale" : function (test) {
-        if (typeof module !== 'undefined' && module.exports) {
-            test.equal(require('../../locale/zh-tw'), 'zh-tw', "module should export zh-tw");
-        }
-
         test.done();
     }
 };