X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbf35e0cf67ee330cd02c2431e0ed6d08681d184..c47a40c1db59f0d0f836fbcd1b876390befe796e:/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 f7d3f2e54..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 @@ -24,7 +24,6 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest assert_response :success 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 assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new" follow_redirect! @@ -49,7 +48,6 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest assert_response :success 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 assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new" @@ -60,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