Merge remote branch 'rails/master'

1 files changed, 30 insertions, 0 deletions

diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
new file mode 100644
index 0000000000..0883363baf
--- /dev/null
+++ b/activemodel/test/cases/dirty_test.rb
@@ -0,0 +1,30 @@
+require "cases/helper"
+
+class DirtyTest < ActiveModel::TestCase
+  class DirtyModel
+    include ActiveModel::Dirty
+    define_attribute_methods [:name]
+
+    def initialize
+      super
+      @name = nil
+    end
+
+    def name
+      @name
+    end
+
+    def name=(val)
+      name_will_change!
+      @name = val
+    end
+  end
+
+  test "changes accessible through both strings and symbols" do
+    model = DirtyModel.new
+    model.name = "David"
+    assert !model.changes[:name].nil?
+    assert !model.changes['name'].nil?
+  end
+
+end