From fe28193e4eb9af2dc5262535a29ffde5249568fc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 21 Feb 2009 11:04:50 +0000 Subject: Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/integration/application_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/integration/application_test.rb') diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb index 18f4891c2..dc6fdf392 100644 --- a/test/integration/application_test.rb +++ b/test/integration/application_test.rb @@ -18,6 +18,8 @@ require "#{File.dirname(__FILE__)}/../test_helper" class ApplicationTest < ActionController::IntegrationTest + include Redmine::I18n + fixtures :users def test_set_localization @@ -27,13 +29,13 @@ class ApplicationTest < ActionController::IntegrationTest get 'projects', { }, 'Accept-Language' => 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3' assert_response :success assert_tag :tag => 'h2', :content => 'Projets' - assert_equal 'fr', User.current.language + assert_equal :fr, current_language # then an italien user get 'projects', { }, 'Accept-Language' => 'it;q=0.8,en-us;q=0.5,en;q=0.3' assert_response :success assert_tag :tag => 'h2', :content => 'Progetti' - assert_equal 'it', User.current.language + assert_equal :it, current_language # not a supported language: default language should be used get 'projects', { }, 'Accept-Language' => 'zz' -- cgit v1.2.3