X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..9f263dd9c324ae9774e333da48361e8d0e9129ec:/test/integration/user_terms_seen_test.rb diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb index 554649396..678492f3c 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require "test_helper" class UserTermsSeenTest < ActionDispatch::IntegrationTest fixtures :users @@ -26,8 +26,8 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest # try to log in get_via_redirect "/login" assert_response :success - assert_template 'user/login' - post "/login", {'username' => user.email, 'password' => 'test', :referer => "/"} + assert_template "user/login" + post "/login", "username" => user.email, "password" => "test", :referer => "/" assert_response :redirect # but now we need to look at the terms assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/" @@ -35,7 +35,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest assert_response :success # don't agree to the terms, but hit decline - post "/user/save", {'decline' => 'decline', 'referer' => '/'} + post "/user/save", "decline" => "decline", "referer" => "/" assert_redirected_to "/" follow_redirect! @@ -52,8 +52,8 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest # try to log in get_via_redirect "/login" assert_response :success - assert_template 'user/login' - post "/login", {'username' => user.email, 'password' => 'test', :referer => "/"} + assert_template "user/login" + post "/login", "username" => user.email, "password" => "test", :referer => "/" assert_response :redirect # but now we need to look at the terms assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/" @@ -64,13 +64,15 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest # back to the terms page. get "/traces/mine" assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/traces/mine" + get "/traces/mine", :referer => "/test" + assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/test" end end -private + private def auth_header(user, pass) - {"HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}")} + { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) } end def with_terms_seen(value)