Fixing some funcitonal tests and moving solr server start to plugin

Rodrigo Souto
1 parent e705c4a8
Showing 8 changed files with 28 additions and 318 deletions Show diff stats
app/controllers/admin/region_validators_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/public/profile_search_controller.rb
app/helpers/search_helper.rb
plugins/solr/test/test_solr_helper.rb
test/functional/cms_controller_test.rb
test/functional/search_controller_test.rb
test/test_helper.rb
@@ -33,7 +33,7 @@ class RegionValidatorsController &lt; AdminController
   def load_region_and_search
     @region = environment.regions.find(params[:id])
     if params[:search]
-      @search = find_by_contents(Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
+      @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
     end
   end
@@ -270,7 +270,7 @@ class CmsController &lt; MyProfileController
   def search
     query = params[:q]
-    results = find_by_contents(profile.files.published, query)[:results]
+    results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
     render :text => article_list_to_json(results), :content_type => 'application/json'
   end
@@ -11,7 +11,7 @@ class ProfileSearchController &lt; PublicController
       if params[:where] == 'environment'
         redirect_to :controller => 'search', :query => @q
       else
-        @results = find_by_contents(profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
+        @results = find_by_contents(:articles, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
       end
     end
   end
@@ -66,6 +66,7 @@ module SearchHelper
   end
   def display_filter(asset, display)
+    asset = :articles if asset == :tag
     if display?(asset, display)
       display
     else
+# Start/stop Solr
+# FIXME Not working properly...
+if not $test_helper_loaded
+	abort unless system 'rake -s solr:start'
+  at_exit { system 'rake -s solr:stop' }
+  $test_helper_loaded = true
+end
+
 class ActsAsSolr::Post
   class << self
     alias_method :execute_orig, :execute
@@ -282,7 +282,6 @@ class CmsControllerTest &lt; ActionController::TestCase
   end
   should 'display destination folder of files when uploading file' do
-    TestSolr.enable
     f = Folder.new(:name => 'f'); profile.articles << f; f.save!
     get :upload_files, :profile => profile.identifier, :parent_id => f.id
@@ -1476,7 +1475,6 @@ class CmsControllerTest &lt; ActionController::TestCase
   end
   should 'search for content for inclusion in articles' do
-    TestSolr.enable
     file = UploadedFile.create!(:profile => @profile, :uploaded_data => fixture_file_upload('files/test.txt', 'text/plain'))
     get :search, :profile => @profile.identifier, :q => 'test.txt'
     assert_match /test.txt/, @response.body
@@ -7,7 +7,6 @@ class SearchController; def rescue_action(e) raise e end; end
 class SearchControllerTest < ActionController::TestCase
   def setup
-    TestSolr.enable
     @controller = SearchController.new
     @request    = ActionController::TestRequest.new
     @request.stubs(:ssl?).returns(false)
@@ -34,8 +33,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     user.stubs(:email).returns('some@test.com')
     user.stubs(:save!).returns(true)
     Person.any_instance.stubs(:user).returns(user)
-
-    env.enable_plugin(SolrPlugin)
   end
   def create_article_with_optional_category(name, profile, category = nil)
@@ -77,23 +74,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:searches)[:articles][:results], art
   end
-#  should 'get facets with articles search results' do
-#		cat1 = fast_create(Category, :name => 'cat1')
-#		cat2 = fast_create(Category, :name => 'cat2')
-#    person = fast_create(Person)
-#    art = create_article_with_optional_category('an article to be found', person)
-#		art.add_category cat1, false
-#		art.add_category cat2, true
-#		art.save!
-#
-#    get 'articles', :query => 'article found'
-#		assert !assigns(:searches)[:articles].facets.blank?
-#		assert assigns(:searches)[:articles].facets['facet_fields']['f_type_facet'][0][0] == 'Article'
-#		assert assigns(:searches)[:articles].facets['facet_fields']['f_profile_type_facet'][0][0] == 'Person'
-#		assert assigns(:searches)[:articles].facets['facet_fields']['f_category_facet'][0][0] == 'cat1'
-#		assert assigns(:searches)[:articles].facets['facet_fields']['f_category_facet'][1][0] == 'cat2'
-#  end
-
 	should 'redirect contents to articles' do
     person = fast_create(Person)
     art = create_article_with_optional_category('an article to be found', person)
@@ -120,7 +100,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     ent = create_profile_with_optional_category(Enterprise, 'teste')
     get :enterprises, :query => 'teste'
     assert_includes assigns(:searches)[:enterprises][:results], ent
-#		assert !assigns(:searches)[:enterprises].facets.nil?
   end
   should 'list enterprises in general' do
@@ -138,25 +117,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:searches)[:people][:results], p1
   end
-#  should 'get facets with people search results' do
-#    state = fast_create(State, :name => 'Acre', :acronym => 'AC')
-#    city = fast_create(City, :name => 'Rio Branco', :parent_id => state.id)
-#    person = Person.create!(:name => 'Hildebrando', :identifier => 'hild', :user_id => fast_create(User).id, :region_id => city.id)
-#    cat1 = fast_create(Category, :name => 'cat1')
-#    cat2 = fast_create(Category, :name => 'cat2')
-#    person.add_category cat1
-#    person.add_category cat2
-#
-#    get 'people', :query => 'Hildebrando'
-#
-#    assert !assigns(:searches)[:people].facets.blank?
-#    assert assigns(:searches)[:people].facets['facet_fields']['f_region_facet'][0][0] == city.id.to_s
-#
-#    categories_facet = assigns(:searches)[:people].facets['facet_fields']['f_categories_facet']
-#    assert_equal 2, categories_facet.count
-#    assert_equivalent [cat1.id.to_s, cat2.id.to_s], [categories_facet[0][0], categories_facet[1][0]]
-#  end
-
   # 'assets' menu outside any category
   should 'list people in general' do
     Profile.delete_all
@@ -173,7 +133,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     c1 = create_profile_with_optional_category(Community, 'a beautiful community')
     get :communities, :query => 'beautiful'
     assert_includes assigns(:searches)[:communities][:results], c1
-#		assert !assigns(:searches)[:communities].facets.nil?
   end
   # 'assets' menu outside any category
@@ -192,40 +151,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:searches)[:products][:results], prod
   end
