1 files changed, 34 insertions, 8 deletions

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 9699a04abb..d5b6bd6b2a 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
-require 'action_controller/routing'
 
 class MilestonesController < ActionController::Base
   def index() head :ok end
@@ -706,12 +705,13 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
       port        = options.delete(:port) || 80
       port_string = port == 80 ? '' : ":#{port}"
 
-      host   = options.delete(:host) || "named.route.test"
-      anchor = "##{options.delete(:anchor)}" if options.key?(:anchor)
+      protocol = options.delete(:protocol) || "http"
+      host     = options.delete(:host) || "named.route.test"
+      anchor   = "##{options.delete(:anchor)}" if options.key?(:anchor)
 
       path = routes.generate(options)
 
-      only_path ? "#{path}#{anchor}" : "http://#{host}#{port_string}#{path}#{anchor}"
+      only_path ? "#{path}#{anchor}" : "#{protocol}://#{host}#{port_string}#{path}#{anchor}"
     end
 
     def request
@@ -747,12 +747,16 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
       ActionController::Base.optimise_named_routes = true
 
       @rs = ::ActionController::Routing::RouteSet.new
-      @rs.draw {|m| m.connect ':controller/:action/:id' }
 
       ActionController::Routing.use_controllers! %w(content admin/user admin/news_feed)
     end
+    
+    def teardown
+      @rs.clear!
+    end
 
     def test_default_setup
+      @rs.draw {|m| m.connect ':controller/:action/:id' }
       assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
       assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/content/list"))
       assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"))
@@ -769,6 +773,7 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
     end
 
     def test_ignores_leading_slash
+      @rs.clear!
       @rs.draw {|m| m.connect '/:controller/:action/:id'}
       test_default_setup
     end
@@ -1002,6 +1007,8 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
     end
 
     def test_changing_controller
+      @rs.draw {|m| m.connect ':controller/:action/:id' }
+
       assert_equal '/admin/stuff/show/10', rs.generate(
         {:controller => 'stuff', :action => 'show', :id => 10},
         {:controller => 'admin/user', :action => 'index'}
@@ -1155,10 +1162,12 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
     end
 
     def test_action_expiry
+      @rs.draw {|m| m.connect ':controller/:action/:id' }
       assert_equal '/content', rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
     end
 
     def test_recognition_with_uppercase_controller_name
+      @rs.draw {|m| m.connect ':controller/:action/:id' }
       assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/Content"))
       assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/ConTent/list"))
       assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/CONTENT/show/10"))
@@ -1726,6 +1735,11 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
       assert_equal "http://some.example.com/people/5", controller.send(:show_url, 5, :host=>"some.example.com")
     end
 
+    def test_named_route_url_method_with_protocol
+      controller = setup_named_route_test
+      assert_equal "https://named.route.test/people/5", controller.send(:show_url, 5, :protocol => "https")
+    end
+
     def test_named_route_url_method_with_ordered_parameters
       controller = setup_named_route_test
       assert_equal "http://named.route.test/people/go/7/hello/joe/5",
@@ -2394,13 +2408,13 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
     def setup
       routes.instance_variable_set '@routes_last_modified', nil
       silence_warnings { Object.const_set :RAILS_ROOT, '.' }
-      ActionController::Routing::Routes.configuration_file = File.join(RAILS_ROOT, 'config', 'routes.rb')
+      routes.add_configuration_file(File.join(RAILS_ROOT, 'config', 'routes.rb'))
 
       @stat = stub_everything
     end
 
     def teardown
-      ActionController::Routing::Routes.configuration_file = nil
+      ActionController::Routing::Routes.configuration_files.clear
       Object.send :remove_const, :RAILS_ROOT
     end
 
@@ -2443,12 +2457,24 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
     end
 
     def test_load_with_configuration
-      routes.configuration_file = "foobarbaz"
+      routes.configuration_files.clear
+      routes.add_configuration_file("foobarbaz")
       File.expects(:stat).returns(@stat)
       routes.expects(:load).with("foobarbaz")
 
       routes.reload
     end
+    
+    def test_load_multiple_configurations
+      routes.add_configuration_file("engines.rb")
+      
+      File.expects(:stat).at_least_once.returns(@stat)
+
+      routes.expects(:load).with('./config/routes.rb')
+      routes.expects(:load).with('engines.rb')
+
+      routes.reload
+    end
 
     private
       def routes