aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorMr A <akshay.vishnoi@vinsol.com>2013-11-14 13:41:37 +0530
committerMr A <akshay.vishnoi@vinsol.com>2013-11-14 13:41:37 +0530
commit3134605391e4d5cf270f2ba79ea810eee4cffc5a (patch)
tree90bfad65e9db7c09cc075cd35245922b3737e21c /actionmailer/test
parentc994e1086270cdfe4e145ea206049f05ef5414d6 (diff)
downloadrails-3134605391e4d5cf270f2ba79ea810eee4cffc5a.tar.gz
rails-3134605391e4d5cf270f2ba79ea810eee4cffc5a.tar.bz2
rails-3134605391e4d5cf270f2ba79ea810eee4cffc5a.zip
Ruby's new Hash syntax applied in actionmailer
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb2
-rw-r--r--actionmailer/test/fixtures/test_mailer/included_subtemplate.text.erb2
-rw-r--r--actionmailer/test/mailers/base_mailer.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb b/actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb
index 30466dd005..d676a6d2da 100644
--- a/actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb
+++ b/actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb
@@ -1 +1 @@
-<%= t('.greet_user', :name => 'lifo') %> \ No newline at end of file
+<%= t('.greet_user', name: 'lifo') %> \ No newline at end of file
diff --git a/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.erb b/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.erb
index a93c30ea1a..ae3cfa77e7 100644
--- a/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.erb
+++ b/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.erb
@@ -1 +1 @@
-Hey Ho, <%= render :partial => "subtemplate" %> \ No newline at end of file
+Hey Ho, <%= render partial: "subtemplate" %> \ No newline at end of file
diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb
index 6584bf5195..bd991e209e 100644
--- a/actionmailer/test/mailers/base_mailer.rb
+++ b/actionmailer/test/mailers/base_mailer.rb
@@ -120,7 +120,7 @@ class BaseMailer < ActionMailer::Base
end
def with_nil_as_return_value
- mail(:template_name => "welcome")
+ mail(template_name: "welcome")
nil
end