aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-02 13:41:02 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-02 13:54:59 -0800
commitecfd6d90eeeeeffb7415b4d9316da4e0bc35743b (patch)
tree802cc02d805a0356d0ee19bcc44f109f0ed5405d /actionpack/test/controller
parentc2dbc391a9292e6f73cadce2f0ba1be871b29e82 (diff)
downloadrails-ecfd6d90eeeeeffb7415b4d9316da4e0bc35743b.tar.gz
rails-ecfd6d90eeeeeffb7415b4d9316da4e0bc35743b.tar.bz2
rails-ecfd6d90eeeeeffb7415b4d9316da4e0bc35743b.zip
Action Mailer setup obviated by test bundle
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/assert_select_test.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index 612827dd41..cb3e848dfa 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -6,18 +6,7 @@
require 'abstract_unit'
require 'controller/fake_controllers'
-
-unless defined?(ActionMailer)
- begin
- $:.unshift("#{File.dirname(__FILE__)}/../../../actionmailer/lib")
- require 'action_mailer'
- rescue LoadError => e
- raise unless e.message =~ /action_mailer/
- require 'rubygems'
- gem 'actionmailer'
- end
-end
-
+require 'action_mailer'
ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
class AssertSelectTest < ActionController::TestCase