diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-29 16:26:36 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-29 17:51:05 +0100 |
| commit | ba82eb2efa24c9124fc4b3dac65c7b7494022f99 (patch) | |
| tree | 8df10e25e31d88f1d642d2440108505b51acbb13 /actionpack | |
| parent | 3f8409193716669b9fa61ac74ae1c92cfde00785 (diff) | |
| download | rails-ba82eb2efa24c9124fc4b3dac65c7b7494022f99.tar.gz rails-ba82eb2efa24c9124fc4b3dac65c7b7494022f99.tar.bz2 rails-ba82eb2efa24c9124fc4b3dac65c7b7494022f99.zip | |
Get rid of AM warnings in AP test suite.
Diffstat (limited to 'actionpack')
| -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" |