-#  should 'get facets with products search results' do
-#		state = fast_create(State, :name => 'Acre', :acronym => 'AC')
-#		city = fast_create(City, :name => 'Rio Branco', :parent_id => state.id)
-#		ent = fast_create(Enterprise, :region_id => city.id)
-#    prod = Product.create!(:name => 'Sound System', :enterprise_id => ent.id, :product_category_id => @product_category.id)
-#		qualifier1 = fast_create(Qualifier)
-#		qualifier2 = fast_create(Qualifier)
-#		prod.qualifiers_list = [[qualifier1.id, 0], [qualifier2.id, 0]]
-#		prod.qualifiers.reload
-#		prod.save!
-#
-#    get 'products', :query => 'Sound'
-#		assert !assigns(:searches)[:products].facets.blank?
-#		assert assigns(:searches)[:products].facets['facet_fields']['f_category_facet'][0][0] == @product_category.name
-#		assert assigns(:searches)[:products].facets['facet_fields']['f_region_facet'][0][0] == city.id.to_s
-#		assert assigns(:searches)[:products].facets['facet_fields']['f_qualifier_facet'][0][0] == "#{qualifier1.id} 0"
-#		assert assigns(:searches)[:products].facets['facet_fields']['f_qualifier_facet'][1][0] == "#{qualifier2.id} 0"
-#  end
-
-  # 'assets' menu outside any category
-#  should 'list products in general without geosearch' do
-#    Profile.delete_all
-#		SearchController.stubs(:logged_in?).returns(false)
-#
-#    ent1 = create_profile_with_optional_category(Enterprise, 'teste1')
-#    ent2 = create_profile_with_optional_category(Enterprise, 'teste2')
-#    prod1 = ent1.products.create!(:name => 'a beautiful product', :product_category => @product_category)
-#    prod2 = ent2.products.create!(:name => 'another beautiful product', :product_category => @product_category)
-#
-#    get :products
-#    assert_equivalent [prod2, prod1], assigns(:searches)[:products].docs
-#		assert_match 'Highlights', @response.body
-#  end
-
   should 'include extra content supplied by plugins on product asset' do
     class Plugin1 < Noosfero::Plugin
       def asset_product_extras(product)
@@ -303,21 +228,21 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'boxes' }
   end
