From 6eee9b01d34597b73acbb0aa8136ac504f096b66 Mon Sep 17 00:00:00 2001 From: Mike Burns Date: Wed, 26 Sep 2012 10:58:42 +0200 Subject: [PATCH] Remove the ActionMailer usage --- spec/dummy/config/application.rb | 1 - spec/dummy/config/environments/test.rb | 5 ----- spec/spec_helper.rb | 4 ---- 3 files changed, 10 deletions(-) diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 61dab52..c1463cc 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -3,7 +3,6 @@ require "active_model/railtie" require "action_controller/railtie" require "action_view/railtie" -require "action_mailer/railtie" Bundler.require require "high_voltage" diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb index 768d8f0..dc18b25 100644 --- a/spec/dummy/config/environments/test.rb +++ b/spec/dummy/config/environments/test.rb @@ -20,11 +20,6 @@ # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - # Use SQL instead of Active Record's schema dumper when creating the test database. # This is necessary if your schema can't be completely dumped by the schema dumper, # like if you have constraints or database-specific column types diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9ca6829..94ace3c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,10 +5,6 @@ require "rails/test_help" require "rspec/rails" -ActionMailer::Base.delivery_method = :test -ActionMailer::Base.perform_deliveries = true -ActionMailer::Base.default_url_options[:host] = "test.com" - Rails.backtrace_cleaner.remove_silencers! # Configure capybara for integration testing