aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-10-21 21:05:55 -0200
committerYehuda Katz <wycats@gmail.com>2009-11-01 02:23:48 +0100
commit418c3f801cd436f011b37fe69059073e69e05084 (patch)
tree6ae84921892f4ee1f056c2f2338f390c795f7325 /actionmailer/test
parent03960048616593c249745d1e321dbcc7f0483c76 (diff)
downloadrails-418c3f801cd436f011b37fe69059073e69e05084.tar.gz
rails-418c3f801cd436f011b37fe69059073e69e05084.tar.bz2
rails-418c3f801cd436f011b37fe69059073e69e05084.zip
Another refactoring on AM. body is deprecated, use render instead.
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/mail_service_test.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index 680fe283bd..cda394d926 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -1,6 +1,5 @@
# encoding: utf-8
require 'abstract_unit'
-require 'active_support/testing/pending'
class FunkyPathMailer < ActionMailer::Base
self.template_root = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
@@ -291,7 +290,6 @@ end
class ActionMailerTest < Test::Unit::TestCase
include ActionMailer::Quoting
- include ActiveSupport::Testing::Pending
def encode( text, charset="utf-8" )
quoted_printable( text, charset )
@@ -979,10 +977,8 @@ EOF
end
def test_body_is_stored_as_an_ivar
- pending "needs attr_internal on @body" do
- mail = TestMailer.create_body_ivar(@recipient)
- assert_equal "body: foo\nbar: baz", mail.body
- end
+ mail = TestMailer.create_body_ivar(@recipient)
+ assert_equal "body: foo\nbar: baz", mail.body
end
def test_starttls_is_enabled_if_supported