Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-12 00:06:01 +01:00
Code Issues Packages Projects Releases Activity

Reset locale to "en" before helpers tests.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16232 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-01-19 23:32:04 +00:00
parent 9d747d6811
commit 09f4a7d3f6
15 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/test_helper.rb
View File

@@ -278,9 +278,12 @@ module Redmine
end end
class HelperTest < ActionView::TestCase class HelperTest < ActionView::TestCase
include Redmine::I18n
def setup def setup
super super
User.current = nil User.current = nil
::I18n.locale = 'en'
end end
end end

1
test/unit/helpers/activities_helper_test.rb
View File

@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
class ActivitiesHelperTest < Redmine::HelperTest class ActivitiesHelperTest < Redmine::HelperTest
include ActivitiesHelper include ActivitiesHelper
include Redmine::I18n
class MockEvent class MockEvent
attr_reader :event_datetime, :event_group, :name attr_reader :event_datetime, :event_group, :name

1
test/unit/helpers/application_helper_test.rb
View File

@@ -20,7 +20,6 @@
require File.expand_path('../../../test_helper', __FILE__) require File.expand_path('../../../test_helper', __FILE__)
class ApplicationHelperTest < Redmine::HelperTest class ApplicationHelperTest < Redmine::HelperTest
include Redmine::I18n
include ERB::Util include ERB::Util
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers

1
test/unit/helpers/custom_fields_helper_test.rb
View File

@@ -20,7 +20,6 @@ require File.expand_path('../../../test_helper', __FILE__)
class CustomFieldsHelperTest < Redmine::HelperTest class CustomFieldsHelperTest < Redmine::HelperTest
include ApplicationHelper include ApplicationHelper
include CustomFieldsHelper include CustomFieldsHelper
include Redmine::I18n
include ERB::Util include ERB::Util
def test_format_boolean_value def test_format_boolean_value

1
test/unit/helpers/groups_helper_test.rb
View File

@@ -18,7 +18,6 @@
require File.expand_path('../../../test_helper', __FILE__) require File.expand_path('../../../test_helper', __FILE__)
class GroupsHelperTest < Redmine::HelperTest class GroupsHelperTest < Redmine::HelperTest
include Redmine::I18n
include ERB::Util include ERB::Util
include GroupsHelper include GroupsHelper
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers

6
test/unit/helpers/issues_helper_test.rb
View File

@@ -18,7 +18,6 @@
require File.expand_path('../../../test_helper', __FILE__) require File.expand_path('../../../test_helper', __FILE__)
class IssuesHelperTest < Redmine::HelperTest class IssuesHelperTest < Redmine::HelperTest
include Redmine::I18n
include IssuesHelper include IssuesHelper
include CustomFieldsHelper include CustomFieldsHelper
include ERB::Util include ERB::Util
@@ -35,11 +34,6 @@ class IssuesHelperTest < Redmine::HelperTest
:attachments, :attachments,
:versions :versions
def setup
super
set_language_if_valid('en')
end
def test_issue_heading def test_issue_heading
assert_equal "Bug #1", issue_heading(Issue.find(1)) assert_equal "Bug #1", issue_heading(Issue.find(1))
end end

1
test/unit/helpers/members_helper_test.rb
View File

@@ -18,7 +18,6 @@
require File.expand_path('../../../test_helper', __FILE__) require File.expand_path('../../../test_helper', __FILE__)
class MembersHelperTest < Redmine::HelperTest class MembersHelperTest < Redmine::HelperTest
include Redmine::I18n
include ERB::Util include ERB::Util
include MembersHelper include MembersHelper
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers

1
test/unit/helpers/my_helper_test.rb
View File

@@ -18,7 +18,6 @@
require File.expand_path('../../../test_helper', __FILE__) require File.expand_path('../../../test_helper', __FILE__)
class MyHelperTest < Redmine::HelperTest class MyHelperTest < Redmine::HelperTest
include Redmine::I18n
include ERB::Util include ERB::Util
include MyHelper include MyHelper

6
test/unit/helpers/projects_helper_test.rb
View File

@@ -20,7 +20,6 @@ require File.expand_path('../../../test_helper', __FILE__)
class ProjectsHelperTest < Redmine::HelperTest class ProjectsHelperTest < Redmine::HelperTest
include ApplicationHelper include ApplicationHelper
include ProjectsHelper include ProjectsHelper
include Redmine::I18n
include ERB::Util include ERB::Util
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers
@@ -33,11 +32,6 @@ class ProjectsHelperTest < Redmine::HelperTest
:groups_users, :groups_users,
:enabled_modules :enabled_modules
def setup
super
set_language_if_valid('en')
end
def test_link_to_version_within_project def test_link_to_version_within_project
@project = Project.find(2) @project = Project.find(2)
User.current = User.find(1) User.current = User.find(1)

1
test/unit/helpers/queries_helper_test.rb
View File

@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
class QueriesHelperTest < Redmine::HelperTest class QueriesHelperTest < Redmine::HelperTest
include QueriesHelper include QueriesHelper
include Redmine::I18n
fixtures :projects, :enabled_modules, :users, :members, fixtures :projects, :enabled_modules, :users, :members,
:member_roles, :roles, :trackers, :issue_statuses, :member_roles, :roles, :trackers, :issue_statuses,

1
test/unit/helpers/search_helper_test.rb
View File

@@ -21,7 +21,6 @@ require File.expand_path('../../../test_helper', __FILE__)
class SearchHelperTest < Redmine::HelperTest class SearchHelperTest < Redmine::HelperTest
include SearchHelper include SearchHelper
include Redmine::I18n
include ERB::Util include ERB::Util
def test_highlight_single_token def test_highlight_single_token

1
test/unit/helpers/settings_helper_test.rb
View File

@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
class SettingsHelperTest < Redmine::HelperTest class SettingsHelperTest < Redmine::HelperTest
include SettingsHelper include SettingsHelper
include Redmine::I18n
include ERB::Util include ERB::Util
def test_date_format_setting_options_should_include_human_readable_format def test_date_format_setting_options_should_include_human_readable_format

1
test/unit/helpers/sort_helper_test.rb
View File

@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
class SortHelperTest < Redmine::HelperTest class SortHelperTest < Redmine::HelperTest
include SortHelper include SortHelper
include Redmine::I18n
include ERB::Util include ERB::Util
def setup def setup

1
test/unit/helpers/timelog_helper_test.rb
View File

@@ -19,7 +19,6 @@ require File.expand_path('../../../test_helper', __FILE__)
class TimelogHelperTest < Redmine::HelperTest class TimelogHelperTest < Redmine::HelperTest
include TimelogHelper include TimelogHelper
include Redmine::I18n
include ActionView::Helpers::TextHelper include ActionView::Helpers::TextHelper
include ActionView::Helpers::DateHelper include ActionView::Helpers::DateHelper
include ERB::Util include ERB::Util

6
test/unit/helpers/watchers_helper_test.rb
View File

@@ -19,16 +19,10 @@ require File.expand_path('../../../test_helper', __FILE__)
class WatchersHelperTest < Redmine::HelperTest class WatchersHelperTest < Redmine::HelperTest
include WatchersHelper include WatchersHelper
include Redmine::I18n
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers
fixtures :users, :issues fixtures :users, :issues
def setup
super
set_language_if_valid('en')
end
test '#watcher_link with a non-watched object' do test '#watcher_link with a non-watched object' do
expected = link_to( expected = link_to(
"Watch", "Watch",