X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..9ec625e352fded4b12a36eb59920776e03e35846:/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 1bed53bce..3a42aa6bd 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,10 +35,10 @@ 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! - + # should be carried through to a normal login with a message assert_response :success assert !flash[:notice].nil? @@ -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 => "/" @@ -67,10 +67,10 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest 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)