From d1f7fa66043bba01aea105637d21017124d061fd Mon Sep 17 00:00:00 2001 From: hukl Date: Sun, 1 Feb 2009 14:40:01 +0100 Subject: fixed routing issues --- config/routes.rb | 2 +- test/functional/content_controller_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 96d56de..15ce385 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :pages - map.connect ':language/*pagepath', + map.connect ':language/*page_path', :controller => 'content', :action => 'render_page', :requirements => {:language => /\w{2}/} diff --git a/test/functional/content_controller_test.rb b/test/functional/content_controller_test.rb index 76a9b24..baf46b9 100644 --- a/test/functional/content_controller_test.rb +++ b/test/functional/content_controller_test.rb @@ -3,8 +3,8 @@ require 'test_helper' class ContentControllerTest < ActionController::TestCase def test_custom_page_route - assert_recognizes({ :controller => 'content', :action => 'render_page', :language => 'de', :pagepath => ['foo', 'bar'] }, '/de/foo/bar') - assert_recognizes({ :controller => 'content', :action => 'render_page', :language => 'en', :pagepath => ['home'] }, '/en/home') + assert_recognizes({ :controller => 'content', :action => 'render_page', :language => 'de', :page_path => ['foo', 'bar'] }, '/de/foo/bar') + assert_recognizes({ :controller => 'content', :action => 'render_page', :language => 'en', :page_path => ['home'] }, '/en/home') end def test_render_404_when_no_page_was_found -- cgit v1.3