Merge branch 'hotfix/0.21.0.35' into rails-3-developrails-3-develop

1 files changed, 17 insertions, 0 deletions

diff --git a/spec/lib/mail_handler/backends/mail_backend_spec.rb b/spec/lib/mail_handler/backends/mail_backend_spec.rb
index 044fbef4f..91d9e1b5a 100644
--- a/spec/lib/mail_handler/backends/mail_backend_spec.rb
+++ b/spec/lib/mail_handler/backends/mail_backend_spec.rb
@@ -151,4 +151,21 @@ DOC
 
     end
 
+    describe :address_from_name_and_email do
+
+        it 'returns an address string' do
+            expected = 'Test User <test@example.com>'
+            address_from_name_and_email('Test User', 'test@example.com').should == expected
+        end
+
+        it 'does not change the name passed to it' do
+            original = "brønn"
+            name = original.dup
+            address_from_name_and_email(name, 'test@example.com')
+            name.should == original
+        end
+
+    end
+
+
 end