aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_process.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-09-03 20:18:06 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-09-03 20:18:06 +0000
commitf12fdc50a69c3861add6b3ec53507f1c6a25e1cd (patch)
treefbe33bfd44ca5a62ff4c77654c891e1550b1a191 /actionpack/lib/action_controller/test_process.rb
parent3142502964f94d6144312ae2c368b4c4589fa25a (diff)
downloadrails-f12fdc50a69c3861add6b3ec53507f1c6a25e1cd.tar.gz
rails-f12fdc50a69c3861add6b3ec53507f1c6a25e1cd.tar.bz2
rails-f12fdc50a69c3861add6b3ec53507f1c6a25e1cd.zip
Better compartmentalizing of assertions
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4931 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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