X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a10ac2e9be4246987951eea86ae201f14c65fc1..c1d4f3cc7f051815cfd4ea372597a94f1621abfa:/test/integration/user_terms_seen_test.rb?ds=sidebyside diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb index 46db48388..d419003d9 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -4,14 +4,14 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest def test_api_blocked user = create(:user, :terms_seen => false, :terms_agreed => nil) - get "/api/#{Settings.api_version}/user/preferences", :headers => auth_header(user.display_name, "test") + get "/api/#{Settings.api_version}/user/preferences", :headers => bearer_authorization_header(user) assert_response :forbidden # touch it so that the user has seen the terms user.terms_seen = true user.save - get "/api/#{Settings.api_version}/user/preferences", :headers => auth_header(user.display_name, "test") + get "/api/#{Settings.api_version}/user/preferences", :headers => bearer_authorization_header(user) assert_response :success end @@ -58,10 +58,4 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest get "/traces/mine", :params => { :referer => "/diary/new" } assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new" end - - private - - def auth_header(user, pass) - { "HTTP_AUTHORIZATION" => format("Basic %s", :auth => Base64.encode64("#{user}:#{pass}")) } - end end