diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-04 16:29:07 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-04 16:29:07 -0600 |
| commit | 640d9e7e32d9ad67cf81a686aad80266fee7fa61 (patch) | |
| tree | 78881efb8468f96c117e7b4a42e012c365d89cb4 | |
| parent | 2601a16ede92566c651c06942294250ea653bd85 (diff) | |
| download | rails-640d9e7e32d9ad67cf81a686aad80266fee7fa61.tar.gz rails-640d9e7e32d9ad67cf81a686aad80266fee7fa61.tar.bz2 rails-640d9e7e32d9ad67cf81a686aad80266fee7fa61.zip | |
Autoload AMo test case
| -rw-r--r-- | activemodel/lib/active_model.rb | 7 | ||||
| -rw-r--r-- | activemodel/test/cases/helper.rb | 1 | ||||
| -rw-r--r-- | activeresource/test/abstract_unit.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/test_help.rb | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index f14016027c..6eab00c177 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -30,10 +30,12 @@ module ActiveModel extend ActiveSupport::Autoload autoload :AttributeMethods + autoload :BlockValidator, 'active_model/validator' autoload :Callbacks autoload :Conversion autoload :DeprecatedErrorMethods autoload :Dirty + autoload :EachValidator, 'active_model/validator' autoload :Errors autoload :Lint autoload :Name, 'active_model/naming' @@ -42,12 +44,11 @@ module ActiveModel autoload :Observing autoload :Serialization autoload :StateMachine + autoload :TestCase autoload :Translation + autoload :VERSION autoload :Validations autoload :Validator - autoload :EachValidator, 'active_model/validator' - autoload :BlockValidator, 'active_model/validator' - autoload :VERSION module Serializers extend ActiveSupport::Autoload diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index 30193956ea..917bb720d0 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -8,7 +8,6 @@ $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) require 'config' require 'active_model' -require 'active_model/test_case' # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 81e582f5c2..1e71d5d0dd 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -10,7 +10,6 @@ require 'rubygems' require 'test/unit' require 'active_resource' require 'active_support' -require 'active_model/test_case' $:.unshift "#{File.dirname(__FILE__)}/../test" require 'setter_trap' diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index c1e7334ab8..e78bbaf825 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -8,8 +8,6 @@ require 'rack/test' require 'test/unit' require 'active_support/core_ext/kernel/requires' -require 'active_model/test_case' if defined?(ActiveModel) - if defined?(ActiveRecord) require 'active_record/test_case' require 'active_record/fixtures' |