diff options
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 2 | ||||
| -rw-r--r-- | activemodel/test/test_helper.rb | 3 | ||||
| -rw-r--r-- | activesupport/lib/active_support.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/secret_key_generator.rb | 2 | ||||
| -rw-r--r-- | railties/test/secret_key_generation_test.rb | 2 |
5 files changed, 9 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index b4693b192b..0f173ea4e8 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -31,6 +31,8 @@ rescue LoadError end end +require 'action_view' + module ActionMailer def self.load_all! [Base, Part, ::Text::Format, ::Net::SMTP] diff --git a/activemodel/test/test_helper.rb b/activemodel/test/test_helper.rb index 4dd5b9832b..5b5678e42d 100644 --- a/activemodel/test/test_helper.rb +++ b/activemodel/test/test_helper.rb @@ -6,6 +6,9 @@ require 'mocha' require 'active_model' require 'active_model/state_machine' + +$:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" +require 'active_support' require 'active_support/test_case' class ActiveModel::TestCase < ActiveSupport::TestCase diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 8729d6de59..f4b804801f 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -32,7 +32,6 @@ module ActiveSupport autoload :BufferedLogger, 'active_support/buffered_logger' autoload :Cache, 'active_support/cache' autoload :Callbacks, 'active_support/callbacks' - autoload :Dependencies, 'active_support/dependencies' autoload :Deprecation, 'active_support/deprecation' autoload :Duration, 'active_support/duration' autoload :Gzip, 'active_support/gzip' @@ -53,6 +52,7 @@ end require 'active_support/vendor' require 'active_support/core_ext' +require 'active_support/dependencies' require 'active_support/json' I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" diff --git a/railties/lib/rails_generator/secret_key_generator.rb b/railties/lib/rails_generator/secret_key_generator.rb index 553811d35d..7dd495a2f5 100644 --- a/railties/lib/rails_generator/secret_key_generator.rb +++ b/railties/lib/rails_generator/secret_key_generator.rb @@ -1,3 +1,5 @@ +require 'active_support/deprecation' + module Rails # A class for creating random secret keys. This class will do its best to create a # random secret key that's as secure as possible, using whatever methods are diff --git a/railties/test/secret_key_generation_test.rb b/railties/test/secret_key_generation_test.rb index df486c3bbb..2c7c3d5dfe 100644 --- a/railties/test/secret_key_generation_test.rb +++ b/railties/test/secret_key_generation_test.rb @@ -1,4 +1,4 @@ -require 'test/unit' +require 'abstract_unit' # Must set before requiring generator libs. if defined?(RAILS_ROOT) |