Merge branch 'pull/5503'

[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 d419003d9bcab15283570fa0817a540da1086c8b..5e08fedd9a8bc752e5110d26b31274fc96d4abf7 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -25,12 +25,12 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
     assert_template "sessions/new"
     post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
     # but now we need to look at the terms
     assert_template "sessions/new"
     post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
     # but now we need to look at the terms

-    assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
+    assert_redirected_to account_terms_path(:referer => "/diary/new")

     follow_redirect!
     assert_response :success
 
     # don't agree to the terms, but hit decline
     follow_redirect!
     assert_response :success
 
     # don't agree to the terms, but hit decline

-    post "/user/save", :params => { :decline => true, :referer => "/diary/new" }
+    put "/account/terms", :params => { :decline => true, :referer => "/diary/new" }

     assert_redirected_to "/diary/new"
     follow_redirect!
 
     assert_redirected_to "/diary/new"
     follow_redirect!
 


@@ -49,13 +49,13 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
     assert_template "sessions/new"
     post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
     # but now we need to look at the terms
     assert_template "sessions/new"
     post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
     # but now we need to look at the terms

-    assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
+    assert_redirected_to account_terms_path(:referer => "/diary/new")

 
     # check that if we go somewhere else now, it redirects
     # back to the terms page.
     get "/traces/mine"
 
     # check that if we go somewhere else now, it redirects
     # back to the terms page.
     get "/traces/mine"

-    assert_redirected_to :controller => :users, :action => :terms, :referer => "/traces/mine"
+    assert_redirected_to account_terms_path(:referer => "/traces/mine")

     get "/traces/mine", :params => { :referer => "/diary/new" }
     get "/traces/mine", :params => { :referer => "/diary/new" }

-    assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
+    assert_redirected_to account_terms_path(:referer => "/diary/new")

   end
 end
   end
 end