From d52b4a664538943b8042cd2bc468983b72fde508 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 3 Sep 2006 20:27:48 +0000 Subject: Moved in deprecated assertions and remove duplicated requires git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4935 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/test_process.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'actionpack/lib/action_controller/test_process.rb') diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index f6c7776b44..bfd2abbb48 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -1,9 +1,4 @@ -begin - require File.dirname(__FILE__) + '/assertions' - require File.dirname(__FILE__) + '/deprecated_assertions' -rescue Exception => e - print e -end +require File.dirname(__FILE__) + '/assertions' module ActionController #:nodoc: class Base -- cgit v1.2.3