Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes for working with 1.9.1-head

  • Loading branch information...
commit 418639b4cfe477d7309fa53e8b8e2472b44bda80 1 parent 186cd7b
Mikel Lindsaar mikel authored
2  actionmailer/lib/action_mailer.rb
View
@@ -54,5 +54,5 @@ module Net
end
-gem 'mail', '>= 1.3.0'
+gem 'mail', '>= 1.3.2'
require 'mail'
1  actionmailer/lib/action_mailer/base.rb
View
@@ -258,7 +258,6 @@ class Base
include AbstractController::Layouts
include AbstractController::Helpers
- helper ActionMailer::MailHelper
if Object.const_defined?(:ActionController)
include ActionController::UrlWriter
19 actionmailer/lib/action_mailer/mail_helper.rb
View
@@ -1,19 +0,0 @@
-module ActionMailer
- module MailHelper
- # Uses Text::Format to take the text and format it, indented two spaces for
- # each line, and wrapped at 72 columns.
- def block_format(text)
- formatted = text.split(/\n\r\n/).collect { |paragraph|
- Text::Format.new(
- :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
- ).format
- }.join("\n")
-
- # Make list points stand on their own line
- formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| " #{$1} #{$2.strip}\n" }
- formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| " #{$1} #{$2.strip}\n" }
-
- formatted
- end
- end
-end
4 actionmailer/test/mail_service_test.rb
View
@@ -534,7 +534,7 @@ def test_from_without_name_for_smtp
assert_not_nil mail
mail, from, to = mail
- assert_equal 'system@loudthinking.com', from.to_s
+ assert_equal 'system@loudthinking.com', from.decoded
end
def test_from_with_name_for_smtp
@@ -545,7 +545,7 @@ def test_from_with_name_for_smtp
assert_not_nil mail
mail, from, to = mail
- assert_equal 'system@loudthinking.com', from.to_s
+ assert_equal 'system@loudthinking.com', from.addresses.first
end
def test_reply_to
8 actionmailer/test/url_test.rb
View
@@ -69,10 +69,16 @@ def test_signed_up_with_url
created = nil
assert_nothing_raised { created = TestMailer.create_signed_up_with_url(@recipient) }
assert_not_nil created
+
+ expected.message_id = '<123@456>'
+ created.message_id = '<123@456>'
assert_equal expected.encoded, created.encoded
assert_nothing_raised { TestMailer.deliver_signed_up_with_url(@recipient) }
assert_not_nil ActionMailer::Base.deliveries.first
- assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+ delivered = ActionMailer::Base.deliveries.first
+
+ delivered.message_id = '<123@456>'
+ assert_equal expected.encoded, delivered.encoded
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.