From bc68cd447c6c69094304d7a5bd6bc126bf1eed78 Mon Sep 17 00:00:00 2001 From: Carolyn Cole Date: Wed, 19 Feb 2014 15:08:27 -0500 Subject: [PATCH] Removing eager loading deprication warning --- .../sufia/users_controller_behavior.rb | 2 +- spec/controllers/users_controller_spec.rb | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/app/controllers/concerns/sufia/users_controller_behavior.rb b/app/controllers/concerns/sufia/users_controller_behavior.rb index f36bf0ad40..c3230c991b 100644 --- a/app/controllers/concerns/sufia/users_controller_behavior.rb +++ b/app/controllers/concerns/sufia/users_controller_behavior.rb @@ -17,7 +17,7 @@ def index unless query.blank? base = base.where("#{Devise.authentication_keys.first} like lower(?) OR display_name like lower(?)", query, query) end - @users = base.order(sort_val).page(params[:page]).per(10) + @users = base.references(:trophies).order(sort_val).page(params[:page]).per(10) respond_to do |format| format.html diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index a4781e910f..860de48d8f 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -65,6 +65,37 @@ json.map{|u| u['text']}.should include(@u1.email, @u2.email) end end + describe "query users" do + it "finds the expected user via email" do + get :index, uq: @u1.email + assigns[:users].should include(@u1) + assigns[:users].should_not include(@u2) + response.should be_successful + end + it "finds the expected user via display name" do + @u1.display_name = "Dr. Curator" + @u1.save + @u2.display_name = "Jr. Architect" + @u2.save + User.any_instance.stub(:display_name).and_return("Dr. Curator", "Jr.Archivist") + get :index, uq: @u1.display_name + assigns[:users].should include(@u1) + assigns[:users].should_not include(@u2) + response.should be_successful + @u1.display_name = nil + @u1.save + @u2.display_name = nil + @u2.save + end + it "uses the base query" do + u3 = FactoryGirl.find_or_create(:user) + controller.stub(:base_query).and_return(['email == "jilluser@example.com"']) + get :index + assigns[:users].should include(u3) + assigns[:users].should_not include(@u1, @u2) + u3.destroy + end + end end describe "#edit" do it "show edit form when user edits own profile" do