X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3795da40149962e77d88dc3d88ba7c400005718a..0b445cf7165dc9b71ad08d7bae6147137f9b016e:/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 33a6950ee..f7d3f2e54 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -1,32 +1,28 @@ require "test_helper" class UserTermsSeenTest < ActionDispatch::IntegrationTest - def setup - stub_hostip_requests - end - def test_api_blocked - user = create(:user, :terms_seen => false) + user = create(:user, :terms_seen => false, :terms_agreed => nil) - get "/api/#{API_VERSION}/user/preferences", :headers => auth_header(user.display_name, "test") + get "/api/#{Settings.api_version}/user/preferences", :headers => auth_header(user.display_name, "test") assert_response :forbidden # touch it so that the user has seen the terms user.terms_seen = true user.save - get "/api/#{API_VERSION}/user/preferences", :headers => auth_header(user.display_name, "test") + get "/api/#{Settings.api_version}/user/preferences", :headers => auth_header(user.display_name, "test") assert_response :success end def test_terms_presented_at_login - user = create(:user, :terms_seen => false) + user = create(:user, :terms_seen => false, :terms_agreed => nil) # try to log in 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 @@ -45,13 +41,13 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest end def test_terms_cant_be_circumvented - user = create(:user, :terms_seen => false) + user = create(:user, :terms_seen => false, :terms_agreed => nil) # try to log in 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 @@ -68,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