aboutsummaryrefslogtreecommitdiffstats
path: root/spec/lib
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-02-01 18:04:19 +0000
committerLouise Crow <louise.crow@gmail.com>2013-02-01 18:04:19 +0000
commitd942831f5c2c0393378cc63cd3bbf47875afa58b (patch)
tree48d0838196d9ce25f520340e1c2762d8d473e6ae /spec/lib
parentde4e2181cea5bcfa8d28682e6abe7927752f9a72 (diff)
parent39b473f22f014dd119795c8230518950b526a916 (diff)
Merge remote-tracking branch 'openaustralia_github/backport_rails_3_mailer_fix' into develop
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/sendmail_return_path_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/sendmail_return_path_spec.rb b/spec/lib/sendmail_return_path_spec.rb
index 7708edb35..137869b6e 100644
--- a/spec/lib/sendmail_return_path_spec.rb
+++ b/spec/lib/sendmail_return_path_spec.rb
@@ -28,7 +28,7 @@ describe "when sending email with an altered return path" do
Net::SMTP.stub!(:new).and_return(mock_smtp)
with_delivery_method :smtp do
- ContactMailer.deliver_message(
+ ContactMailer.deliver_to_admin_message(
"Mr. Test", "test@localhost", "Test script spec/lib/sendmail_return_path_spec.rb",
"This is just a test for a test script", nil, nil, nil
)
@@ -42,7 +42,7 @@ describe "when sending email with an altered return path" do
with_stub_popen do
IO.should_receive(:popen).once.with('/usr/sbin/sendmail -i -t -f "test@localhost"', "w+")
with_delivery_method :sendmail do
- ContactMailer.deliver_message(
+ ContactMailer.deliver_to_admin_message(
"Mr. Test", "test@localhost", "Test script spec/lib/sendmail_return_path_spec.rb",
"This is just a test for a test script", nil, nil, nil
)