Update to iD v2.1.2

[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 d438a6c0c9396e1a6fc61bafba3459540c1bb038..e8d3df07a5618f5812c5d110190ff33ca638f84b 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -1,8 +1,12 @@
-require 'test_helper'
+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)
@@ -26,17 +30,17 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       # try to log in
       get_via_redirect "/login"
       assert_response :success
-      assert_template 'user/login'
-      post "/login", 'username' => user.email, '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/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
@@ -52,25 +56,25 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       # try to log in
       get_via_redirect "/login"
       assert_response :success
-      assert_template 'user/login'
-      post "/login", 'username' => user.email, '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
 
   private
 
   def auth_header(user, pass)
-    { "HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}") }
+    { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) }
   end
 
   def with_terms_seen(value)