X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..42224790b56acea5c653f3085c374f28d56e590d:/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 32fdba0b2..d419003d9 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -1,21 +1,17 @@ require "test_helper" class UserTermsSeenTest < ActionDispatch::IntegrationTest - def setup - stub_hostip_requests - end - 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 @@ -26,9 +22,8 @@ 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 assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new" follow_redirect! @@ -51,9 +46,8 @@ 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 assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new" @@ -64,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 %{auth}", :auth => Base64.encode64("#{user}:#{pass}")) } - end end