From 0fb41209ada6ccf726b0fd46d767dfb05d808b8a Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Tue, 5 Mar 2013 16:32:16 -0300
Subject: [PATCH] Removing solr from region tests

---
 app/controllers/admin/region_validators_controller.rb |  2 +-
 app/controllers/application_controller.rb             | 13 ++++++-------
 test/functional/region_validators_controller_test.rb  |  1 -
 test/unit/region_test.rb                              | 26 --------------------------
 4 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/app/controllers/admin/region_validators_controller.rb b/app/controllers/admin/region_validators_controller.rb
index fe6bcb2..348dfdd 100644
--- a/app/controllers/admin/region_validators_controller.rb
+++ b/app/controllers/admin/region_validators_controller.rb
@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController
   def load_region_and_search
     @region = environment.regions.find(params[:id])
     if params[:search]
-      @search = find_by_contents(Organization, params[:search])[:results].docs.reject {|item| @region.validator_ids.include?(item.id) }
+      @search = find_by_contents(Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
     end
   end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f5b39d3..eb58983 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -154,11 +154,10 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def find_by_contents(scope, query, paginate_options={}, options={})
-    if query.blank?
-      scope = scope.send(options[:filter]) if options[:filter]
-      return {:results => scope.paginate(paginate_options)}
-    end
+  def find_by_contents(scope, query, paginate_options={:page => 1}, options={})
+    scope = scope.send(options[:filter]) if options[:filter]
+    return {:results => scope.paginate(paginate_options)} if query.blank?
+
     @plugins.first(:find_by_contents, scope, query, paginate_options, options) ||
     fallback_find_by_contents(scope, query, paginate_options, options)
   end
@@ -168,9 +167,9 @@ class ApplicationController < ActionController::Base
   def fallback_find_by_contents(scope, query, paginate_options, options)
     fields = scope.base_class::SEARCHABLE_FIELDS.keys.map(&:to_s) & scope.base_class.column_names
     conditions = fields.map do |field|
-      "#{scope.base_class.table_name}.#{field} LIKE \"%#{query.downcase}%\""
+      "lower(#{scope.base_class.table_name}.#{field}) LIKE \"%#{query.downcase.strip}%\""
     end.join(' OR ')
-    {:results => scope.send(options[:filter]).where(conditions).paginate(paginate_options)}
+    {:results => scope.where(conditions).paginate(paginate_options)}
   end
 
 end
diff --git a/test/functional/region_validators_controller_test.rb b/test/functional/region_validators_controller_test.rb
index af9b7c9..2447fe2 100644
--- a/test/functional/region_validators_controller_test.rb
+++ b/test/functional/region_validators_controller_test.rb
@@ -46,7 +46,6 @@ class RegionValidatorsControllerTest < ActionController::TestCase
   end
 
   should 'search possible validators by name' do
-    TestSolr.enable
     environment = fast_create(Environment, :name => "my environment")
     give_permission('ze', 'manage_environment_validators', environment)    
     region = Region.new(:name => 'my region')
diff --git a/test/unit/region_test.rb b/test/unit/region_test.rb
index c213c4a..477782b 100644
--- a/test/unit/region_test.rb
+++ b/test/unit/region_test.rb
@@ -16,32 +16,6 @@ class RegionTest < ActiveSupport::TestCase
     end
   end
 
-  should 'be able to search for possible validators by name' do
-    TestSolr.enable
-    env = fast_create(Environment)
-    region = fast_create(Region, :environment_id => env.id, :name => 'My Region')
-    org1 = Organization.create!(:name => 'Organization 1', :identifier => 'org1', :environment_id => env.id)
-    org2 = Organization.create!(:name => 'Organization 2', :identifier => 'org2', :environment_id => env.id)
-
-    possible = region.search_possible_validators('organization')
-    assert possible.include?(org2)
-    assert_includes possible, org2
-    assert_includes possible, org1
-  end
-
-  should 'return search results without validators that are already associated to the current region' do
-    TestSolr.enable
-    env = fast_create(Environment)
-    region = fast_create(Region, :environment_id => env.id, :name => 'My Region')
-    org1 = fast_create(Organization, {:name => 'Organization 1', :identifier => 'org1', :environment_id => env.id}, :search => true)
-    org2 = fast_create(Organization, {:name => 'Organization 2', :identifier => 'org2', :environment_id => env.id}, :search => true)
-    region.validators << org1
-
-    possible = region.search_possible_validators('organization')
-    assert_includes possible, org2
-    assert_not_includes possible, org1
-  end
-
   should 'has validator' do
     env = fast_create(Environment)
     region = fast_create(Region, :environment_id => env.id, :name => 'My Region')
--
libgit2 0.21.2