Merge branch 'master' of github.com:rails/rails

1 files changed, 20 insertions, 0 deletions

diff --git a/activerecord/test/cases/attributes/aliasing_test.rb b/activerecord/test/cases/attributes/aliasing_test.rb
new file mode 100644
index 0000000000..7ee25779f1
--- /dev/null
+++ b/activerecord/test/cases/attributes/aliasing_test.rb
@@ -0,0 +1,20 @@
+require "cases/helper"
+
+class AliasingTest < ActiveRecord::TestCase
+
+  class AliasingAttributes < Hash
+    include ActiveRecord::Attributes::Aliasing
+  end
+
+  test "attribute access with aliasing" do
+    attributes = AliasingAttributes.new
+    attributes[:name] = 'Batman'
+    attributes.aliases['nickname'] = 'name'
+
+    assert_equal 'Batman', attributes[:name], "Symbols should point to Strings"
+    assert_equal 'Batman', attributes['name']
+    assert_equal 'Batman', attributes['nickname']
+    assert_equal 'Batman', attributes[:nickname]
+  end
+
+end