Download as
Browse Code »

Commit 0fb41209ada6ccf726b0fd46d767dfb05d808b8a

Authored by Rodrigo Souto
1 parent 2380546e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Removing solr from region tests 

Also removing region unit tests that are already being done in the
functional test.
Showing 4 changed files with 7 additions and 35 deletions   Show diff stats
app/controllers/admin/region_validators_controller.rb
  Diff comments   View file @0fb4120
@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController @@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController
33 def load_region_and_search 33 def load_region_and_search
34 @region = environment.regions.find(params[:id]) 34 @region = environment.regions.find(params[:id])
35 if params[:search] 35 if params[:search]
36 - @search = find_by_contents(Organization, params[:search])[:results].docs.reject {|item| @region.validator_ids.include?(item.id) } 36 + @search = find_by_contents(Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
37 end 37 end
38 end 38 end
39 39
app/controllers/application_controller.rb
  Diff comments   View file @0fb4120
@@ -154,11 +154,10 @@ class ApplicationController < ActionController::Base @@ -154,11 +154,10 @@ class ApplicationController < ActionController::Base
154 end 154 end
155 end 155 end
156 156
157 - def find_by_contents(scope, query, paginate_options={}, options={})  
158 - if query.blank?  
159 - scope = scope.send(options[:filter]) if options[:filter]  
160 - return {:results => scope.paginate(paginate_options)}  
161 - end 157 + def find_by_contents(scope, query, paginate_options={:page => 1}, options={})
  158 + scope = scope.send(options[:filter]) if options[:filter]
  159 + return {:results => scope.paginate(paginate_options)} if query.blank?
  160 +
162 @plugins.first(:find_by_contents, scope, query, paginate_options, options) || 161 @plugins.first(:find_by_contents, scope, query, paginate_options, options) ||
163 fallback_find_by_contents(scope, query, paginate_options, options) 162 fallback_find_by_contents(scope, query, paginate_options, options)
164 end 163 end
@@ -168,9 +167,9 @@ class ApplicationController < ActionController::Base @@ -168,9 +167,9 @@ class ApplicationController < ActionController::Base
168 def fallback_find_by_contents(scope, query, paginate_options, options) 167 def fallback_find_by_contents(scope, query, paginate_options, options)
169 fields = scope.base_class::SEARCHABLE_FIELDS.keys.map(&:to_s) & scope.base_class.column_names 168 fields = scope.base_class::SEARCHABLE_FIELDS.keys.map(&:to_s) & scope.base_class.column_names
170 conditions = fields.map do |field| 169 conditions = fields.map do |field|
171 - "#{scope.base_class.table_name}.#{field} LIKE \"%#{query.downcase}%\"" 170 + "lower(#{scope.base_class.table_name}.#{field}) LIKE \"%#{query.downcase.strip}%\""
172 end.join(' OR ') 171 end.join(' OR ')
173 - {:results => scope.send(options[:filter]).where(conditions).paginate(paginate_options)} 172 + {:results => scope.where(conditions).paginate(paginate_options)}
174 end 173 end
175 174
176 end 175 end
test/functional/region_validators_controller_test.rb
  Diff comments   View file @0fb4120
@@ -46,7 +46,6 @@ class RegionValidatorsControllerTest < ActionController::TestCase @@ -46,7 +46,6 @@ class RegionValidatorsControllerTest < ActionController::TestCase
46 end 46 end
47 47
48 should 'search possible validators by name' do 48 should 'search possible validators by name' do
49 - TestSolr.enable  
50 environment = fast_create(Environment, :name => "my environment") 49 environment = fast_create(Environment, :name => "my environment")
51 give_permission('ze', 'manage_environment_validators', environment) 50 give_permission('ze', 'manage_environment_validators', environment)
52 region = Region.new(:name => 'my region') 51 region = Region.new(:name => 'my region')
test/unit/region_test.rb
  Diff comments   View file @0fb4120
@@ -16,32 +16,6 @@ class RegionTest < ActiveSupport::TestCase @@ -16,32 +16,6 @@ class RegionTest < ActiveSupport::TestCase
16 end 16 end
17 end 17 end
18 18
19 - should 'be able to search for possible validators by name' do  
20 - TestSolr.enable  
21 - env = fast_create(Environment)  
22 - region = fast_create(Region, :environment_id => env.id, :name => 'My Region')  
23 - org1 = Organization.create!(:name => 'Organization 1', :identifier => 'org1', :environment_id => env.id)  
24 - org2 = Organization.create!(:name => 'Organization 2', :identifier => 'org2', :environment_id => env.id)  
25 -  
26 - possible = region.search_possible_validators('organization')  
27 - assert possible.include?(org2)  
28 - assert_includes possible, org2  
29 - assert_includes possible, org1  
30 - end  
31 -  
32 - should 'return search results without validators that are already associated to the current region' do  
33 - TestSolr.enable  
34 - env = fast_create(Environment)  
35 - region = fast_create(Region, :environment_id => env.id, :name => 'My Region')  
36 - org1 = fast_create(Organization, {:name => 'Organization 1', :identifier => 'org1', :environment_id => env.id}, :search => true)  
37 - org2 = fast_create(Organization, {:name => 'Organization 2', :identifier => 'org2', :environment_id => env.id}, :search => true)  
38 - region.validators << org1  
39 -  
40 - possible = region.search_possible_validators('organization')  
41 - assert_includes possible, org2  
42 - assert_not_includes possible, org1  
43 - end  
44 -  
45 should 'has validator' do 19 should 'has validator' do
46 env = fast_create(Environment) 20 env = fast_create(Environment)
47 region = fast_create(Region, :environment_id => env.id, :name => 'My Region') 21 region = fast_create(Region, :environment_id => env.id, :name => 'My Region')