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

[rails.git] / test / controllers / site_controller_test.rb

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index b8941ed30f1a4a24c1f474ab33e6bfb27d2b5f4a..c4e1a5a66309bfc96ddaec3244c8e649cad60002 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -165,7 +165,7 @@ class SiteControllerTest < ActionController::TestCase
   def test_edit
     get :edit
     assert_response :redirect
   def test_edit
     get :edit
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/edit"
+    assert_redirected_to :controller => :users, :action => :login, :referer => "/edit"

   end
 
   # Test the right editor gets used when the user hasn't set a preference
   end
 
   # Test the right editor gets used when the user hasn't set a preference


@@ -315,7 +315,7 @@ class SiteControllerTest < ActionController::TestCase
   def test_welcome
     get :welcome
     assert_response :redirect
   def test_welcome
     get :welcome
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome"
+    assert_redirected_to :controller => :users, :action => :login, :referer => "/welcome"

 
     get :welcome, :session => { :user => create(:user) }
     assert_response :success
 
     get :welcome, :session => { :user => create(:user) }
     assert_response :success