Merge remote-tracking branch 'upstream/pull/1960'

[rails.git] / 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 e8d3df07a5618f5812c5d110190ff33ca638f84b..811883f5fb8d17554c415ee3e507210ffec4b281 100644 (file)
--- 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
-
   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,25 +38,26 @@ 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!
 
       # should be carried through to a normal login with a message
       assert_response :success
-      assert !flash[:notice].nil?
+      assert_not flash[:notice].nil?
     end
   end
 
   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
@@ -74,7 +74,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
   private
 
   def auth_header(user, pass)
-    { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) }
+    { "HTTP_AUTHORIZATION" => format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}")) }
   end
 
   def with_terms_seen(value)