diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-01-27 19:37:47 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-01-27 19:38:17 -0800 |
| commit | 452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe (patch) | |
| tree | 5145ae6ce81a817e29b96134b3adae75898ba30a /actionmailer/test | |
| parent | 079714277df4641a24513b2595c0237293f48512 (diff) | |
| download | rails-452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe.tar.gz rails-452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe.tar.bz2 rails-452bb1e48d7fa3dd4b2684d9d8ba3091200d59fe.zip | |
Rename 'defaults' class method to 'default' to reflect that it's a declaration
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/base_test.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 86db3afc15..03e3f81acd 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -5,9 +5,9 @@ class BaseTest < ActiveSupport::TestCase class BaseMailer < ActionMailer::Base self.mailer_name = "base_mailer" - defaults :to => 'system@test.lindsaar.net', - :from => 'jose@test.plataformatec.com', - :reply_to => 'mikel@test.lindsaar.net' + default :to => 'system@test.lindsaar.net', + :from => 'jose@test.plataformatec.com', + :reply_to => 'mikel@test.lindsaar.net' def welcome(hash = {}) headers['X-SPAM'] = "Not SPAM" @@ -237,7 +237,7 @@ class BaseTest < ActiveSupport::TestCase end test "subject gets default from I18n" do - BaseMailer.defaults[:subject] = nil + BaseMailer.default[:subject] = nil email = BaseMailer.welcome(:subject => nil) assert_equal "Welcome", email.subject @@ -473,7 +473,7 @@ class BaseTest < ActiveSupport::TestCase end def with_default(klass, new_values) - hash = klass.defaults + hash = klass.default old_values = {} new_values.each do |key, value| old_values[key] = hash[key] |