diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-07 15:27:39 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-07 15:27:39 -0300 |
commit | 1d96915bba834b8611a16bb9622741b64d7c175c (patch) | |
tree | 17ce7adf7d6f6fc8718d861872e20cece230ad51 /activerecord | |
parent | cf94a551dc56141b2b66521a77b9e20b97395979 (diff) | |
parent | 3d4ca490d8dd2a259d3fde82fe3a8abee12ee809 (diff) | |
download | rails-1d96915bba834b8611a16bb9622741b64d7c175c.tar.gz rails-1d96915bba834b8611a16bb9622741b64d7c175c.tar.bz2 rails-1d96915bba834b8611a16bb9622741b64d7c175c.zip |
Merge pull request #15566 from kuldeepaggarwal/fix-build
fix test cases after #15558 merge to master.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/test/cases/attribute_decorators_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/attribute_decorators_test.rb b/activerecord/test/cases/attribute_decorators_test.rb index e5c077a7a7..f17cc02f53 100644 --- a/activerecord/test/cases/attribute_decorators_test.rb +++ b/activerecord/test/cases/attribute_decorators_test.rb @@ -49,7 +49,7 @@ module ActiveRecord end test "undecorated columns are not touched" do - Model.property :another_string, Type::String.new, default: 'something or other' + Model.attribute :another_string, Type::String.new, default: 'something or other' Model.decorate_attribute_type(:a_string, :test) { |t| StringDecorator.new(t) } assert_equal 'something or other', Model.new.another_string @@ -84,7 +84,7 @@ module ActiveRecord end test "decorating attributes does not modify parent classes" do - Model.property :another_string, Type::String.new, default: 'whatever' + Model.attribute :another_string, Type::String.new, default: 'whatever' Model.decorate_attribute_type(:a_string, :test) { |t| StringDecorator.new(t) } child_class = Class.new(Model) child_class.decorate_attribute_type(:another_string, :test) { |t| StringDecorator.new(t) } @@ -101,7 +101,7 @@ module ActiveRecord end test "defaults are decorated on the column" do - Model.property :a_string, Type::String.new, default: 'whatever' + Model.attribute :a_string, Type::String.new, default: 'whatever' Model.decorate_attribute_type(:a_string, :test) { |t| StringDecorator.new(t) } column = Model.columns_hash['a_string'] |