Pull middleware for Rails info from the initializer instead of ActionController

3 files changed, 7 insertions, 7 deletions

diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index aabe976d4e..48d89ad06a 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -114,7 +114,7 @@ module Rails
     end
 
     property 'Middleware' do
-      ActionController::Dispatcher.middleware.active.map {|middle| middle.inspect }
+      Rails.configuration.middleware.active.map { |middle| middle.inspect }
     end
 
     # The Rails Git revision, if it's checked out into vendor/rails.
diff --git a/railties/lib/rails/tasks/middleware.rake b/railties/lib/rails/tasks/middleware.rake
index 05f159184e..e1ab309157 100644
--- a/railties/lib/rails/tasks/middleware.rake
+++ b/railties/lib/rails/tasks/middleware.rake
@@ -1,7 +1,7 @@
 desc 'Prints out your Rack middleware stack'
 task :middleware => :environment do
-  ActionController::Dispatcher.middleware.active.each do |middleware|
+  Rails.configuration.middleware.active.each do |middleware|
     puts "use #{middleware.inspect}"
   end
-  puts "run ActionController::Dispatcher.new"
+  puts "run ActionController::Routing::Routes"
 end
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 568e2a9972..dcf9966c0d 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -80,11 +80,11 @@ EOS
     end
   end
 
-  def test_middleware_property
-    assert property_defined?('Middleware')
-  end
-
   def test_html_includes_middleware
+    Rails::Info.module_eval do
+      property 'Middleware', ['Rack::Lock', 'Rack::Static']
+    end
+
     html = Rails::Info.to_html
     assert html.include?('<tr><td class="name">Middleware</td>')
     properties.value_for('Middleware').each do |value|