Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/controllers/admin_user_controller_spec.rb b/spec/controllers/admin_user_controller_spec.rb
index 8b89506f9..e979355cf 100644
--- a/spec/controllers/admin_user_controller_spec.rb
+++ b/spec/controllers/admin_user_controller_spec.rb
@@ -2,13 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe AdminUserController, "when administering users" do
     render_views
-  
-    it "shows the index/list page" do
+
+    it "shows the index page" do
         get :index
     end
 
     it "searches for 'bob'" do
-        get :list, :query => "bob"
+        get :index, :query => "bob"
         assigns[:admin_users].should == [ users(:bob_smith_user) ]
     end
 
@@ -51,7 +51,7 @@ describe AdminUserController do
 
         before(:each) do
             @user = FactoryGirl.create(:user)
-            request.env["HTTP_REFERER"] = admin_user_show_path(@user)
+            request.env["HTTP_REFERER"] = admin_user_path(@user)
         end
 
         it 'redirects to the page the admin was previously on' do
@@ -61,7 +61,7 @@ describe AdminUserController do
                                                :comment_ids => comment.id,
                                                :hide_selected => 'hidden' }
 
-            response.should redirect_to(admin_user_show_path(@user))
+            response.should redirect_to(admin_user_path(@user))
         end
 
         it 'sets the given comments visibility to hidden' do