Don't hide deeper LoadErrors

2db8571e · Jeremy Kemper · e9aa975c · 2db8571e
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

actionpack/test/controller/assert_select_test.rb actionpack/test/controller/assert_select_test.rb +3 -2

未找到文件。
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -9,9 +9,10 @@

 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