X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/671467a6ddfac77183c9af83abb119a849aa5e95..87a7829eb8b82efd0f5252d5b89259e0f6a4d6a5:/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 ad0c3b211..dcc7fa7e9 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -9,14 +9,14 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest with_terms_seen(true) do user = create(:user, :terms_seen => false) - get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test") + get "/api/#{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", nil, auth_header(user.display_name, "test") + get "/api/#{API_VERSION}/user/preferences", :headers => auth_header(user.display_name, "test") assert_response :success end end @@ -26,10 +26,11 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest user = create(:user, :terms_seen => false) # try to log in - get_via_redirect "/login" + get "/login" + follow_redirect! assert_response :success assert_template "user/login" - post "/login", :username => user.email, :password => "test", :referer => "/diary/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 => :user, :action => :terms, :referer => "/diary/new" @@ -37,7 +38,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest assert_response :success # don't agree to the terms, but hit decline - post "/user/save", :decline => true, :referer => "/diary/new" + post "/user/save", :params => { :decline => true, :referer => "/diary/new" } assert_redirected_to "/diary/new" follow_redirect! @@ -52,10 +53,11 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest user = create(:user, :terms_seen => false) # try to log in - get_via_redirect "/login" + get "/login" + follow_redirect! assert_response :success assert_template "user/login" - post "/login", :username => user.email, :password => "test", :referer => "/diary/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 => :user, :action => :terms, :referer => "/diary/new" @@ -64,7 +66,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest # back to the terms page. get "/traces/mine" assert_redirected_to :controller => :user, :action => :terms, :referer => "/traces/mine" - get "/traces/mine", :referer => "/diary/new" + get "/traces/mine", :params => { :referer => "/diary/new" } assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new" end end