X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f722fc281434ef59e19c504bff9e748e9d3f4b4..39c5d8caa71b29d70bb136d6e0a560426e089112:/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 d4d7450fb..dcc7fa7e9 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -1,37 +1,36 @@
 require "test_helper"
 
 class UserTermsSeenTest < ActionDispatch::IntegrationTest
-  fixtures :users
-
-  setup do
-    stub_signup_requests
+  def setup
+    stub_hostip_requests
   end
 
   def test_api_blocked
     with_terms_seen(true) do
-      user = users(:terms_not_seen_user)
+      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
 
   def test_terms_presented_at_login
     with_terms_seen(true) do
-      user = users(:terms_not_seen_user)
+      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"
@@ -39,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!
 
@@ -51,13 +50,14 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
 
   def test_terms_cant_be_circumvented
     with_terms_seen(true) do
-      user = users(:terms_not_seen_user)
+      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"
@@ -66,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