aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-10-04 17:23:47 -0600
committerSean Griffin <sean@seantheprogrammer.com>2015-10-04 17:23:47 -0600
commit411ed2086546f0331ce57f734efe41d37ad16b0a (patch)
tree9765f7a3bf02cdfb35556b3ffdc15b8cdb6a747d /actionmailer
parent0b51103664943f3937dbc7eeaf87e01f1ec40d77 (diff)
parent64e316edd3113e1d4eb5f3e6404000d1e68f5aaa (diff)
downloadrails-411ed2086546f0331ce57f734efe41d37ad16b0a.tar.gz
rails-411ed2086546f0331ce57f734efe41d37ad16b0a.tar.bz2
rails-411ed2086546f0331ce57f734efe41d37ad16b0a.zip
Merge pull request #21865 from Gaurav2728/test_cases_protected_method_nodoc
action mailer test cases protected method can be `# :nodoc:` [ci skip]
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/test_case.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index 766215ce96..0aa15e31ba 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -57,28 +57,28 @@ module ActionMailer
protected
- def initialize_test_deliveries
+ def initialize_test_deliveries # :nodoc:
set_delivery_method :test
@old_perform_deliveries = ActionMailer::Base.perform_deliveries
ActionMailer::Base.perform_deliveries = true
end
- def restore_test_deliveries
+ def restore_test_deliveries # :nodoc:
restore_delivery_method
ActionMailer::Base.perform_deliveries = @old_perform_deliveries
ActionMailer::Base.deliveries.clear
end
- def set_delivery_method(method)
+ def set_delivery_method(method) # :nodoc:
@old_delivery_method = ActionMailer::Base.delivery_method
ActionMailer::Base.delivery_method = method
end
- def restore_delivery_method
+ def restore_delivery_method # :nodoc:
ActionMailer::Base.delivery_method = @old_delivery_method
end
- def set_expected_mail
+ def set_expected_mail # :nodoc:
@expected = Mail.new
@expected.content_type ["text", "plain", { "charset" => charset }]
@expected.mime_version = '1.0'