diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-24 11:54:27 +0200 |
| commit | 7324e46a3fe7be282deeda14783f4170ccf03a3c (patch) | |
| tree | 79968712783f47c816d81e97604f77ff7d920b40 /railties/test | |
| parent | 1fee2fb996229236fb236bcef423930fdf1dfe2d (diff) | |
| parent | 6e039e863a5d71f2a516be2eef2605be23281290 (diff) | |
| download | rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.gz rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.tar.bz2 rails-7324e46a3fe7be282deeda14783f4170ccf03a3c.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base/mime_responds.rb
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/rails_info_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb index 971cba89d0..fdcc7a1ef6 100644 --- a/railties/test/rails_info_test.rb +++ b/railties/test/rails_info_test.rb @@ -14,6 +14,8 @@ unless defined?(Rails) && defined?(Rails::Info) end end +require "active_support/core_ext/kernel/reporting" + class InfoTest < ActiveSupport::TestCase def setup Rails.send :remove_const, :Info |