Download as
Browse Code »

Commit 1089c991b4facad6448cb511b3283d4319b6744e

Authored by AntonioTerceiro
1 parent b06e3c40
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem48: unifying the search routes and removing unused design_blocks route 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1611 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 2 additions and 11 deletions   Show diff stats
config/routes.rb
  Diff comments   View file @1089c99
@@ -31,16 +31,12 @@ ActionController::Routing::Routes.draw do |map| @@ -31,16 +31,12 @@ ActionController::Routing::Routes.draw do |map|
31 map.tag 'tag/:tag', :controller => 'search', :action => 'tag' 31 map.tag 'tag/:tag', :controller => 'search', :action => 'tag'
32 32
33 # search 33 # search
34 - map.connect 'search/filter/*category_path', :controller => 'search', :action => 'filter'  
35 - map.connect 'search/:action', :controller => 'search' 34 + map.connect 'search/:action/*category_path', :controller => 'search'
36 35
37 # categories controller 36 # categories controller
38 map.connect 'cat', :controller => 'category', :action => 'index' 37 map.connect 'cat', :controller => 'category', :action => 'index'
39 map.category 'cat/*category_path', :controller => 'category', :action => 'view' 38 map.category 'cat/*category_path', :controller => 'category', :action => 'view'
40 39
41 - # controllers for blocks  
42 - map.controllers 'block/:profile/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks  
43 -  
44 # public profile information 40 # public profile information
45 map.profile 'profile/:profile/:action/:id', :controller => 'profile', :action => 'index' 41 map.profile 'profile/:profile/:action/:id', :controller => 'profile', :action => 'index'
46 42
test/integration/routing_test.rb
  Diff comments   View file @1089c99
@@ -92,7 +92,7 @@ class RoutingTest < ActionController::IntegrationTest @@ -92,7 +92,7 @@ class RoutingTest < ActionController::IntegrationTest
92 end 92 end
93 93
94 def test_search_routing 94 def test_search_routing
95 - assert_routing('/search', :controller => 'search', :action => 'index') 95 + assert_routing('/search', :controller => 'search', :action => 'index', :category_path => [])
96 end 96 end
97 97
98 def test_search_filter_routing 98 def test_search_filter_routing
test/unit/noosfero_test.rb
  Diff comments   View file @1089c99
@@ -18,11 +18,6 @@ class NoosferoTest < Test::Unit::TestCase @@ -18,11 +18,6 @@ class NoosferoTest < Test::Unit::TestCase
18 assert_equal(//, Noosfero.pattern_for_controllers_in_directory('lala')) 18 assert_equal(//, Noosfero.pattern_for_controllers_in_directory('lala'))
19 end 19 end
20 20
21 - should 'support controllers from design_blocks directory' do  
22 - 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'])  
23 - assert_equal(/(block1|block2)/, Noosfero.pattern_for_controllers_from_design_blocks)  
24 - end  
25 -  
26 should 'support setting default locale' do 21 should 'support setting default locale' do
27 Noosfero.default_locale = 'pt_BR' 22 Noosfero.default_locale = 'pt_BR'
28 assert_equal 'pt_BR', Noosfero.default_locale 23 assert_equal 'pt_BR', Noosfero.default_locale