From 40b83ebb47c2a2aea0e52e7b192954734753f7e8 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 29 Sep 2016 13:42:56 +0800
Subject: [PATCH] Reset `I18n.locale` in tests.

---
 spec/components/js_locale_helper_spec.rb | 1 +
 spec/models/badge_spec.rb                | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/spec/components/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb
index 125474f93d6..a5ce82ed92a 100644
--- a/spec/components/js_locale_helper_spec.rb
+++ b/spec/components/js_locale_helper_spec.rb
@@ -18,6 +18,7 @@ describe JsLocaleHelper do
   JsLocaleHelper.extend StubLoadTranslations
 
   after do
+    I18n.locale = :en
     JsLocaleHelper.clear_cache!
   end
 
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index 3ee6bf8ce08..8a39087fe62 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -18,9 +18,13 @@ describe Badge do
     badge = Badge.find_by_name("Basic User")
     name_english = badge.name
 
-    I18n.locale = 'fr'
+    begin
+      I18n.locale = 'fr'
 
-    expect(badge.display_name).not_to eq(name_english)
+      expect(badge.display_name).not_to eq(name_english)
+    ensure
+      I18n.locale = :en
+    end
   end
 
   it 'handles changes on badge description and long description correctly for system badges' do