Reset locale to "en" before helpers tests.

git-svn-id: http://svn.redmine.org/redmine/trunk@16232 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 11bd52c8330fc9f11dd141346502a541beef5d04..20ef4b154d6294e51fae6f8ac53f52e5b4ed214d 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -278,9 +278,12 @@ module Redmine
   end
 
   class HelperTest < ActionView::TestCase
+    include Redmine::I18n
+
     def setup
       super
       User.current = nil
+      ::I18n.locale = 'en'
     end
   end
 

diff --git a/test/unit/helpers/activities_helper_test.rb b/test/unit/helpers/activities_helper_test.rb
index a7df3c6ac90eb38b097a548133083f05ee2e2b9b..6c6c0c84c6230200cf69ebda73a0f8c90cb6f763 100644 (file)
--- a/test/unit/helpers/activities_helper_test.rb
+++ b/test/unit/helpers/activities_helper_test.rb
@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
 
 class ActivitiesHelperTest < Redmine::HelperTest
   include ActivitiesHelper
-  include Redmine::I18n
 
   class MockEvent
     attr_reader :event_datetime, :event_group, :name

diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 299488a2f63dede0aeb05adc267ab0b4795b06ed..e6530e5c54897ad265204efc1acac9ea2b9a7f3d 100644 (file)
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -20,7 +20,6 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 class ApplicationHelperTest < Redmine::HelperTest
-  include Redmine::I18n
   include ERB::Util
   include Rails.application.routes.url_helpers
 

diff --git a/test/unit/helpers/custom_fields_helper_test.rb b/test/unit/helpers/custom_fields_helper_test.rb
index 7e352a9aa7aa654e18796663659d5898d12d66b5..21a9a1212e2088bdc543e15e47b462e52cdc95f5 100644 (file)
--- a/test/unit/helpers/custom_fields_helper_test.rb
+++ b/test/unit/helpers/custom_fields_helper_test.rb
@@ -20,7 +20,6 @@ require File.expand_path('../../../test_helper', __FILE__)
 class CustomFieldsHelperTest < Redmine::HelperTest
   include ApplicationHelper
   include CustomFieldsHelper
-  include Redmine::I18n
   include ERB::Util
 
   def test_format_boolean_value

diff --git a/test/unit/helpers/groups_helper_test.rb b/test/unit/helpers/groups_helper_test.rb
index 3f106287cfe53b2030f4684eaa819c3e840c1ef1..1f30dcfac74037ef28d81596df1e156bbe80a47b 100644 (file)
--- a/test/unit/helpers/groups_helper_test.rb
+++ b/test/unit/helpers/groups_helper_test.rb
@@ -18,7 +18,6 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 class GroupsHelperTest < Redmine::HelperTest
-  include Redmine::I18n
   include ERB::Util
   include GroupsHelper
   include Rails.application.routes.url_helpers

diff --git a/test/unit/helpers/issues_helper_test.rb b/test/unit/helpers/issues_helper_test.rb
index d618470680e533d5c0d2598ea8a3cfa748077092..e255d1ec41c16e9f3463200a9b11603b2218596c 100644 (file)
--- a/test/unit/helpers/issues_helper_test.rb
+++ b/test/unit/helpers/issues_helper_test.rb
@@ -18,7 +18,6 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 class IssuesHelperTest < Redmine::HelperTest
-  include Redmine::I18n
   include IssuesHelper
   include CustomFieldsHelper
   include ERB::Util
@@ -35,11 +34,6 @@ class IssuesHelperTest < Redmine::HelperTest
            :attachments,
            :versions
 
-  def setup
-    super
-    set_language_if_valid('en')
-  end
-
   def test_issue_heading
     assert_equal "Bug #1", issue_heading(Issue.find(1))
   end

diff --git a/test/unit/helpers/members_helper_test.rb b/test/unit/helpers/members_helper_test.rb
index 0cda5d67fbcf545d0ceb2d3dcf88d8ae7b8f4b97..ad3e1cc15b14995aafbcfabede77ec518453f007 100644 (file)
--- a/test/unit/helpers/members_helper_test.rb
+++ b/test/unit/helpers/members_helper_test.rb
@@ -18,7 +18,6 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 class MembersHelperTest < Redmine::HelperTest
-  include Redmine::I18n
   include ERB::Util
   include MembersHelper
   include Rails.application.routes.url_helpers

diff --git a/test/unit/helpers/my_helper_test.rb b/test/unit/helpers/my_helper_test.rb
index 0448741d720f29975f52cb30a9ff1dfdfd288223..d79525dd0163eb36711fa96f4a67c71e954d8854 100644 (file)
--- a/test/unit/helpers/my_helper_test.rb
+++ b/test/unit/helpers/my_helper_test.rb
@@ -18,7 +18,6 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
 class MyHelperTest < Redmine::HelperTest
-  include Redmine::I18n
   include ERB::Util
   include MyHelper
 

diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
index 2e874141d5c9b1b94dd91993f6ff5e9df73040b9..fc6afe669b04fd9bb834eba2fe5ab66eda7dd4ed 100644 (file)
--- a/test/unit/helpers/projects_helper_test.rb
+++ b/test/unit/helpers/projects_helper_test.rb
@@ -20,7 +20,6 @@ require File.expand_path('../../../test_helper', __FILE__)
 class ProjectsHelperTest < Redmine::HelperTest
   include ApplicationHelper
   include ProjectsHelper
-  include Redmine::I18n
   include ERB::Util
   include Rails.application.routes.url_helpers
 
@@ -33,11 +32,6 @@ class ProjectsHelperTest < Redmine::HelperTest
            :groups_users,
            :enabled_modules
 
-  def setup
-    super
-    set_language_if_valid('en')
-  end
-
   def test_link_to_version_within_project
     @project = Project.find(2)
     User.current = User.find(1)

diff --git a/test/unit/helpers/queries_helper_test.rb b/test/unit/helpers/queries_helper_test.rb
index 6b10d5053a58f44595ea0404235d928ef039ddd7..12f00cea3c6d89c40e73de8cee49b8fc0b5d9a51 100644 (file)
--- a/test/unit/helpers/queries_helper_test.rb
+++ b/test/unit/helpers/queries_helper_test.rb
@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
 
 class QueriesHelperTest < Redmine::HelperTest
   include QueriesHelper
-  include Redmine::I18n
 
   fixtures :projects, :enabled_modules, :users, :members,
            :member_roles, :roles, :trackers, :issue_statuses,

diff --git a/test/unit/helpers/search_helper_test.rb b/test/unit/helpers/search_helper_test.rb
index 6e1b1ac1710abdfd8f93f8db28cca5581707f085..888f4d35a75e863a0b147560b328c73ce5163913 100644 (file)
--- a/test/unit/helpers/search_helper_test.rb
+++ b/test/unit/helpers/search_helper_test.rb
@@ -21,7 +21,6 @@ require File.expand_path('../../../test_helper', __FILE__)
 
 class SearchHelperTest < Redmine::HelperTest
   include SearchHelper
-  include Redmine::I18n
   include ERB::Util
 
   def test_highlight_single_token

diff --git a/test/unit/helpers/settings_helper_test.rb b/test/unit/helpers/settings_helper_test.rb
index 42dc7a5793fda4377bc70e4272cb90c525f063f4..10649d27d23d3a4286ee20c1cbe33c65ef5c37bf 100644 (file)
--- a/test/unit/helpers/settings_helper_test.rb
+++ b/test/unit/helpers/settings_helper_test.rb
@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
 
 class SettingsHelperTest < Redmine::HelperTest
   include SettingsHelper
-  include Redmine::I18n
   include ERB::Util
 
   def test_date_format_setting_options_should_include_human_readable_format

diff --git a/test/unit/helpers/sort_helper_test.rb b/test/unit/helpers/sort_helper_test.rb
index 3aedccaf77e92539af8dcb13e25233e64ccd113f..33657dcedc4c56d9ae49cdd59b92ec0a3b837250 100644 (file)
--- a/test/unit/helpers/sort_helper_test.rb
+++ b/test/unit/helpers/sort_helper_test.rb
@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
 
 class SortHelperTest < Redmine::HelperTest
   include SortHelper
-  include Redmine::I18n
   include ERB::Util
 
   def setup

diff --git a/test/unit/helpers/timelog_helper_test.rb b/test/unit/helpers/timelog_helper_test.rb
index ad04b99f2ae2ce5fe091125b22ac8fd02c0d9c76..61b92193599215544ba3c4bcc08fe8117b57dd94 100644 (file)
--- a/test/unit/helpers/timelog_helper_test.rb
+++ b/test/unit/helpers/timelog_helper_test.rb
@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
 
 class TimelogHelperTest < Redmine::HelperTest
   include TimelogHelper
-  include Redmine::I18n
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::DateHelper
   include ERB::Util

diff --git a/test/unit/helpers/watchers_helper_test.rb b/test/unit/helpers/watchers_helper_test.rb
index 2dccfa17251ec7b3de3b014796ee79853d1c0706..47c7d072fa823e729481a69fae20d5972bd64f6d 100644 (file)
--- a/test/unit/helpers/watchers_helper_test.rb
+++ b/test/unit/helpers/watchers_helper_test.rb
@@ -19,16 +19,10 @@ require File.expand_path('../../../test_helper', __FILE__)
 
 class WatchersHelperTest < Redmine::HelperTest
   include WatchersHelper
-  include Redmine::I18n
   include Rails.application.routes.url_helpers
 
   fixtures :users, :issues
 
-  def setup
-    super
-    set_language_if_valid('en')
-  end
-
   test '#watcher_link with a non-watched object' do
     expected = link_to(
       "Watch",