From 41311eb38d171ecd0e8c6d186834f2071bb79e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sun, 25 Apr 2010 09:26:51 +0200 Subject: [PATCH] Move mailer configuration to the app. --- test/rails_app/config/application.rb | 2 ++ test/test_helper.rb | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/rails_app/config/application.rb b/test/rails_app/config/application.rb index cc9ea859..d8424b90 100644 --- a/test/rails_app/config/application.rb +++ b/test/rails_app/config/application.rb @@ -29,5 +29,7 @@ module RailsApp # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters << :password + + config.action_mailer.default_url_options = { :host => "localhost:3000" } end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 4b2a755b..56d09074 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -11,10 +11,6 @@ require "orm/#{DEVISE_ORM}" I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__) require 'mocha' -ActionMailer::Base.delivery_method = :test -ActionMailer::Base.perform_deliveries = true -ActionMailer::Base.default_url_options[:host] = 'test.com' - Webrat.configure do |config| config.mode = :rails config.open_error_files = false