aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-23 13:10:27 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-23 13:10:27 -0800
commit2db8571edf105c7c68e06eea385b032951042ef8 (patch)
tree76b37489ccdae17ec881da481b5fa03d9ca4d637 /actionpack/test
parente9aa975cc9beb8a670c098b21a1dae514bdd8b9c (diff)
downloadrails-2db8571edf105c7c68e06eea385b032951042ef8.tar.gz
rails-2db8571edf105c7c68e06eea385b032951042ef8.tar.bz2
rails-2db8571edf105c7c68e06eea385b032951042ef8.zip
Don't hide deeper LoadErrors
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/assert_select_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index a79278159d..ed8c4427c9 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -9,9 +9,10 @@ require 'controller/fake_controllers'
unless defined?(ActionMailer)
begin
- $:.unshift(File.dirname(__FILE__) + "/../../../actionmailer/lib")
+ $:.unshift("#{File.dirname(__FILE__)}/../../../actionmailer/lib")
require 'action_mailer'
- rescue LoadError
+ rescue LoadError => e
+ raise unless e.message =~ /action_mailer/
require 'rubygems'
gem 'actionmailer'
end