-#  should 'offer text box to enter a new search in general context' do
-#    get :index, :query => 'a sample search'
-#    assert_tag :tag => 'form', :attributes => { :action => '/search' }, :descendant => {
-#      :tag => 'input',
-#      :attributes => { :name => 'query', :value => 'a sample search' }
-#    }
-#  end
-#
-#  should 'offer text box to enter a new seach in specific context' do
-#    get :index, :category_path => [ 'my-category'], :query => 'a sample search'
-#    assert_tag :tag => 'form', :attributes => { :action => '/search/index/my-category' }, :descendant => {
-#      :tag => 'input',
-#      :attributes => { :name => 'query', :value => 'a sample search' }
-#    }
-#  end
+  should 'offer text box to enter a new search in general context' do
+    get :index, :query => 'a sample search'
+    assert_tag :tag => 'form', :attributes => { :action => '/search' }, :descendant => {
+      :tag => 'input',
+      :attributes => { :name => 'query', :value => 'a sample search' }
+    }
+  end
+
+  should 'offer text box to enter a new seach in specific context' do
+    get :index, :category_path => [ 'my-category'], :query => 'a sample search'
+    assert_tag :tag => 'form', :attributes => { :action => '/search/index/my-category' }, :descendant => {
+      :tag => 'input',
+      :attributes => { :name => 'query', :value => 'a sample search' }
+    }
+  end
   should 'search in category hierachy' do
     parent = Category.create!(:name => 'Parent Category', :environment => Environment.default)
@@ -330,33 +255,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:searches)[:people][:results], p
   end
-#  should 'find enterprise by product category' do
-#    ent1 = create_profile_with_optional_category(Enterprise, 'test1')
-#    prod_cat = ProductCategory.create!(:name => 'pctest', :environment => Environment.default)
-#    prod = ent1.products.create!(:name => 'teste', :product_category => prod_cat)
-#
-#    ent2 = create_profile_with_optional_category(Enterprise, 'test2')
-#
-#    get :index, :query => prod_cat.name
-#
-#    assert_includes assigns(:searches)[:enterprises][:results], ent1
-#    assert_not_includes assigns(:searches)[:enterprises][:results], ent2
-#  end
-
-#  should 'show only results in general search' do
-#    ent1 = create_profile_with_optional_category(Enterprise, 'test1')
-#    prod_cat = ProductCategory.create!(:name => 'pctest', :environment => Environment.default)
-#    prod = ent1.products.create!(:name => 'teste', :product_category => prod_cat)
-#
-#    ent2 = create_profile_with_optional_category(Enterprise, 'test2')
-#
-#    get :index, :query => prod_cat.name
-#
-#		assert assigns(:facets).blank?
-#		assert_nil assigns(:searches)[:enterprises].facets
-#		assert_nil assigns(:searches)[:products].facets
-#	end
-
   should 'render specific action when only one asset is enabled' do
     environment = Environment.default
 		# article is not disabled
@@ -412,7 +310,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     get :events, :query => 'event to be found'
     assert_includes assigns(:searches)[:events][:results], event
-#		assert !assigns(:searches)[:events].facets.nil?
   end
   should 'return events of the day' do
@@ -491,47 +388,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_includes assigns(:searches)[:products][:results], p
   end
