Fix routing test and add changelog note about draw no longer clearing…

… the route set
rails · Nov 26, 2008 · 7d8f9ef · 7d8f9ef
1 parent e2362ba
commit 7d8f9ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *2.3.0 [Edge]*
 
+* Added support for multiple routes.rb files (useful for plugin engines). This also means that draw will no longer clear the route set, you have to do that by hand (shouldn't make a difference to you unless you're doing some funky stuff) [DHH]
+
 * Dropped formatted_* routes in favor of just passing in :format as an option. This cuts resource routes generation in half #1359 [aaronbatalion]
 
 * Remove support for old double-encoded cookies from the cookie store.  These values haven't been generated since before 2.1.0, and any users who have visited the app in the intervening 6 months will have had their cookie upgraded. [Koz]

diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
@@ -302,6 +302,7 @@ def test_path_generation_for_symbol_parameter_keys
   end
 
   def test_named_routes_with_nil_keys
+    ActionController::Routing::Routes.clear!
     add_host!
     ActionController::Routing::Routes.draw do |map|
       map.main '', :controller => 'posts'