patch.diff

diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 589944f..5912e9a 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -12,6 +12,7 @@ end
 
 class UrlTestMailer < ActionMailer::Base
   default_url_options[:host] = 'www.basecamphq.com'
+  default_url_options[:protocol] = 'https'
 
   configure do |c|
     c.assets_dir = '' # To get the tests to pass
@@ -55,7 +56,7 @@ class ActionMailerUrlTest < ActionMailer::TestCase
     expected = new_mail
     expected.to      = @recipient
     expected.subject = "[Signed up] Welcome #{@recipient}"
-    expected.body    = "Hello there,\n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
+    expected.body    = "Hello there,\n\nMr. #{@recipient}. Please see our greeting at https://example.com/welcome/greeting https://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
     expected.from    = "[email protected]"
     expected.date    = Time.local(2004, 12, 12)
     expected.content_type = "text/html"