aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-17 22:27:34 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-17 22:27:34 -0700
commitfe2f383cf3c0aa6901487c398b9ae8ffce03ecbd (patch)
tree88c50423ea9a7044dd2cfacb393e3789772bc9b9 /actionmailer/test
parentdb9e67a6c873a46e9eb1103d7f8c2113d2c82635 (diff)
downloadrails-fe2f383cf3c0aa6901487c398b9ae8ffce03ecbd.tar.gz
rails-fe2f383cf3c0aa6901487c398b9ae8ffce03ecbd.tar.bz2
rails-fe2f383cf3c0aa6901487c398b9ae8ffce03ecbd.zip
Fix broken test due to constant collision
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb (renamed from actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb)0
-rw-r--r--actionmailer/test/old_base/url_test.rb10
2 files changed, 4 insertions, 6 deletions
diff --git a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb b/actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb
index 4c5806d30d..4c5806d30d 100644
--- a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb
+++ b/actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb
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