Commit 17c21fbb5fe1641fbefc49990851c5392bed2d7e

Authored by Victor Costa
1 parent bff221c1

Revert "Consider disabled assets at category search"

This reverts commit 3f8af20484a57772d7243c8998d7a9f2656ddd1c.

Conflicts:

	app/controllers/public/search_controller.rb
Showing 1 changed file with 0 additions and 14 deletions   Show diff stats
test/functional/search_controller_test.rb
... ... @@ -216,20 +216,6 @@ class SearchControllerTest < ActionController::TestCase
216 216 assert_equal @category, assigns(:category)
217 217 end
218 218  
219   - should 'display results for enabled assets' do
220   - assets = ['people', 'enterprises', 'products', 'events', 'communities', 'articles']
221   - get :category_index, :category_path => [ 'my-category' ]
222   - assets.each { |asset| assert_select "div.search-results-#{asset}" }
223   - end
224   -
225   - should 'not display results for disabled assets' do
226   - assets = ['people', 'enterprises', 'products', 'events', 'communities', 'articles']
227   - environment = Environment.default
228   - assets.each { |asset| environment.enable("disable_asset_#{asset}") }
229   - get :category_index, :category_path => [ 'my-category' ]
230   - assets.each { |asset| assert_select "div.search-results-#{asset}", false }
231   - end
232   -
233 219 should 'not list "Search for ..." in category_index' do
234 220 get :category_index, :category_path => [ 'my-category' ]
235 221 assert_no_tag :content => /Search for ".*" in the whole site/
... ...