Reset the locale after tests that may change it
authorTom Hughes <tom@compton.nu>
Mon, 9 Mar 2015 00:15:05 +0000 (00:15 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 9 Mar 2015 00:15:05 +0000 (00:15 +0000)
test/integration/locale_test.rb
test/integration/user_creation_test.rb

index fbc2aff0e8ea208923386fb4931a2323ec605776..94007cd3ceecb179bd4529d761c2f68fb0ddb9d5 100644 (file)
@@ -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)
 
index 64f298ba1367e1b6da3b3d31ef7f360f49b0c53b..622434e59e50ca56f70b7e339853116fb44bab5d 100644 (file)
@@ -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