X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..283d04a117bad672862c26ac09c2f82cbbfecc59:/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 a00ad39d5..a664feeb0 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -27,16 +27,16 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       get_via_redirect "/login"
       assert_response :success
       assert_template "user/login"
-      post "/login", "username" => user.email, "password" => "test", :referer => "/"
+      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
@@ -53,24 +53,24 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
       get_via_redirect "/login"
       assert_response :success
       assert_template "user/login"
-      post "/login", "username" => user.email, "password" => "test", :referer => "/"
+      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)