diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-25 14:25:25 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-25 14:27:38 +1100 |
| commit | 1ed216502e3b2ef22a1765f985aebf0c5920153e (patch) | |
| tree | eaf616203c9397291d844c07b735ba58e9cf4849 /spec/lib | |
| parent | eef9d83ff28b9d3fdea11dabfab465adefbdf683 (diff) | |
Rename mailer method to avoid naming conflict in Rails 3
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/sendmail_return_path_spec.rb | 4 |
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 ) |