-	# Testing random sequences always have a small chance of failing
-#	should 'randomize product display in empty search' do
-#    prod_cat = ProductCategory.create!(:name => 'prod cat test', :environment => Environment.default)
-#    ent = create_profile_with_optional_category(Enterprise, 'test enterprise')
-#		(1..SearchController::LIST_SEARCH_LIMIT+5).each do |n|
-#    	fast_create(Product, {:name => "produto #{n}", :enterprise_id => ent.id, :product_category_id => prod_cat.id}, :search => true)
-#		end	
-#
-#		get :products
-#		result1 = assigns(:searches)[:products][:results].map(&:id)
-#
-#		(1..10).each do |n|
-#  		get :products
-#		end
-#		result2 = assigns(:searches)[:products][:results].map(&:id)
-#
-#		assert_not_equal result1, result2
-#	end
-
-#	should 'remove far products by geolocalization empty logged search' do
-#    user = create_user('a_logged_user')
-#    # trigger geosearch
-#		user.person.lat = '1.0'
-#		user.person.lng = '1.0'
-#		SearchController.any_instance.stubs(:logged_in?).returns(true)
-#		SearchController.any_instance.stubs(:current_user).returns(user)
-#	
-#		cat = fast_create(ProductCategory)
-#		ent1 = Enterprise.create!(:name => 'ent1', :identifier => 'ent1', :lat => '1.3', :lng => '1.3')
-#    prod1 = Product.create!(:name => 'produto 1', :enterprise_id => ent1.id, :product_category_id => cat.id)
-#		ent2 = Enterprise.create!(:name => 'ent2', :identifier => 'ent2', :lat => '2.0', :lng => '2.0')
-#    prod2 = Product.create!(:name => 'produto 2', :enterprise_id => ent2.id, :product_category_id => cat.id)
-#		ent3 = Enterprise.create!(:name => 'ent3', :identifier => 'ent3', :lat => '1.6', :lng => '1.6')
-#    prod3 = Product.create!(:name => 'produto 3', :enterprise_id => ent3.id, :product_category_id => cat.id)
-#		ent4 = Enterprise.create!(:name => 'ent4', :identifier => 'ent4', :lat => '10', :lng => '10')
-#    prod4 = Product.create!(:name => 'produto 4', :enterprise_id => ent4.id, :product_category_id => cat.id)
-#
-#		get :products
-#		assert_equivalent [prod1, prod3, prod2], assigns(:searches)[:products].docs
-#	end
-
   should 'display properly in conjuntion with a category' do
     cat = Category.create(:name => 'cat', :environment => Environment.default)
     prod_cat1 = ProductCategory.create!(:name => 'prod cat test 1', :environment => Environment.default)
@@ -714,25 +570,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_not_includes assigns(:searches)[:communities][:results], p1
   end
-#	should 'browse facets when query is not empty' do
-#		get :articles, :query => 'something'
-#		get :facets_browse, :asset => 'articles', :facet_id => 'f_type'
-#		assert_equal assigns(:facet)[:id], 'f_type'
-#		get :products, :query => 'something'
-#		get :facets_browse, :asset => 'products', :facet_id => 'f_category'
-#		assert_equal assigns(:facet)[:id], 'f_category'
-#		get :people, :query => 'something'
-#		get :facets_browse, :asset => 'people', :facet_id => 'f_region'
-#		assert_equal assigns(:facet)[:id], 'f_region'
-#	end
-#
-#	should 'raise exception when facet is invalid' do
-#		get :articles, :query => 'something'
-#		assert_raise RuntimeError do
-#			get :facets_browse, :asset => 'articles', :facet_id => 'f_whatever'
-#		end
-#	end
-
 	should 'keep old urls working' do
 		get :assets, :asset => 'articles'
     assert_redirected_to :controller => :search, :action => :articles
@@ -790,92 +627,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equal [art2], assigns(:searches)[:articles][:results]
   end
