lib/routing_filter/force_extension.rb spec/force_extension_spec.rb @@ -4,14 +4,11 @@ describe 'RoutingFilter', 'url generation' do include RoutingFilterHelpers before :each do - setup_environment + setup_environment :locale, :pagination @site = Site.new @section = Section.new @article = Article.new - - Section.stub!(:types).and_return ['Section'] - Section.stub!(:find).and_return @section end describe "named route url_helpers" do spec/generation_spec.rb @@ -4,7 +4,7 @@ describe 'RoutingFilter', 'url recognition' do include RoutingFilterHelpers before :each do - setup_environment + setup_environment :locale, :pagination end it 'recognizes the path /de/sections/1 and sets the :locale param' do @@ -49,7 +49,7 @@ describe 'RoutingFilter', 'url recognition' do end end - it 'recognizes the path /en-US/sections/1 and does set a :locale param' do + it 'recognizes the path /en-US/sections/1 and sets a :locale param' do should_recognize_path '/en-US/sections/1', @section_params.update(:locale => 'en-US') end @@ -61,18 +61,11 @@ describe 'RoutingFilter', 'url recognition' do should_recognize_path '/sections/1/articles/1', @article_params end - # Test that routing errors are thrown for invalid locales - it 'does not recognize the path /aa/sections/1/articles/1 and does not set a :locale param' do - begin - should_recognize_path '/aa/sections/1/articles/1', @article_params.update(:locale => 'aa') - false - rescue ActionController::RoutingError - true - end + it 'invalid locale: does not recognize the path /aa/sections/1/articles/1 and does not set a :locale param' do + lambda { @set.recognize_path('/aa/sections/1/articles/1', {}) }.should raise_error(ActionController::RoutingError) end - it 'recognizes the path /en-US/sections/1/articles/1 and does set a :locale param' do + it 'recognizes the path /en-US/sections/1/articles/1 and sets a :locale param' do should_recognize_path '/en-US/sections/1/articles/1', @article_params.update(:locale => 'en-US') end - end \ No newline at end of file spec/recognition_spec.rb @@ -4,7 +4,7 @@ describe 'RoutingFilter' do include RoutingFilterHelpers before :each do - setup_environment + setup_environment :locale, :pagination end def recognize_path(path = '/de/sections/1', options = {}) spec/routing_filter_spec.rb @@ -51,6 +51,10 @@ module RoutingFilterHelpers @set.recognize_path(path, {}).should == params end + def home_path(*args) + @controller.send :home_path, *args + end + def section_path(*args) @controller.send :section_path, *args end @@ -59,11 +63,15 @@ module RoutingFilterHelpers @controller.send :section_article_path, *args end + def admin_articles_path(*args) + @controller.send :admin_articles_path, *args + end + def url_for(*args) @controller.send :url_for, *args end - def setup_environment + def setup_environment(*filters) RoutingFilter::Locale.locales = [:en, 'en-US', :de, :fi, 'en-UK'] RoutingFilter::Locale.include_default_locale = true I18n.default_locale = :en @@ -71,10 +79,12 @@ module RoutingFilterHelpers @controller = instantiate_controller :locale => 'de', :id => 1 @set = draw_routes do |map| - map.filter 'locale' - map.filter 'pagination' - map.section 'sections/:id', :controller => 'sections', :action => "show" + yield map if block_given? + filters.each { |filter| map.filter filter } + map.section 'sections/:id.:format', :controller => 'sections', :action => "show" map.section_article 'sections/:section_id/articles/:id', :controller => 'articles', :action => "show" + map.admin_articles 'admin/articles/:id', :controller => 'admin/articles', :action => "index" + map.home '/', :controller => 'home', :action => 'index' end @section_params = {:controller => 'sections', :action => "show", :id => "1"} spec/spec_helper.rb 54a641901cda17b487c5efc02c318deb13ec3315 Sven Fuchs svenfuchs@artweb-design.de http://github.com/svenfuchs/routing-filter/commit/d646cbb08b1fa23eaa4c2dd77f3b6195a2c37e5e d646cbb08b1fa23eaa4c2dd77f3b6195a2c37e5e 2009-04-05T06:04:52-07:00 2009-04-05T06:04:52-07:00 add a force_extension filter (customer who wants all urls to have a .html extension for legacy urls aka seo) f740b3fc0bf366a33be62ce5fc0124645c97e363 Sven Fuchs svenfuchs@artweb-design.de