Download as
Browse Code »

Commit 6bebebcbc335084cf7cbd841219cafd57375a810

Authored by Braulio Bhavamitra
1 parent 82ea2817
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fix functional tests for Solr port

Showing 4 changed files with 11 additions and 7 deletions   Show diff stats
app/controllers/public/browse_controller.rb
  Diff comments   View file @6bebebc
@@ -19,9 +19,10 @@ class BrowseController < PublicController @@ -19,9 +19,10 @@ class BrowseController < PublicController
19 @results = @environment.people.visible.send(@filter) 19 @results = @environment.people.visible.send(@filter)
20 20
21 if !params[:query].blank? 21 if !params[:query].blank?
22 - @results = @results.find_by_contents(params[:query])[:results] 22 + @results = @results.find_by_contents(params[:query], {:per_page => per_page, :page => params[:page]})[:results]
  23 + else
  24 + @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
23 end 25 end
24 - @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])  
25 end 26 end
26 27
27 def communities 28 def communities
@@ -31,9 +32,10 @@ class BrowseController < PublicController @@ -31,9 +32,10 @@ class BrowseController < PublicController
31 @results = @environment.communities.visible.send(@filter) 32 @results = @environment.communities.visible.send(@filter)
32 33
33 if !params[:query].blank? 34 if !params[:query].blank?
34 - @results = @results.find_by_contents(params[:query])[:results] 35 + @results = @results.find_by_contents(params[:query], {:per_page => per_page, :page => params[:page]})[:results]
  36 + else
  37 + @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])
35 end 38 end
36 - @results = @results.compact.paginate(:per_page => per_page, :page => params[:page])  
37 end 39 end
38 40
39 protected 41 protected
app/controllers/public/profile_search_controller.rb
  Diff comments   View file @6bebebc
@@ -11,7 +11,7 @@ class ProfileSearchController < PublicController @@ -11,7 +11,7 @@ class ProfileSearchController < PublicController
11 if params[:where] == 'environment' 11 if params[:where] == 'environment'
12 redirect_to :controller => 'search', :query => @q 12 redirect_to :controller => 'search', :query => @q
13 else 13 else
14 - @results = profile.articles.published.find_by_contents(@q)[:results].paginate(:per_page => 10, :page => params[:page]) 14 + @results = Article.find_by_contents(@q + " profile_id:#{profile.id} published:true")[:results].paginate(:per_page => 10, :page => params[:page])
15 end 15 end
16 end 16 end
17 end 17 end
test/functional/browse_controller_test.rb
  Diff comments   View file @6bebebc
@@ -7,6 +7,7 @@ class BrowseController; def rescue_action(e) raise e end; end @@ -7,6 +7,7 @@ class BrowseController; def rescue_action(e) raise e end; end
7 class BrowseControllerTest < Test::Unit::TestCase 7 class BrowseControllerTest < Test::Unit::TestCase
8 8
9 def setup 9 def setup
  10 + Test::Unit::TestCase::setup
10 @controller = BrowseController.new 11 @controller = BrowseController.new
11 @request = ActionController::TestRequest.new 12 @request = ActionController::TestRequest.new
12 @request.stubs(:ssl?).returns(false) 13 @request.stubs(:ssl?).returns(false)
test/functional/profile_members_controller_test.rb
  Diff comments   View file @6bebebc
@@ -6,6 +6,7 @@ class ProfileMembersController; def rescue_action(e) raise e end; end @@ -6,6 +6,7 @@ class ProfileMembersController; def rescue_action(e) raise e end; end
6 6
7 class ProfileMembersControllerTest < Test::Unit::TestCase 7 class ProfileMembersControllerTest < Test::Unit::TestCase
8 def setup 8 def setup
  9 + Test::Unit::TestCase::setup
9 @controller = ProfileMembersController.new 10 @controller = ProfileMembersController.new
10 @request = ActionController::TestRequest.new 11 @request = ActionController::TestRequest.new
11 @request.stubs(:ssl?).returns(true) 12 @request.stubs(:ssl?).returns(true)
@@ -234,12 +235,12 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase @@ -234,12 +235,12 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase
234 end 235 end
235 236
236 should 'find users' do 237 should 'find users' do
237 - ent = fast_create(Enterprise, :name => 'Test Ent', :identifier => 'test_ent') 238 + ent = fast_create(Enterprise, {:name => 'Test Ent', :identifier => 'test_ent'}, :search => true)
238 user = create_user_full('test_user').person 239 user = create_user_full('test_user').person
239 person = create_user_with_permission('ent_user', 'manage_memberships', ent) 240 person = create_user_with_permission('ent_user', 'manage_memberships', ent)
240 login_as :ent_user 241 login_as :ent_user
241 242
242 - get :find_users, :profile => ent.identifier, :query => 'test*', :scope => 'all_users' 243 + get :find_users, :profile => ent.identifier, :query => 'test', :scope => 'all_users'
243 244
244 assert_includes assigns(:users_found), user 245 assert_includes assigns(:users_found), user
245 end 246 end