Use Rails 5 syntax for integration tests.

git-svn-id: http://svn.redmine.org/redmine/trunk@16586 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-06-01 18:17:27 +00:00
parent b834e81d7f
commit 966f238da4
31 changed files with 700 additions and 398 deletions

View File

@@ -32,21 +32,21 @@ class ApplicationTest < Redmine::IntegrationTest
Setting.default_language = 'en'
# a french user
get '/projects', { }, 'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
get '/projects', :headers => {'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'}
assert_response :success
assert_select 'h2', :text => 'Projets'
assert_equal :fr, current_language
assert_select "html[lang=?]", "fr"
# then an italien user
get '/projects', { }, 'HTTP_ACCEPT_LANGUAGE' => 'it;q=0.8,en-us;q=0.5,en;q=0.3'
get '/projects', :headers => {'HTTP_ACCEPT_LANGUAGE' => 'it;q=0.8,en-us;q=0.5,en;q=0.3'}
assert_response :success
assert_select 'h2', :text => 'Progetti'
assert_equal :it, current_language
assert_select "html[lang=?]", "it"
# not a supported language: default language should be used
get '/projects', { }, 'HTTP_ACCEPT_LANGUAGE' => 'zz'
get '/projects', :headers => {'HTTP_ACCEPT_LANGUAGE' => 'zz'}
assert_response :success
assert_select 'h2', :text => 'Projects'
assert_select "html[lang=?]", "en"
@@ -80,7 +80,7 @@ class ApplicationTest < Redmine::IntegrationTest
def test_localization_should_be_set_correctly_on_invalid_token
ActionController::Base.allow_forgery_protection = true
Setting.default_language = 'en'
post '/issues', { }, 'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
post '/issues', :headers => {'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'}
assert_response 422
assert_equal :fr, current_language
assert_select "html[lang=?]", "fr"