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

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

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index 2886780a06d46f370e20f531bba5f07918d47cc0..2cda68b128045473d9dbfe662b300e1947337114 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -1969,11 +1969,11 @@ CHANGESET
   def test_index_user_not_found
     get :index, :params => { :format => "html", :display_name => "Some random user" }
     assert_response :not_found
   def test_index_user_not_found
     get :index, :params => { :format => "html", :display_name => "Some random user" }
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

 
     get :index, :params => { :format => "html", :display_name => "Some random user", :list => "1" }, :xhr => true
     assert_response :not_found
 
     get :index, :params => { :format => "html", :display_name => "Some random user", :list => "1" }, :xhr => true
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

   end
 
   ##
   end
 
   ##


@@ -1985,7 +1985,7 @@ CHANGESET
 
     get :index, :params => { :friends => true }
     assert_response :redirect
 
     get :index, :params => { :friends => true }
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => friend_changesets_path
+    assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path

 
     session[:user] = private_user.id
 
 
     session[:user] = private_user.id
 


@@ -2009,7 +2009,7 @@ CHANGESET
 
     get :index, :params => { :nearby => true }
     assert_response :redirect
 
     get :index, :params => { :nearby => true }
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => nearby_changesets_path
+    assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path

 
     session[:user] = private_user.id
 
 
     session[:user] = private_user.id