Permalink
Browse files

Fix broken test due to constant collision

  • Loading branch information...
1 parent db9e67a commit fe2f383cf3c0aa6901487c398b9ae8ffce03ecbd @jeremy jeremy committed Mar 18, 2010
View
0 ...xtures/test_mailer/signed_up_with_url.erb → ...es/url_test_mailer/signed_up_with_url.erb
File renamed without changes.
View
10 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 <<self
attr_accessor :received_body
end
- remove_method :receive
-
def receive(mail)
self.class.received_body = mail.body
end
@@ -67,7 +65,7 @@ def teardown
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 @@ def test_signed_up_with_url
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

0 comments on commit fe2f383

Please sign in to comment.