Merge commit 'rails/master'

1 files changed, 18 insertions, 0 deletions

diff --git a/actionmailer/test/adv_attr_test.rb b/actionmailer/test/adv_attr_test.rb
new file mode 100644
index 0000000000..fd909a5627
--- /dev/null
+++ b/actionmailer/test/adv_attr_test.rb
@@ -0,0 +1,18 @@
+require 'abstract_unit'
+require 'action_mailer/adv_attr_accessor'
+
+class AdvAttrTest < Test::Unit::TestCase
+  class Person
+    include ActionMailer::AdvAttrAccessor
+    adv_attr_accessor :name
+  end
+
+  def test_adv_attr
+    bob = Person.new
+    assert_nil bob.name
+    bob.name 'Bob'
+    assert_equal 'Bob', bob.name
+
+    assert_raise(ArgumentError) {bob.name 'x', 'y'}
+  end
+end