mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix broken test due to constant collision

This commit is contained in:
Jeremy Kemper 2010-03-17 22:27:34 -07:00
parent db9e67a6c8
commit fe2f383cf3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb → actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb vendored
View File

10
actionmailer/test/old_base/url_test.rb
View File

@ -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