From 9f263dd9c324ae9774e333da48361e8d0e9129ec Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 9 Mar 2015 00:15:05 +0000
Subject: [PATCH] Reset the locale after tests that may change it

---
 test/integration/locale_test.rb        | 8 ++++++++
 test/integration/user_creation_test.rb | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/test/integration/locale_test.rb b/test/integration/locale_test.rb
index fbc2aff0e..94007cd3c 100644
--- a/test/integration/locale_test.rb
+++ b/test/integration/locale_test.rb
@@ -3,6 +3,14 @@ require "test_helper"
 class LocaleTest < ActionDispatch::IntegrationTest
   fixtures :users
 
+  def setup
+    I18n.locale = "en"
+  end
+
+  def teardown
+    I18n.locale = "en"
+  end
+
   def test_defaulting
     user = users(:second_public_user)
 
diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 64f298ba1..622434e59 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -4,10 +4,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   def setup
+    I18n.locale = "en"
+
     OmniAuth.config.test_mode = true
   end
 
   def teardown
+    I18n.locale = "en"
+
     OmniAuth.config.mock_auth[:openid] = nil
     OmniAuth.config.test_mode = false
   end
-- 
2.43.2