aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_process.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
-rw-r--r--actionpack/lib/action_controller/test_process.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 511c759e97..f6c7776b44 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -1,7 +1,9 @@
-require File.dirname(__FILE__) + '/assertions'
-require File.dirname(__FILE__) + '/assert_select'
-require File.dirname(__FILE__) + '/assert_tag'
-require File.dirname(__FILE__) + '/deprecated_assertions'
+begin
+ require File.dirname(__FILE__) + '/assertions'
+ require File.dirname(__FILE__) + '/deprecated_assertions'
+rescue Exception => e
+ print e
+end
module ActionController #:nodoc:
class Base