aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/admin
diff options
context:
space:
mode:
authorMatthias Zirnstein <matthias.zirnstein@googlemail.com>2014-01-06 16:40:32 +0100
committerMatthias Zirnstein <matthias.zirnstein@googlemail.com>2014-01-06 16:40:32 +0100
commit2a0fdde3806ea588c189c1a26ecbf3c6f5f1ed98 (patch)
tree6aedae053e65fd3e746fcc6e3f884c24f26e083c /activerecord/test/models/admin
parentf2b80a41b5c163b32dfdd0fa797466543c6ec0e9 (diff)
downloadrails-2a0fdde3806ea588c189c1a26ecbf3c6f5f1ed98.tar.gz
rails-2a0fdde3806ea588c189c1a26ecbf3c6f5f1ed98.tar.bz2
rails-2a0fdde3806ea588c189c1a26ecbf3c6f5f1ed98.zip
Remove warnings in test suite
lib/active_record/store.rb:79: warning: method redefined; discarding old color= lib/active_record/store.rb:79: warning: previous definition of color= was here lib/active_record/store.rb:83: warning: method redefined; discarding old color lib/active_record/store.rb:83: warning: previous definition of color was here
Diffstat (limited to 'activerecord/test/models/admin')
-rw-r--r--activerecord/test/models/admin/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/models/admin/user.rb b/activerecord/test/models/admin/user.rb
index 9a80aaba01..48a110bd23 100644
--- a/activerecord/test/models/admin/user.rb
+++ b/activerecord/test/models/admin/user.rb
@@ -14,7 +14,7 @@ class Admin::User < ActiveRecord::Base
end
belongs_to :account
- store :params, accessors: [ :color ], coder: YAML
+ store :params, accessors: [ :token ], coder: YAML
store :settings, :accessors => [ :color, :homepage ]
store_accessor :settings, :favorite_food
store :preferences, :accessors => [ :remember_login ]