removed user variable from admins_controller#user_search

app/controllers/admins_controller.rb

@@ -3,17 +3,9 @@ class AdminsController < ApplicationController
   before_filter :redirect_unless_admin
 
   def user_search
-    user = params[:user] || {}
+    params[:user] ||= {}
-    user = user.delete_if {|key, value| value.blank? }
+    params[:user].delete_if {|key, value| value.blank? }
-    params[:user] = user
+    @users = params[:user].empty? ? [] : User.where(params[:user])
-
-    if user.keys.count == 0
-      @users = []
-    else
-      @users = User.where(params[:user]).all || []
-    end
-
-    render 'user_search'
   end
 
   def add_invites

spec/controllers/admins_controller_spec.rb

@@ -23,9 +23,10 @@ describe AdminsController do
         AppConfig[:admins] = [@user.username]
       end
 
-      it 'succeeds' do
+      it 'succeeds and renders user_search' do
         get :user_search
         response.should be_success
+        response.should render_template(:user_search)
       end
 
       it 'assigns users to an empty array if nothing is searched for' do