diff options
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/assert_select_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb index 2e77d2f8ad..612827dd41 100644 --- a/actionpack/test/controller/assert_select_test.rb +++ b/actionpack/test/controller/assert_select_test.rb @@ -18,7 +18,7 @@ unless defined?(ActionMailer) end end -ActionMailer::Base.template_root = FIXTURE_LOAD_PATH +ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH class AssertSelectTest < ActionController::TestCase Assertion = ActiveSupport::TestCase::Assertion @@ -716,7 +716,7 @@ EOF def test_assert_select_email assert_raise(Assertion) { assert_select_email {} } - AssertSelectMailer.deliver_test "<div><p>foo</p><p>bar</p></div>" + AssertSelectMailer.test("<div><p>foo</p><p>bar</p></div>").deliver assert_select_email do assert_select "div:root" do assert_select "p:first-child", "foo" |