diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-11-11 06:43:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-11 06:43:54 +0900 |
| commit | 24b59434e6aca9679b9f86a41cfbb1a33e3d5619 (patch) | |
| tree | cea34528ef0ece63ac536bdc6e604d9b3fb78409 /activemodel/lib | |
| parent | 4528dd6327f35d3139a48cbac9c9192f2253cbad (diff) | |
| download | rails-24b59434e6aca9679b9f86a41cfbb1a33e3d5619.tar.gz rails-24b59434e6aca9679b9f86a41cfbb1a33e3d5619.tar.bz2 rails-24b59434e6aca9679b9f86a41cfbb1a33e3d5619.zip | |
Add missing autoload `Type` (#31123)
Attribute modules (`Attribute`, `Attributes`, `AttributeSet`) uses
`Type`, but referencing `Type` before the modules still fail.
```
% ./bin/test -w test/cases/attribute_test.rb -n test_with_value_from_user_validates_the_value
Run options: -n test_with_value_from_user_validates_the_value --seed 31876
E
Error:
ActiveModel::AttributeTest#test_with_value_from_user_validates_the_value:
NameError: uninitialized constant ActiveModel::AttributeTest::Type
/Users/kamipo/src/github.com/rails/rails/activemodel/test/cases/attribute_test.rb:233:in `block in <class:AttributeTest>'
bin/test test/cases/attribute_test.rb:232
Finished in 0.002985s, 335.0479 runs/s, 335.0479 assertions/s.
1 runs, 1 assertions, 0 failures, 1 errors, 0 skips
```
Probably we need more autoloading at least `Type`.
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/attribute.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/attributes.rb | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index faecd6b96f..a3884206a6 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -47,6 +47,7 @@ module ActiveModel autoload :SecurePassword autoload :Serialization autoload :Translation + autoload :Type autoload :Validations autoload :Validator diff --git a/activemodel/lib/active_model/attribute.rb b/activemodel/lib/active_model/attribute.rb index 0b669db58a..b75ff80b31 100644 --- a/activemodel/lib/active_model/attribute.rb +++ b/activemodel/lib/active_model/attribute.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "active_support/core_ext/object/duplicable" -require "active_model/type" module ActiveModel class Attribute # :nodoc: diff --git a/activemodel/lib/active_model/attributes.rb b/activemodel/lib/active_model/attributes.rb index 6f84748804..cac461b549 100644 --- a/activemodel/lib/active_model/attributes.rb +++ b/activemodel/lib/active_model/attributes.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "active_support/core_ext/object/deep_dup" -require "active_model/type" require "active_model/attribute_set" require "active_model/attribute/user_provided_default" |