From 6bebebcbc335084cf7cbd841219cafd57375a810 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Wed, 27 Jul 2011 19:10:29 +0000 Subject: [PATCH] Fix functional tests for Solr port --- app/controllers/public/browse_controller.rb | 10 ++++++---- app/controllers/public/profile_search_controller.rb | 2 +- test/functional/browse_controller_test.rb | 1 + test/functional/profile_members_controller_test.rb | 5 +++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/controllers/public/browse_controller.rb b/app/controllers/public/browse_controller.rb index f1e55ef..cd063b9 100644 --- a/app/controllers/public/browse_controller.rb +++ b/app/controllers/public/browse_controller.rb @@ -19,9 +19,10 @@ class BrowseController < PublicController @results = @environment.people.visible.send(@filter) if !params[:query].blank? - @results = @results.find_by_contents(params[:query])[:results] + @results = @results.find_by_contents(params[:query], {:per_page => per_page, :page => params[:page]})[:results] + else + @results = @results.compact.paginate(:per_page => per_page, :page => params[:page]) end - @results = @results.compact.paginate(:per_page => per_page, :page => params[:page]) end def communities @@ -31,9 +32,10 @@ class BrowseController < PublicController @results = @environment.communities.visible.send(@filter) if !params[:query].blank? - @results = @results.find_by_contents(params[:query])[:results] + @results = @results.find_by_contents(params[:query], {:per_page => per_page, :page => params[:page]})[:results] + else + @results = @results.compact.paginate(:per_page => per_page, :page => params[:page]) end - @results = @results.compact.paginate(:per_page => per_page, :page => params[:page]) end protected diff --git a/app/controllers/public/profile_search_controller.rb b/app/controllers/public/profile_search_controller.rb index e678ab6..78bd38b 100644 --- a/app/controllers/public/profile_search_controller.rb +++ b/app/controllers/public/profile_search_controller.rb @@ -11,7 +11,7 @@ class ProfileSearchController < PublicController if params[:where] == 'environment' redirect_to :controller => 'search', :query => @q else - @results = profile.articles.published.find_by_contents(@q)[:results].paginate(:per_page => 10, :page => params[:page]) + @results = Article.find_by_contents(@q + " profile_id:#{profile.id} published:true")[:results].paginate(:per_page => 10, :page => params[:page]) end end end diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index c66e802..bf25598 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -7,6 +7,7 @@ class BrowseController; def rescue_action(e) raise e end; end class BrowseControllerTest < Test::Unit::TestCase def setup + Test::Unit::TestCase::setup @controller = BrowseController.new @request = ActionController::TestRequest.new @request.stubs(:ssl?).returns(false) diff --git a/test/functional/profile_members_controller_test.rb b/test/functional/profile_members_controller_test.rb index dc85aae..7cc66b1 100644 --- a/test/functional/profile_members_controller_test.rb +++ b/test/functional/profile_members_controller_test.rb @@ -6,6 +6,7 @@ class ProfileMembersController; def rescue_action(e) raise e end; end class ProfileMembersControllerTest < Test::Unit::TestCase def setup + Test::Unit::TestCase::setup @controller = ProfileMembersController.new @request = ActionController::TestRequest.new @request.stubs(:ssl?).returns(true) @@ -234,12 +235,12 @@ class ProfileMembersControllerTest < Test::Unit::TestCase end should 'find users' do - ent = fast_create(Enterprise, :name => 'Test Ent', :identifier => 'test_ent') + ent = fast_create(Enterprise, {:name => 'Test Ent', :identifier => 'test_ent'}, :search => true) user = create_user_full('test_user').person person = create_user_with_permission('ent_user', 'manage_memberships', ent) login_as :ent_user - get :find_users, :profile => ent.identifier, :query => 'test*', :scope => 'all_users' + get :find_users, :profile => ent.identifier, :query => 'test', :scope => 'all_users' assert_includes assigns(:users_found), user end -- libgit2 0.21.2