jro_apps/redmine Commit - r13542:ad0937e44658

Don't change Setting.default_language in tests....

Jean-Philippe Lang -

r13542:ad0937e44658

parent child

Context file:

r13542:ad0937e44658

Collapse all files

test/functional/time_entry_reports_controller_test.rb +10 -8

               end
               def test_csv_big_5
-                Setting.default_language = "zh-TW"
                 str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88".force_encoding('UTF-8')
                 str_big5  = "\xa4@\xa4\xeb".force_encoding('Big5')
                 user = User.find_by_id(3)
                 assert_equal 7.3, te2.hours
                 assert_equal 3, te2.user_id
-                get :report, :project_id => 1, :columns => 'day',
+                with_settings :default_language => "zh-TW" do
-                    :from => "2011-11-11", :to => "2011-11-11",
+                  get :report, :project_id => 1, :columns => 'day',
-                    :criteria => ["user"], :format => "csv"
+                      :from => "2011-11-11", :to => "2011-11-11",
+                      :criteria => ["user"], :format => "csv"
+                end
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
               end
               def test_csv_cannot_convert_should_be_replaced_big_5
-                Setting.default_language = "zh-TW"
                 str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85".force_encoding('UTF-8')
                 user = User.find_by_id(3)
                 user.firstname = str_utf8
                 assert_equal 7.3, te2.hours
                 assert_equal 3, te2.user_id
-                get :report, :project_id => 1, :columns => 'day',
+                with_settings :default_language => "zh-TW" do
-                    :from => "2011-11-11", :to => "2011-11-11",
+                  get :report, :project_id => 1, :columns => 'day',
-                    :criteria => ["user"], :format => "csv"
+                      :from => "2011-11-11", :to => "2011-11-11",
+                      :criteria => ["user"], :format => "csv"
+                end
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")

test/functional/welcome_controller_test.rb +6 -9

               fixtures :projects, :news, :users, :members
               def setup
+                Setting.default_language = 'en'
                 User.current = nil
               end
               end
               def test_browser_language
-                Setting.default_language = 'en'
                 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
                 get :index
                 assert_equal :fr, @controller.current_language
               end
               def test_browser_language_alternate
-                Setting.default_language = 'en'
                 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'zh-TW'
                 get :index
                 assert_equal :"zh-TW", @controller.current_language
               end
               def test_browser_language_alternate_not_valid
-                Setting.default_language = 'en'
                 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr-CA'
                 get :index
                 assert_equal :fr, @controller.current_language
               end
               def test_browser_language_should_be_ignored_with_force_default_language_for_anonymous
-                Setting.default_language = 'en'
                 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
                 with_settings :force_default_language_for_anonymous => '1' do
                   get :index
               end
               def test_user_language_should_be_used
-                Setting.default_language = 'fi'
                 user = User.find(2).update_attribute :language, 'it'
                 @request.session[:user_id] = 2
                 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
-                get :index
+                with_settings :default_language => 'fi' do
-                assert_equal :it, @controller.current_language
+                  get :index
+                  assert_equal :it, @controller.current_language
+                end
               end
               def test_user_language_should_be_ignored_if_force_default_language_for_loggedin
-                Setting.default_language = 'fi'
                 user = User.find(2).update_attribute :language, 'it'
                 @request.session[:user_id] = 2
                 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
-                with_settings :force_default_language_for_loggedin => '1' do
+                with_settings :force_default_language_for_loggedin => '1', :default_language => 'fi' do
                   get :index
                   assert_equal :fi, @controller.current_language
                 end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages