Skip to content
This repository
Browse code

Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit)

  • Loading branch information...
commit 735027e58d3000bd5d939e39deabfecef83ee20c 1 parent 4d23bdb
Mikel Lindsaar authored June 07, 2010
2  actionmailer/actionmailer.gemspec
@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
20 20
   s.has_rdoc = true
21 21
 
22 22
   s.add_dependency('actionpack',  version)
23  
-  s.add_dependency('mail',        '~> 2.2.1')
  23
+  s.add_dependency('mail',        '~> 2.2.2')
24 24
 end
6  actionmailer/test/old_base/mail_service_test.rb
@@ -674,7 +674,7 @@ def test_unquote_quoted_printable_subject
674 674
 EOF
675 675
     mail = Mail.new(msg)
676 676
     assert_equal "testing testing \326\244", mail.subject
677  
-    assert_equal "Subject: =?UTF-8?Q?testing_testing_=D6=A4?=\r\n", mail[:subject].encoded
  677
+    assert_equal "Subject: testing testing =?UTF-8?Q?_=D6=A4=?=\r\n", mail[:subject].encoded
678 678
   end
679 679
 
680 680
   def test_unquote_7bit_subject
@@ -863,7 +863,7 @@ def test_multipart_with_mime_version
863 863
 
864 864
   def test_multipart_with_utf8_subject
865 865
     mail = TestMailer.multipart_with_utf8_subject(@recipient)
866  
-    regex = Regexp.escape('Subject: =?UTF-8?Q?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC?=')
  866
+    regex = Regexp.escape('Subject: Foo =?UTF-8?Q?=C3=A1=C3=AB=C3=B4=?= =?UTF-8?Q?_=C3=AE=C3=BC=?=')
867 867
     assert_match(/#{regex}/, mail.encoded)
868 868
     string = "Foo áëô îü"
869 869
     assert_match(string, mail.subject)
@@ -871,7 +871,7 @@ def test_multipart_with_utf8_subject
871 871
 
872 872
   def test_implicitly_multipart_with_utf8
873 873
     mail = TestMailer.implicitly_multipart_with_utf8
874  
-    regex = Regexp.escape('Subject: =?UTF-8?Q?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC?=')
  874
+    regex = Regexp.escape('Subject: Foo =?UTF-8?Q?=C3=A1=C3=AB=C3=B4=?= =?UTF-8?Q?_=C3=AE=C3=BC=?=')
875 875
     assert_match(/#{regex}/, mail.encoded)
876 876
     string = "Foo áëô îü"
877 877
     assert_match(string, mail.subject)

0 notes on commit 735027e

Please sign in to comment.
Something went wrong with that request. Please try again.