From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Tue, 6 Nov 2012 21:12:31 +0000 (-0800)
Subject: Fixed race condition in tests created by preparse/postformat
X-Git-Tag: 2.0.0~40^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2a0ab1e27a9a78e2275c2dc3dbb76366f61eaf2;p=thirdparty%2Fmoment.git

Fixed race condition in tests created by preparse/postformat
---

diff --git a/test/moment/preparse_postformat.js b/test/moment/preparse_postformat.js
index 5e1c8128d..d3dcc2dad 100644
--- a/test/moment/preparse_postformat.js
+++ b/test/moment/preparse_postformat.js
@@ -42,9 +42,18 @@ var symbolLang = {
 };
 
 exports.preparse_postformat = {
+    setUp: function(cb) {
+        moment.lang('symbol', symbolLang);
+        cb();
+    },
+
+    tearDown: function(cb) {
+        moment.lang('en-gb');
+        cb();
+    },
+
     "transform": function(test) {
         test.expect(3);
-        moment.lang('symbol', symbolLang);
 
         test.equal(moment.utc('@)!@-)*-@&', 'YYYY-MM-DD').unix(), 1346025600, "preparse string + format");
         test.equal(moment.utc('@)!@-)*-@&').unix(), 1346025600, "preparse ISO8601 string");
@@ -55,7 +64,6 @@ exports.preparse_postformat = {
 
     "transform from": function(test) {
         test.expect(3);
-        moment.lang('symbol', symbolLang);
 
         var start = moment([2007, 1, 28]);
 
@@ -68,7 +76,6 @@ exports.preparse_postformat = {
 
     "calendar day" : function(test) {
         test.expect(6);
-        moment.lang('symbol', symbolLang);
 
         var a = moment().hours(2).minutes(0).seconds(0);
 
@@ -78,6 +85,7 @@ exports.preparse_postformat = {
         test.equal(moment(a).add({ d: 1 }).calendar(),       "Tomorrow at @:)) AM",  "tomorrow at the same time");
         test.equal(moment(a).subtract({ h: 1 }).calendar(),  "Today at !:)) AM",     "Now minus 1 hour");
         test.equal(moment(a).subtract({ d: 1 }).calendar(),  "Yesterday at @:)) AM", "yesterday at the same time");
+
         test.done();
     }
 };