From fe2f383cf3c0aa6901487c398b9ae8ffce03ecbd Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 17 Mar 2010 22:27:34 -0700 Subject: Fix broken test due to constant collision --- actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb | 5 ----- .../test/fixtures/url_test_mailer/signed_up_with_url.erb | 5 +++++ actionmailer/test/old_base/url_test.rb | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb create mode 100644 actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb (limited to 'actionmailer') diff --git a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb b/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb deleted file mode 100644 index 4c5806d30d..0000000000 --- a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb +++ /dev/null @@ -1,5 +0,0 @@ -Hello there, - -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/fixtures/url_test_mailer/signed_up_with_url.erb b/actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb new file mode 100644 index 0000000000..4c5806d30d --- /dev/null +++ b/actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb @@ -0,0 +1,5 @@ +Hello there, + +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/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb index c98c3cde3a..0b8bef233b 100644 --- a/actionmailer/test/old_base/url_test.rb +++ b/actionmailer/test/old_base/url_test.rb @@ -10,7 +10,7 @@ class ActionMailer::Base include AppRoutes.url_helpers end -class TestMailer < ActionMailer::Base +class UrlTestMailer < ActionMailer::Base default_url_options[:host] = 'www.basecamphq.com' configure do |c| @@ -31,8 +31,6 @@ class TestMailer < ActionMailer::Base attr_accessor :received_body end - remove_method :receive - def receive(mail) self.class.received_body = mail.body end @@ -67,7 +65,7 @@ class ActionMailerUrlTest < Test::Unit::TestCase end def test_signed_up_with_url - TestMailer.delivery_method = :test + UrlTestMailer.delivery_method = :test AppRoutes.draw do |map| map.connect ':controller/:action/:id' @@ -82,14 +80,14 @@ class ActionMailerUrlTest < Test::Unit::TestCase expected.date = Time.local(2004, 12, 12) created = nil - assert_nothing_raised { created = TestMailer.signed_up_with_url(@recipient) } + assert_nothing_raised { created = UrlTestMailer.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.signed_up_with_url(@recipient).deliver } + assert_nothing_raised { UrlTestMailer.signed_up_with_url(@recipient).deliver } assert_not_nil ActionMailer::Base.deliveries.first delivered = ActionMailer::Base.deliveries.first -- cgit v1.2.3