diff options
author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-22 21:10:52 +1100 |
---|---|---|
committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-22 21:10:52 +1100 |
commit | 1170e70797e06b3f062e222d912b0cc1dd6072e5 (patch) | |
tree | 5b46b0cc33e00137f3ac505f7d854895093b7b5c /actionmailer/test/mail_service_test.rb | |
parent | 6fd7d1fc128f1d6d7bddaa6770739d7e936dd049 (diff) | |
parent | bb9d71ff9e537597ff4d5962e7870ad99001f605 (diff) | |
download | rails-1170e70797e06b3f062e222d912b0cc1dd6072e5.tar.gz rails-1170e70797e06b3f062e222d912b0cc1dd6072e5.tar.bz2 rails-1170e70797e06b3f062e222d912b0cc1dd6072e5.zip |
Merge branch 'master' of github.com:mikel/rails
Diffstat (limited to 'actionmailer/test/mail_service_test.rb')
-rw-r--r-- | actionmailer/test/mail_service_test.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 51d722ea00..ec820e3464 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -301,13 +301,6 @@ class TestMailer < ActionMailer::Base render :text => "testing" end - def body_ivar(recipient) - recipients recipient - subject "Body as a local variable" - from "test@example.com" - body :body => "foo", :bar => "baz" - end - def subject_with_i18n(recipient) recipients recipient from "system@loudthinking.com" @@ -1080,11 +1073,6 @@ EOF assert_equal "another@somewhere.test", MockSMTP.deliveries[0][1].to_s end - def test_body_is_stored_as_an_ivar - mail = TestMailer.create_body_ivar(@recipient) - assert_equal "body: foo\nbar: baz", mail.body.to_s - end - def test_starttls_is_enabled_if_supported ActionMailer::Base.delivery_settings[:smtp].merge!(:enable_starttls_auto => true) MockSMTP.any_instance.expects(:respond_to?).with(:enable_starttls_auto).returns(true) |