aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2007-10-29 04:13:51 +0000
committerMichael Koziarski <michael@koziarski.com>2007-10-29 04:13:51 +0000
commit2283524dffec7c4869138508741f0e55b06d84eb (patch)
treed22030cc2e8cb9bba38f6d38f94b62d43606b422 /actionmailer
parentc240f2d48a3677954c4bcb57c36587833cbda2c0 (diff)
downloadrails-2283524dffec7c4869138508741f0e55b06d84eb.tar.gz
rails-2283524dffec7c4869138508741f0e55b06d84eb.tar.bz2
rails-2283524dffec7c4869138508741f0e55b06d84eb.zip
Test which fails without [8052] [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb4
-rw-r--r--actionmailer/test/url_test.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb b/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb
index 08f05b5ef0..4c5806d30d 100644
--- a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb
+++ b/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb
@@ -1,3 +1,5 @@
Hello there,
-Mr. <%= @recipient %>. Please see our greeting at <%= @welcome_url %> <%= welcome_url %> \ No newline at end of file
+Mr. <%= @recipient %>. Please see our greeting at <%= @welcome_url %> <%= welcome_url %>
+
+<%= image_tag "somelogo.png" %> \ No newline at end of file
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 2c393651fd..9d94bb996a 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -56,7 +56,7 @@ class ActionMailerUrlTest < Test::Unit::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"
+ 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.from = "system@loudthinking.com"
expected.date = Time.local(2004, 12, 12)