-#  should 'order product results by more recent when requested' do
-#		ent = fast_create(Enterprise)
-#    prod1 = Product.create!(:name => 'product 1', :enterprise_id => ent.id, :product_category_id => @product_category.id)
-#    prod2 = Product.create!(:name => 'product 2', :enterprise_id => ent.id, :product_category_id => @product_category.id)
-#    prod3 = Product.create!(:name => 'product 3', :enterprise_id => ent.id, :product_category_id => @product_category.id)
-#
-#    # change others attrs will make updated_at = Time.now for all
-#    Product.record_timestamps = false
-#    prod3.update_attribute :updated_at, Time.now-2.days
-#    prod1.update_attribute :updated_at, Time.now-1.days
-#    prod2.update_attribute :updated_at, Time.now
-#    Product.record_timestamps = true
-#
-#    get :products, :query => 'product', :order_by => :more_recent 
-#
-#    assert_equal [prod2, prod1, prod3], assigns(:searches)[:products].docs  
-#  end
-#
-#  should 'only list products from enabled enterprises' do
-#		ent1 = fast_create(Enterprise, :enabled => true)
-#		ent2 = fast_create(Enterprise, :enabled => false)
-#    prod1 = Product.create!(:name => 'product 1', :enterprise_id => ent1.id, :product_category_id => @product_category.id)
-#    prod2 = Product.create!(:name => 'product 2', :enterprise_id => ent2.id, :product_category_id => @product_category.id)
-#
-#    get :products, :query => 'product'
-#
-#    assert_includes assigns(:searches)[:products][:results], prod1
-#    assert_not_includes assigns(:searches)[:products][:results], prod2
-#  end
-#
-#  should 'order product results by name when requested' do
-#		ent = fast_create(Enterprise)
-#    prod1 = Product.create!(:name => 'product 1', :enterprise_id => ent.id, :product_category_id => @product_category.id)
-#    prod2 = Product.create!(:name => 'product 2', :enterprise_id => ent.id, :product_category_id => @product_category.id)
-#    prod3 = Product.create!(:name => 'product 3', :enterprise_id => ent.id, :product_category_id => @product_category.id)
-#
-#    prod3.update_attribute :name, 'product A'
-#    prod2.update_attribute :name, 'product B'
-#    prod1.update_attribute :name, 'product C'
-#
-#    get :products, :query => 'product', :order_by => :name
-#
-#    assert_equal [prod3, prod2, prod1], assigns(:searches)[:products].docs  
-#  end
-#
-#	should 'order product results by closest when requested' do
-#    user = create_user('a_logged_user')
-#		user.person.lat = '1.0'
-#		user.person.lng = '1.0'
-#    # trigger geosearch
-#		SearchController.any_instance.stubs(:logged_in?).returns(true)
-#		SearchController.any_instance.stubs(:current_user).returns(user)
-#	
-#		cat = fast_create(ProductCategory)
-#		ent1 = Enterprise.create!(:name => 'ent1', :identifier => 'ent1', :lat => '-5.0', :lng => '-5.0')
-#    prod1 = Product.create!(:name => 'product 1', :enterprise_id => ent1.id, :product_category_id => cat.id)
-#		ent2 = Enterprise.create!(:name => 'ent2', :identifier => 'ent2', :lat => '2.0', :lng => '2.0')
-#    prod2 = Product.create!(:name => 'product 2', :enterprise_id => ent2.id, :product_category_id => cat.id)
-#		ent3 = Enterprise.create!(:name => 'ent3', :identifier => 'ent3', :lat => '10.0', :lng => '10.0')
-#    prod3 = Product.create!(:name => 'product 3', :enterprise_id => ent3.id, :product_category_id => cat.id)
-#
-#		get :products, :query => 'product', :order_by => :closest
-#		assert_equal [prod2, prod1, prod3], assigns(:searches)[:products].docs
-#	end
-#
-#  
-#  should 'order events by name when requested' do
-#    person = create_user('someone').person
-#    ev1 = create_event(person, :name => 'party B', :category_ids => [@category.id],	:start_date => Date.today - 10.day)
-#    ev2 = create_event(person, :name => 'party A', :category_ids => [@category.id],	:start_date => Date.today - 2.month)
-#
-#    get :events, :query => 'party', :order_by => :name
-#
-#    assert_equal [ev2, ev1], assigns(:searches)[:events].docs
-#  end
-#
-#  should 'order articles by name when requested' do
-#		art1 = Article.create!(:name => 'review C', :profile_id => fast_create(Person).id)
-#		art2 = Article.create!(:name => 'review A', :profile_id => fast_create(Person).id)
-#		art3 = Article.create!(:name => 'review B', :profile_id => fast_create(Person).id)
-#    
-#    get :articles, :query => 'review', :order_by => :name
-#
-#    assert_equal [art2, art3, art1], assigns(:searches)[:articles].docs
-#  end
-
   should 'order articles by more recent' do
     Article.destroy_all
 		art1 = Article.create!(:name => 'review C', :profile_id => fast_create(Person).id, :created_at => Time.now-1.days)
@@ -887,46 +638,6 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equal [art2, art1, art3], assigns(:searches)[:articles][:results]
   end
