##// END OF EJS Templates
Don't change Setting.default_language in tests....
Jean-Philippe Lang -
r13542:ad0937e44658
parent child
Show More
@@ -236,7 +236,6 class TimeEntryReportsControllerTest < ActionController::TestCase
236 236 end
237 237
238 238 def test_csv_big_5
239 Setting.default_language = "zh-TW"
240 239 str_utf8 = "\xe4\xb8\x80\xe6\x9c\x88".force_encoding('UTF-8')
241 240 str_big5 = "\xa4@\xa4\xeb".force_encoding('Big5')
242 241 user = User.find_by_id(3)
@@ -256,9 +255,11 class TimeEntryReportsControllerTest < ActionController::TestCase
256 255 assert_equal 7.3, te2.hours
257 256 assert_equal 3, te2.user_id
258 257
259 get :report, :project_id => 1, :columns => 'day',
260 :from => "2011-11-11", :to => "2011-11-11",
261 :criteria => ["user"], :format => "csv"
258 with_settings :default_language => "zh-TW" do
259 get :report, :project_id => 1, :columns => 'day',
260 :from => "2011-11-11", :to => "2011-11-11",
261 :criteria => ["user"], :format => "csv"
262 end
262 263 assert_response :success
263 264 assert_equal 'text/csv; header=present', @response.content_type
264 265 lines = @response.body.chomp.split("\n")
@@ -278,7 +279,6 class TimeEntryReportsControllerTest < ActionController::TestCase
278 279 end
279 280
280 281 def test_csv_cannot_convert_should_be_replaced_big_5
281 Setting.default_language = "zh-TW"
282 282 str_utf8 = "\xe4\xbb\xa5\xe5\x86\x85".force_encoding('UTF-8')
283 283 user = User.find_by_id(3)
284 284 user.firstname = str_utf8
@@ -297,9 +297,11 class TimeEntryReportsControllerTest < ActionController::TestCase
297 297 assert_equal 7.3, te2.hours
298 298 assert_equal 3, te2.user_id
299 299
300 get :report, :project_id => 1, :columns => 'day',
301 :from => "2011-11-11", :to => "2011-11-11",
302 :criteria => ["user"], :format => "csv"
300 with_settings :default_language => "zh-TW" do
301 get :report, :project_id => 1, :columns => 'day',
302 :from => "2011-11-11", :to => "2011-11-11",
303 :criteria => ["user"], :format => "csv"
304 end
303 305 assert_response :success
304 306 assert_equal 'text/csv; header=present', @response.content_type
305 307 lines = @response.body.chomp.split("\n")
@@ -21,6 +21,7 class WelcomeControllerTest < ActionController::TestCase
21 21 fixtures :projects, :news, :users, :members
22 22
23 23 def setup
24 Setting.default_language = 'en'
24 25 User.current = nil
25 26 end
26 27
@@ -34,28 +35,24 class WelcomeControllerTest < ActionController::TestCase
34 35 end
35 36
36 37 def test_browser_language
37 Setting.default_language = 'en'
38 38 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
39 39 get :index
40 40 assert_equal :fr, @controller.current_language
41 41 end
42 42
43 43 def test_browser_language_alternate
44 Setting.default_language = 'en'
45 44 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'zh-TW'
46 45 get :index
47 46 assert_equal :"zh-TW", @controller.current_language
48 47 end
49 48
50 49 def test_browser_language_alternate_not_valid
51 Setting.default_language = 'en'
52 50 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr-CA'
53 51 get :index
54 52 assert_equal :fr, @controller.current_language
55 53 end
56 54
57 55 def test_browser_language_should_be_ignored_with_force_default_language_for_anonymous
58 Setting.default_language = 'en'
59 56 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
60 57 with_settings :force_default_language_for_anonymous => '1' do
61 58 get :index
@@ -64,20 +61,20 class WelcomeControllerTest < ActionController::TestCase
64 61 end
65 62
66 63 def test_user_language_should_be_used
67 Setting.default_language = 'fi'
68 64 user = User.find(2).update_attribute :language, 'it'
69 65 @request.session[:user_id] = 2
70 66 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
71 get :index
72 assert_equal :it, @controller.current_language
67 with_settings :default_language => 'fi' do
68 get :index
69 assert_equal :it, @controller.current_language
70 end
73 71 end
74 72
75 73 def test_user_language_should_be_ignored_if_force_default_language_for_loggedin
76 Setting.default_language = 'fi'
77 74 user = User.find(2).update_attribute :language, 'it'
78 75 @request.session[:user_id] = 2
79 76 @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
80 with_settings :force_default_language_for_loggedin => '1' do
77 with_settings :force_default_language_for_loggedin => '1', :default_language => 'fi' do
81 78 get :index
82 79 assert_equal :fi, @controller.current_language
83 80 end
General Comments 0
You need to be logged in to leave comments. Login now