aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-05 15:33:48 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-05 15:33:48 -0700
commit2197d61c69d3e1d536dc54e2c0994d2adbe40d18 (patch)
tree1afdd6d6a63d8ab869c6307a373774aa623cf96e /activerecord/test/models
parentebc4d8cede42b2e199a589904ceac6b4dc69eab5 (diff)
parent20f943ffd86ae3f74cc16c6f85fb7cc2a43da388 (diff)
downloadrails-2197d61c69d3e1d536dc54e2c0994d2adbe40d18.tar.gz
rails-2197d61c69d3e1d536dc54e2c0994d2adbe40d18.tar.bz2
rails-2197d61c69d3e1d536dc54e2c0994d2adbe40d18.zip
Merge pull request #7532 from al2o3cr/fix_store_bugs
correct handling of changes in AR::Store, combine multiple store_accessors
Diffstat (limited to 'activerecord/test/models')
-rw-r--r--activerecord/test/models/admin/user.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/models/admin/user.rb b/activerecord/test/models/admin/user.rb
index ad30039304..6c4eb03b06 100644
--- a/activerecord/test/models/admin/user.rb
+++ b/activerecord/test/models/admin/user.rb
@@ -1,6 +1,7 @@
class Admin::User < ActiveRecord::Base
belongs_to :account
store :settings, :accessors => [ :color, :homepage ]
+ store_accessor :settings, :favorite_food
store :preferences, :accessors => [ :remember_login ]
store :json_data, :accessors => [ :height, :weight ], :coder => JSON
store :json_data_empty, :accessors => [ :is_a_good_guy ], :coder => JSON