diff options
author | Timm <kaspth@gmail.com> | 2014-05-28 11:20:15 +0200 |
---|---|---|
committer | Timm <kaspth@gmail.com> | 2014-06-16 21:04:25 +0200 |
commit | 1a8ca9fc35083b51c48ddddb6b5b73af2046778c (patch) | |
tree | ed6df106ce87fd839dfd83fb2b1fe27c579fbf7d /actionmailer/test | |
parent | 5ffc36d476be7f463e5cc275192181da7b94a56e (diff) | |
download | rails-1a8ca9fc35083b51c48ddddb6b5b73af2046778c.tar.gz rails-1a8ca9fc35083b51c48ddddb6b5b73af2046778c.tar.bz2 rails-1a8ca9fc35083b51c48ddddb6b5b73af2046778c.zip |
Use 1.9 syntax.
Diffstat (limited to 'actionmailer/test')
-rw-r--r-- | actionmailer/test/assert_select_email_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionmailer/test/assert_select_email_test.rb b/actionmailer/test/assert_select_email_test.rb index c1a03ac5a3..2356237230 100644 --- a/actionmailer/test/assert_select_email_test.rb +++ b/actionmailer/test/assert_select_email_test.rb @@ -8,16 +8,16 @@ class AssertSelectEmailTest < ActionMailer::TestCase class AssertSelectMailer < ActionMailer::Base def test(html) - mail :body => html, :content_type => "text/html", - :subject => "Test e-mail", :from => "test@test.host", :to => "test <test@test.host>" + mail body: html, content_type: "text/html", + subject: "Test e-mail", from: "test@test.host", to: "test <test@test.host>" end end class AssertMultipartSelectMailer < ActionMailer::Base def test(options) - mail :subject => "Test e-mail", :from => "test@test.host", :to => "test <test@test.host>" do |format| - format.text { render :text => options[:text] } - format.html { render :text => options[:html] } + mail subject: "Test e-mail", from: "test@test.host", to: "test <test@test.host>" do |format| + format.text { render text: options[:text] } + format.html { render text: options[:html] } end end end @@ -42,7 +42,7 @@ class AssertSelectEmailTest < ActionMailer::TestCase end def test_assert_select_email_multipart - AssertMultipartSelectMailer.test(:html => "<div><p>foo</p><p>bar</p></div>", :text => 'foo bar').deliver + AssertMultipartSelectMailer.test(html: "<div><p>foo</p><p>bar</p></div>", text: 'foo bar').deliver assert_select_email do assert_select "div:root" do assert_select "p:first-child", "foo" |