Fixing search controller tests

Rodrigo Souto
1 parent 755f9431
Showing 8 changed files with 49 additions and 39 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/search_helper.rb
app/models/article.rb
app/models/enterprise.rb
app/models/product.rb
app/models/profile.rb
app/views/search/_display_results.rhtml
test/functional/search_controller_test.rb
@@ -33,7 +33,10 @@ class SearchController &lt; PublicController
     end
     @asset = nil
-    render :action => @searches.keys.first if @searches.keys.size == 1
+    if @searches.keys.size == 1
+      @asset = @searches.keys.first
+      render :action => @asset
+    end
   end
   # view the summary of one category
@@ -170,7 +173,7 @@ class SearchController &lt; PublicController
       return
     end
-    @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{params[:action]}") }
+    @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") }
     @searching = {}
     @titles = {}
     @enabled_searches.each do |key, name|
@@ -14,17 +14,6 @@ module SearchHelper
     :events, _('Events'),
   ]
-  VALID_DISPLAYS = %w[full compatct map]
-
-  DEFAULT_DISPLAY = {
-    :articles => 'full',
-    :communities => 'compact',
-    :enterprises => 'compact',
-    :events => 'full',
-    :people => 'compact',
-    :products => 'full',
-  }
-
   FILTER_TRANSLATION = {
     'more_popular' => _('More popular'),
     'more_active' => _('More active'),
@@ -60,20 +49,12 @@ module SearchHelper
       :align => 'center', :class => 'search-category-context') if category
   end
-  def display_map?(asset)
-    [:enterprises, :products].include?(asset)
-  end
-
-  def display_compact?(asset)
-    [:communities, :enterprises, :people].include?(asset)
-  end
-
-  def display_full?(asset)
-    [:articles, :enterprises, :events, :products].include?(asset)
+  def display?(asset, mode)
+    defined?(asset_class(asset)::SEARCH_DISPLAYS) && asset_class(asset)::SEARCH_DISPLAYS.include?(mode.to_s)
   end
   def display_results(searches=nil, asset=nil)
-    if display_map?(asset) && map_search?(searches)
+    if display?(asset, :map) && map_search?(searches)
       partial = 'google_maps'
       klass = 'map'
     else
@@ -84,11 +65,12 @@ module SearchHelper
     content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
   end
-  def display_filter(asset, display)
-    if VALID_DISPLAYS.include?(display) && send("display_#{display}?", asset)
+  def display_filter(item, display)
+    asset = item.class.name.downcase.pluralize.to_sym
+    if display?(asset, display)
       display
     else
-      DEFAULT_DISPLAY[asset]
+      item.default_search_display
     end
   end
@@ -106,10 +88,10 @@ module SearchHelper
   end
   def display_selector(asset, display, float = 'right')
-    if [display_map?(asset), display_compact?(asset), display_full?(asset)].select {|option| option}.count > 1
-      compact_link = display_compact?(asset) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil
-      map_link = display_map?(asset) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
-      full_link = display_full?(asset) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
+    if [display?(asset, :map), display?(asset, :compact), display?(asset, :full)].select {|option| option}.count > 1
+      compact_link = display?(asset, :compact) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil
+      map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
+      full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
       content_tag('div', 
         content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | '),
         :class => 'search-customize-options'
@@ -16,6 +16,12 @@ class Article &lt; ActiveRecord::Base
     more_comments
   ]
+  SEARCH_DISPLAYS = %w[full]
+
+  def default_search_display
+    'full'
+  end
+
   track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { |a| a.is_trackable? && !a.image? }
   # xss_terminate plugin can't sanitize array fields
@@ -2,6 +2,8 @@
 # only enterprises can offer products and services.
 class Enterprise < Organization
+  SEARCH_DISPLAYS += %w[map full]
+
   def self.type_name
     _('Enterprise')
   end
@@ -9,6 +9,12 @@ class Product &lt; ActiveRecord::Base
     more_recent
   ]
