X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e7cd90f4b4d431b32a92ca68c3df817e8e765d09..933335a0ea28f274bc7301c18611bcd90709fd99:/test/integration/user_terms_seen_test.rb?ds=inline diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb index 63f7f627a..a664feeb0 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -1,14 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require "test_helper" -class UserTermsSeenTest < ActionController::IntegrationTest +class UserTermsSeenTest < ActionDispatch::IntegrationTest fixtures :users - def auth_header(user, pass) - {"HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}")} - end - def test_api_blocked - if REQUIRE_TERMS_SEEN + with_terms_seen(true) do user = users(:terms_not_seen_user) get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test") @@ -24,25 +20,25 @@ class UserTermsSeenTest < ActionController::IntegrationTest end def test_terms_presented_at_login - if REQUIRE_TERMS_SEEN + with_terms_seen(true) do user = users(:terms_not_seen_user) # try to log in get_via_redirect "/login" assert_response :success - assert_template 'user/login' - post "/login", {'user[email]' => user.email, 'user[password]' => 'test', :referer => "/"} + assert_template "user/login" + post "/login", :username => user.email, :password => "test", :referer => "/diary/new" assert_response :redirect # but now we need to look at the terms - assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/" + assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new" follow_redirect! assert_response :success # don't agree to the terms, but hit decline - post "/user/#{user.display_name}/save", {'decline' => 'decline', 'referer' => '/'} - assert_redirected_to "/" + post "/user/save", :decline => true, :referer => "/diary/new" + assert_redirected_to "/diary/new" follow_redirect! - + # should be carried through to a normal login with a message assert_response :success assert !flash[:notice].nil? @@ -50,27 +46,40 @@ class UserTermsSeenTest < ActionController::IntegrationTest end def test_terms_cant_be_circumvented - if REQUIRE_TERMS_SEEN + with_terms_seen(true) do user = users(:terms_not_seen_user) # try to log in get_via_redirect "/login" assert_response :success - assert_template 'user/login' - post "/login", {'user[email]' => user.email, 'user[password]' => 'test', :referer => "/"} + assert_template "user/login" + post "/login", :username => user.email, :password => "test", :referer => "/diary/new" assert_response :redirect # but now we need to look at the terms - assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/" - follow_redirect! - assert_response :success + assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new" # check that if we go somewhere else now, it redirects # back to the terms page. get "/traces/mine" - assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/traces/mine" + assert_redirected_to :controller => :user, :action => :terms, :referer => "/traces/mine" + get "/traces/mine", :referer => "/diary/new" + assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new" end end -end + private - + def auth_header(user, pass) + { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) } + end + + def with_terms_seen(value) + require_terms_seen = Object.send("remove_const", "REQUIRE_TERMS_SEEN") + Object.const_set("REQUIRE_TERMS_SEEN", value) + + yield + + Object.send("remove_const", "REQUIRE_TERMS_SEEN") + Object.const_set("REQUIRE_TERMS_SEEN", require_terms_seen) + end +end