-#  should 'order enterprise results by name when requested' do
-#		ent1 = Enterprise.create!(:name => 'Company B', :identifier => 'com_b')
-#		ent2 = Enterprise.create!(:name => 'Company A', :identifier => 'com_a')
-#		ent3 = Enterprise.create!(:name => 'Company C', :identifier => 'com_c')
-#    
-#    get :enterprises, :query => 'Company', :order_by => :name
-#
-#    assert_equal [ent2, ent1, ent3], assigns(:searches)[:enterprises].docs
-#  end
-#
-#  should 'order people results by name when requested' do
-#		person1 = Person.create!(:name => 'Deodárbio Silva', :identifier => 'deod', :user_id => fast_create(User).id)
-#		person2 = Person.create!(:name => 'Glislange Silva', :identifier => 'glis', :user_id => fast_create(User).id)
-#		person3 = Person.create!(:name => 'Ausêncio Silva', :identifier => 'ause', :user_id => fast_create(User).id)
-#
-#    get :people, :query => 'Silva', :order_by => :name
-#    
-#    assert_equal [person3, person1, person2], assigns(:searches)[:people].docs 
-#  end
-#
-#  should 'order community results by name when requested' do
-#		com1 = Community.create!(:name => 'Yellow Group')
-#		com2 = Community.create!(:name => 'Red Group')
-#		com3 = Community.create!(:name => 'Green Group')
-#
-#    get :communities, :query => 'Group', :order_by => :name
-#
-#    assert_equal [com3, com2, com1], assigns(:searches)[:communities].docs
-#  end
-#
-#  should 'raise error when requested to order by unknown filter' do
-#		com1 = Community.create!(:name => 'Yellow Group')
-#		com2 = Community.create!(:name => 'Red Group')
-#		com3 = Community.create!(:name => 'Green Group')
-#
-#    assert_raise RuntimeError do
-#      get :communities, :query => 'Group', :order_by => :something
-#    end
-#  end
-
   should 'add highlighted CSS class around a highlighted product' do
     enterprise = fast_create(Enterprise)
     product = Product.create!(:name => 'Enter Sandman', :enterprise_id => enterprise.id, :product_category_id => @product_category.id, :highlighted => true)
@@ -941,8 +652,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'li', :attributes => { :class => 'search-product-item highlighted' }, :content => /Holier Than Thou/
   end
-  ##################################################################
-  ##################################################################
+  protected
   def create_event(profile, options)
     ev = Event.new({ :name => 'some event', :start_date => Date.new(2008,1,1) }.merge(options))
 ENV["RAILS_ENV"] = "test"
-# Start/stop Solr
-if not $test_helper_loaded
-	abort unless system 'rake -s solr:start'
-  at_exit { system 'rake -s solr:stop' }
-  $test_helper_loaded = true
-end
-
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 require 'mocha'
	@@ -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].reject {\|item\| @region.validator_ids.include?(item.id) }	36	+ @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {\|item\| @region.validator_ids.include?(item.id) }
37	end	37	end
38	end	38	end
39		39
	@@ -270,7 +270,7 @@ class CmsController < MyProfileController		@@ -270,7 +270,7 @@ class CmsController < MyProfileController
270		270
271	def search	271	def search
272	query = params[:q]	272	query = params[:q]
273	- results = find_by_contents(profile.files.published, query)[:results]	273	+ results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
274	render :text => article_list_to_json(results), :content_type => 'application/json'	274	render :text => article_list_to_json(results), :content_type => 'application/json'
275	end	275	end
276		276
	@@ -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 = find_by_contents(profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]	14	+ @results = find_by_contents(:articles, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
15	end	15	end
16	end	16	end
17	end	17	end
	@@ -66,6 +66,7 @@ module SearchHelper		@@ -66,6 +66,7 @@ module SearchHelper
66	end	66	end
67		67
68	def display_filter(asset, display)	68	def display_filter(asset, display)
		69	+ asset = :articles if asset == :tag
69	if display?(asset, display)	70	if display?(asset, display)
70	display	71	display
71	else	72	else
		1	+# Start/stop Solr
		2	+# FIXME Not working properly...
		3	+if not $test_helper_loaded
		4	+ abort unless system 'rake -s solr:start'
		5	+ at_exit { system 'rake -s solr:stop' }
		6	+ $test_helper_loaded = true
		7	+end
		8	+
1	class ActsAsSolr::Post	9	class ActsAsSolr::Post
2	class << self	10	class << self
3	alias_method :execute_orig, :execute	11	alias_method :execute_orig, :execute
1	ENV["RAILS_ENV"] = "test"	1	ENV["RAILS_ENV"] = "test"
2		2
3	-# Start/stop Solr
4	-if not $test_helper_loaded
5	- abort unless system 'rake -s solr:start'
6	- at_exit { system 'rake -s solr:stop' }
7	- $test_helper_loaded = true
8	-end
9	-
10	require File.expand_path(File.dirname(__FILE__) + "/../config/environment")	3	require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
11	require 'test_help'	4	require 'test_help'
12	require 'mocha'	5	require 'mocha'