summaryrefslogtreecommitdiffstats
path: root/test/integration/application_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-02-21 11:04:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-02-21 11:04:50 +0000
commitfe28193e4eb9af2dc5262535a29ffde5249568fc (patch)
treebd4cf3a9fbada98e58e510ca0e25c42bf00676a7 /test/integration/application_test.rb
parent9a986ac0a51fe844eee816325e6a6d4122136d9a (diff)
downloadredmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.tar.gz
redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.zip
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
Diffstat (limited to 'test/integration/application_test.rb')
-rw-r--r--test/integration/application_test.rb6
1 files changed, 4 insertions, 2 deletions
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'