Download as
Browse Code »

Commit 12f620dbd4c7dabb595656a11098dd94dee6d91f

Authored by Luciano Prestes
1 parent 951bdbf5
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fix search communities tests

Showing 2 changed files with 6 additions and 10 deletions   Show diff stats
lib/ext/search_controller.rb
  Diff comments   View file @12f620d
... ... @@ -3,11 +3,10 @@ require_dependency 'search_controller'
3 3 class SearchController
4 4  
5 5 def communities
6   - @scope = visible_profiles(Community)
7   - full_text_search
8   - results = @searches[@asset][:results]
9   -
10   - results = results.each {|community| !community.institution?}
  6 + results = filter_communities_list do |community|
  7 + !community.institution?
  8 + end
  9 + results = results.paginate(:per_page => 24, :page => params[:page])
11 10 @searches[@asset] = {:results => results}
12 11 @search = results
13 12 end
... ...
test/functional/search_controller_test.rb
  Diff comments   View file @12f620d
... ... @@ -35,7 +35,7 @@ class SearchControllerTest < ActionController::TestCase
35 35 get :communities, :query => "New"
36 36  
37 37 assert_includes assigns(:searches)[:communities][:results], community
38   - assert_not_includes assigns(:searches)[:communities][:results], institution
  38 + assert_not_includes assigns(:searches)[:communities][:results], institution.community
39 39 end
40 40  
41 41 should "institutions_search don't have community" do
... ... @@ -51,10 +51,7 @@ class SearchControllerTest < ActionController::TestCase
51 51  
52 52 get :institutions, :query => "New"
53 53  
54   - assert_includes(
55   - assigns(:searches)[:institutions][:results],
56   - institution.community
57   - )
  54 + assert_includes assigns(:searches)[:institutions][:results], institution.community
58 55 assert_not_includes assigns(:searches)[:institutions][:results], community
59 56 end
60 57 end
... ...