diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-10-04 10:02:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 10:02:34 +0100 |
| commit | 0fc115724b87f7b4c990dc26d8b42f48ae72dfeb (patch) | |
| tree | e48727040cc1c69fe3d72fec1fd031128420f644 /activerecord/test/cases/serialized_attribute_test.rb | |
| parent | 16bb6122e221d33780ab49ea98bd4253f25fbb4f (diff) | |
| parent | 671eb742eec77b5c8281ac2a2e3976ef32a6e424 (diff) | |
| download | rails-0fc115724b87f7b4c990dc26d8b42f48ae72dfeb.tar.gz rails-0fc115724b87f7b4c990dc26d8b42f48ae72dfeb.tar.bz2 rails-0fc115724b87f7b4c990dc26d8b42f48ae72dfeb.zip | |
Merge pull request #26693 from iainbeeston/consistently-use-activerecord-attributes
Made ActiveRecord consistently use ActiveRecord::Type (not ActiveModel::Type)
Diffstat (limited to 'activerecord/test/cases/serialized_attribute_test.rb')
| -rw-r--r-- | activerecord/test/cases/serialized_attribute_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb index bebd856faf..8e9514de7c 100644 --- a/activerecord/test/cases/serialized_attribute_test.rb +++ b/activerecord/test/cases/serialized_attribute_test.rb @@ -313,8 +313,8 @@ class SerializedAttributeTest < ActiveRecord::TestCase return if value.nil? value.gsub(" encoded", "") end - type = Class.new(ActiveModel::Type::Value) do - include ActiveModel::Type::Helpers::Mutable + type = Class.new(ActiveRecord::Type::Value) do + include ActiveRecord::Type::Helpers::Mutable def serialize(value) return if value.nil? |