summaryrefslogtreecommitdiffstats
path: root/test/integration/application_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-06-01 18:17:27 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-06-01 18:17:27 +0000
commit966f238da459fda40be8db48904dad7e4266a443 (patch)
tree33932b6969f6a6a55e8f8c6461de2c837d03ca07 /test/integration/application_test.rb
parentb834e81d7f41121fc6d9bef95ee090f8f466493e (diff)
downloadredmine-966f238da459fda40be8db48904dad7e4266a443.tar.gz
redmine-966f238da459fda40be8db48904dad7e4266a443.zip
Use Rails 5 syntax for integration tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@16586 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration/application_test.rb')
-rw-r--r--test/integration/application_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb
index 35296f811..1e896c1d9 100644
--- a/test/integration/application_test.rb
+++ b/test/integration/application_test.rb
@@ -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"