From: Tom Hughes <tom@compton.nu>
Date: Tue, 13 May 2014 18:25:06 +0000 (+0100)
Subject: Make sure we restore I18n.locale when tests complete
X-Git-Tag: live~5331^2~4
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b13018cc96899e54b9b952112243068bbe4d1024

Make sure we restore I18n.locale when tests complete
---

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 46c35f950..f9aeb73cc 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -7,6 +7,10 @@ class ApplicationHelperTest < ActionView::TestCase
     I18n.locale = "en"
   end
 
+  def setup
+    I18n.locale = "en"
+  end
+
   def test_linkify
     %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link|
       text = "Test #{link} is made into a link"
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index d5f7a91e6..6ca65f7e7 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -12,6 +12,10 @@ class BrowseHelperTest < ActionView::TestCase
     I18n.locale = "en"
   end
 
+  def teardown
+    I18n.locale = "en"
+  end
+
   def test_printable_name
     assert_equal "17", printable_name(current_nodes(:redacted_node))
     assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))