diff options
| author | kennyj <kennyj@gmail.com> | 2012-09-15 15:29:22 +0900 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2012-10-02 13:32:54 -0300 |
| commit | df08271f9c044b7614d70baf4b818f1a79f4a6e1 (patch) | |
| tree | f659fd9a3a03259650c1ac16a9eb8381a7979fdf /activerecord | |
| parent | 2bc1ac77f688c90fa7e1efc83e60068c64006269 (diff) | |
| download | rails-df08271f9c044b7614d70baf4b818f1a79f4a6e1.tar.gz rails-df08271f9c044b7614d70baf4b818f1a79f4a6e1.tar.bz2 rails-df08271f9c044b7614d70baf4b818f1a79f4a6e1.zip | |
fix warning: method redefined
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/store_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/models/admin/user.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb index dc47d40f41..562ca8d9ff 100644 --- a/activerecord/test/cases/store_test.rb +++ b/activerecord/test/cases/store_test.rb @@ -136,7 +136,7 @@ class StoreTest < ActiveRecord::TestCase end test "all stored attributes are returned" do - assert_equal [:color, :homepage, :favorite_food, :phone_number], Admin::User.stored_attributes[:settings] + assert_equal [:color, :homepage, :favorite_food], Admin::User.stored_attributes[:settings] end test "stores_attributes are class level settings" do diff --git a/activerecord/test/models/admin/user.rb b/activerecord/test/models/admin/user.rb index 35170faa76..467f3ccd39 100644 --- a/activerecord/test/models/admin/user.rb +++ b/activerecord/test/models/admin/user.rb @@ -1,7 +1,7 @@ class Admin::User < ActiveRecord::Base belongs_to :account store :settings, :accessors => [ :color, :homepage ] - store_accessor :settings, :favorite_food, :phone_number + 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 |