+  SEARCH_DISPLAYS = %w[map full]
+
+  def default_search_display
+    'full'
+  end
+
   belongs_to :enterprise
   has_one :region, :through => :enterprise
   validates_presence_of :enterprise
@@ -13,6 +13,12 @@ class Profile &lt; ActiveRecord::Base
     more_recent
   ]
+  SEARCH_DISPLAYS = %w[compact]
+
+  def default_search_display
+    'compact'
+  end
+
   module Roles
     def self.admin(env_id)
       find_role('admin', env_id)
@@ -12,11 +12,11 @@
           <% end %>
         <% end %>
-        <% display = display_filter(name, params[:display]) %>
         <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if [:enterprises, :people, :communities].include?(name) %>">
           <ul>
           <% search[:results].each do |hit| %>
+            <% display = display_filter(hit, params[:display]) %>
             <% partial = partial_for_class(hit.class, display) %>
             <% variable_name = partial.gsub("#{display}_", '').to_sym %>
             <%= render :partial => partial, :locals => {variable_name => hit} %>
@@ -355,17 +355,22 @@ class SearchControllerTest &lt; ActionController::TestCase
 #	end
   should 'render specific action when only one asset is enabled' do
-		# initialize @controller.environment
-		get :index
-
+    environment = Environment.default
 		# article is not disabled
     [:enterprises, :people, :communities, :products, :events].select do |key, name|
-			@controller.environment.enable('disable_asset_' + key.to_s)
+			environment.enable('disable_asset_' + key.to_s)
 		end
-
-		@controller.expects(:articles)
+    environment.save!
+    @controller.stubs(:environment).returns(environment)
     get :index, :query => 'something'
+
+    assert assigns(:searches).has_key?(:articles)
+    assert !assigns(:searches).has_key?(:enterprises)
+    assert !assigns(:searches).has_key?(:people)
+    assert !assigns(:searches).has_key?(:communities)
+    assert !assigns(:searches).has_key?(:products)
+    assert !assigns(:searches).has_key?(:events)
 	end
   should 'search all enabled assets in general search' do
@@ -399,7 +404,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'search for events' do
     person = create_user('teste').person
-    event = create_event(person, :name => 'an event to be found')
+    event = create_event(person, :name => 'an event to be found', :start_date => Date.today)
     get :events, :query => 'event to be found'
	@@ -16,6 +16,12 @@ class Article < ActiveRecord::Base		@@ -16,6 +16,12 @@ class Article < ActiveRecord::Base
16	more_comments	16	more_comments
17	]	17	]
18		18
		19	+ SEARCH_DISPLAYS = %w[full]
		20	+
		21	+ def default_search_display
		22	+ 'full'
		23	+ end
		24	+
19	track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { \|a\| a.is_trackable? && !a.image? }	25	track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { \|a\| a.is_trackable? && !a.image? }
20		26
21	# xss_terminate plugin can't sanitize array fields	27	# xss_terminate plugin can't sanitize array fields
	@@ -9,6 +9,12 @@ class Product < ActiveRecord::Base		@@ -9,6 +9,12 @@ class Product < ActiveRecord::Base
9	more_recent	9	more_recent
10	]	10	]
11		11
		12	+ SEARCH_DISPLAYS = %w[map full]
		13	+
		14	+ def default_search_display
		15	+ 'full'
		16	+ end
		17	+
12	belongs_to :enterprise	18	belongs_to :enterprise
13	has_one :region, :through => :enterprise	19	has_one :region, :through => :enterprise
14	validates_presence_of :enterprise	20	validates_presence_of :enterprise
	@@ -13,6 +13,12 @@ class Profile < ActiveRecord::Base		@@ -13,6 +13,12 @@ class Profile < ActiveRecord::Base
13	more_recent	13	more_recent
14	]	14	]
15		15
		16	+ SEARCH_DISPLAYS = %w[compact]
		17	+
		18	+ def default_search_display
		19	+ 'compact'
		20	+ end
		21	+
16	module Roles	22	module Roles
17	def self.admin(env_id)	23	def self.admin(env_id)
18	find_role('admin', env_id)	24	find_role('admin', env_id)