diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/admin_request_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/sendmail_return_path_spec.rb | 8 | ||||
| -rw-r--r-- | spec/mailers/request_mailer_spec.rb | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index f644e0146..b51aaa9ad 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -250,7 +250,7 @@ describe AdminRequestController, "when administering the holding pen" do end it 'should not send a notification email' do - ContactMailer.should_not_receive(:deliver_from_admin_message) + ContactMailer.should_not_receive(:from_admin_message) make_request end diff --git a/spec/lib/sendmail_return_path_spec.rb b/spec/lib/sendmail_return_path_spec.rb index b4bdda12c..83436c2bd 100644 --- a/spec/lib/sendmail_return_path_spec.rb +++ b/spec/lib/sendmail_return_path_spec.rb @@ -33,10 +33,10 @@ 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_to_admin_message( + ContactMailer.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 - ) + ).deliver end deliveries = ActionMailer::Base.deliveries @@ -47,10 +47,10 @@ 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" postmaster@localhost', "w+") with_delivery_method :sendmail do - ContactMailer.deliver_to_admin_message( + ContactMailer.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 - ) + ).deliver end end diff --git a/spec/mailers/request_mailer_spec.rb b/spec/mailers/request_mailer_spec.rb index 72fd808d7..439e72e92 100644 --- a/spec/mailers/request_mailer_spec.rb +++ b/spec/mailers/request_mailer_spec.rb @@ -340,7 +340,7 @@ describe RequestMailer, 'requires_admin' do end it 'body should contain the full admin URL' do - mail = RequestMailer.deliver_requires_admin(@info_request) + mail = RequestMailer.requires_admin(@info_request).deliver mail.body.should include('http://test.host/en/admin/request/show/123') end @@ -351,7 +351,7 @@ describe RequestMailer, 'requires_admin' do end it 'body should contain the full admin URL' do - mail = RequestMailer.deliver_requires_admin(@info_request) + mail = RequestMailer.requires_admin(@info_request).deliver mail.body.should include('http://our.proxy.server/admin/alaveteli/request/show/123') end |