1 files changed, 16 insertions, 15 deletions
diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
index 978cee9cfb..e9cdf94c99 100644
--- a/activerecord/test/cases/store_test.rb
+++ b/activerecord/test/cases/store_test.rb
@@ -163,22 +163,24 @@ class StoreTest < ActiveRecord::TestCase
     assert_equal [:width, :height], second_model.stored_attributes[:data]
   end
 
-  test "YAML coder initializes the store when a Nil value is given" do
-    assert_equal({}, @john.params)
-  end
+  test "stored_attributes are tracked per subclass" do
+    first_model = Class.new(ActiveRecord::Base) do
+      store_accessor :data, :color
+    end
+    second_model = Class.new(first_model) do
+      store_accessor :data, :width, :height
+    end
+    third_model = Class.new(first_model) do
+      store_accessor :data, :area, :volume
+    end
 
-  test "attributes_for_coder should return stored fields already serialized" do
-    attributes = {
-      "id" => @john.id,
-      "name"=> @john.name,
-      "settings" => "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\ncolor: black\n",
-      "preferences" => "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nremember_login: true\n",
-      "json_data" => "{\"height\":\"tall\"}", "json_data_empty"=>"{\"is_a_good_guy\":true}",
-      "params" => "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess {}\n",
-      "account_id"=> @john.account_id
-    }
+    assert_equal [:color], first_model.stored_attributes[:data]
+    assert_equal [:color, :width, :height], second_model.stored_attributes[:data]
+    assert_equal [:color, :area, :volume], third_model.stored_attributes[:data]
+  end
 
-    assert_equal attributes, @john.attributes_for_coder
+  test "YAML coder initializes the store when a Nil value is given" do
+    assert_equal({}, @john.params)
   end
 
   test "dump, load and dump again a model" do
@@ -187,7 +189,6 @@ class StoreTest < ActiveRecord::TestCase
     assert_equal @john, loaded
 
     second_dump = YAML.dump(loaded)
-    assert_equal dumped, second_dump
     assert_equal @john, YAML.load(second_dump)
   end
 end