Merge branch 'master' into active_model

Conflicts:
	activeresource/lib/active_resource/validations.rb

1 files changed, 16 insertions, 1 deletions

diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 9befd44a58..971cba89d0 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -1,9 +1,12 @@
 $:.unshift File.dirname(__FILE__) + "/../lib"
 $:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
 $:.unshift File.dirname(__FILE__) + "/../../activesupport/lib"
+$:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
 
 require 'test/unit'
 require 'active_support'
+require 'active_support/test_case'
+require 'action_controller'
 
 unless defined?(Rails) && defined?(Rails::Info)
   module Rails
@@ -11,7 +14,7 @@ unless defined?(Rails) && defined?(Rails::Info)
   end
 end
 
-class InfoTest < Test::Unit::TestCase
+class InfoTest < ActiveSupport::TestCase
   def setup
     Rails.send :remove_const, :Info
     silence_warnings { load 'rails/info.rb' }
@@ -72,6 +75,18 @@ EOS
     end
   end
 
+  def test_middleware_property
+    assert property_defined?('Middleware')
+  end
+
+  def test_html_includes_middleware
+    html = Rails::Info.to_html
+    assert html.include?('<tr><td class="name">Middleware</td>')
+    properties.value_for('Middleware').each do |value|
+      assert html.include?("<li>#{CGI.escapeHTML(value)}</li>")
+    end
+  end
+
   protected
     def svn_info=(info)
       Rails::Info.module_eval do