summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/routes.rb2
-rw-r--r--test/functional/content_controller_test.rb4
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|
2 map.resources :pages 2 map.resources :pages
3 3
4 4
5 map.connect ':language/*pagepath', 5 map.connect ':language/*page_path',
6 :controller => 'content', :action => 'render_page', 6 :controller => 'content', :action => 'render_page',
7 :requirements => {:language => /\w{2}/} 7 :requirements => {:language => /\w{2}/}
8 8
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'
3class ContentControllerTest < ActionController::TestCase 3class ContentControllerTest < ActionController::TestCase
4 4
5 def test_custom_page_route 5 def test_custom_page_route
6 assert_recognizes({ :controller => 'content', :action => 'render_page', :language => 'de', :pagepath => ['foo', 'bar'] }, '/de/foo/bar') 6 assert_recognizes({ :controller => 'content', :action => 'render_page', :language => 'de', :page_path => ['foo', 'bar'] }, '/de/foo/bar')
7 assert_recognizes({ :controller => 'content', :action => 'render_page', :language => 'en', :pagepath => ['home'] }, '/en/home') 7 assert_recognizes({ :controller => 'content', :action => 'render_page', :language => 'en', :page_path => ['home'] }, '/en/home')
8 end 8 end
9 9
10 def test_render_404_when_no_page_was_found 10 def test_render_404_when_no_page_was_found