X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/73c95847a6680bea7f35fe5b3da6eb4e52757b9c..a5a7f45d70a3028f374b4aa592efac39a769ca18:/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 51eab5b18..f7d3f2e54 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -22,7 +22,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest get "/login" follow_redirect! assert_response :success - assert_template "users/login" + assert_template "sessions/new" post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" } assert_response :redirect # but now we need to look at the terms @@ -47,7 +47,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest get "/login" follow_redirect! assert_response :success - assert_template "users/login" + assert_template "sessions/new" post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" } assert_response :redirect # but now we need to look at the terms @@ -64,6 +64,6 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest private def auth_header(user, pass) - { "HTTP_AUTHORIZATION" => format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}")) } + { "HTTP_AUTHORIZATION" => format("Basic %s", :auth => Base64.encode64("#{user}:#{pass}")) } end end