diff --git a/config/routes.rb b/config/routes.rb index cc3e157..1cfe8f6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,16 +31,12 @@ ActionController::Routing::Routes.draw do |map| map.tag 'tag/:tag', :controller => 'search', :action => 'tag' # search - map.connect 'search/filter/*category_path', :controller => 'search', :action => 'filter' - map.connect 'search/:action', :controller => 'search' + map.connect 'search/:action/*category_path', :controller => 'search' # categories controller map.connect 'cat', :controller => 'category', :action => 'index' map.category 'cat/*category_path', :controller => 'category', :action => 'view' - # controllers for blocks - map.controllers 'block/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks - # public profile information map.profile 'profile/:profile/:action/:id', :controller => 'profile', :action => 'index' diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index cd3627a..d31be90 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -92,7 +92,7 @@ class RoutingTest < ActionController::IntegrationTest end def test_search_routing - assert_routing('/search', :controller => 'search', :action => 'index') + assert_routing('/search', :controller => 'search', :action => 'index', :category_path => []) end def test_search_filter_routing diff --git a/test/unit/noosfero_test.rb b/test/unit/noosfero_test.rb index 6487d55..3df0396 100644 --- a/test/unit/noosfero_test.rb +++ b/test/unit/noosfero_test.rb @@ -18,11 +18,6 @@ class NoosferoTest < Test::Unit::TestCase assert_equal(//, Noosfero.pattern_for_controllers_in_directory('lala')) end - should 'support controllers from design_blocks directory' do - Dir.expects(:glob).with("#{RAILS_ROOT}/app/design_blocks/*/controllers/*_controller.rb").returns(['app/design_blocks/block1/controllers/block1_controller.rb', 'app/design_blocks/block2/controllers/block2_controller.rb']) - assert_equal(/(block1|block2)/, Noosfero.pattern_for_controllers_from_design_blocks) - end - should 'support setting default locale' do Noosfero.default_locale = 'pt_BR' assert_equal 'pt_BR', Noosfero.default_locale -- libgit2 0.21.2