diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-03 20:27:48 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-03 20:27:48 +0000 |
| commit | d52b4a664538943b8042cd2bc468983b72fde508 (patch) | |
| tree | 1fca3a90031a26451db3ee6432309a55af4f92a6 /actionpack/lib/action_controller/test_process.rb | |
| parent | a4bef314fe888e3f4df51ad77a22075b5965250e (diff) | |
| download | rails-d52b4a664538943b8042cd2bc468983b72fde508.tar.gz rails-d52b4a664538943b8042cd2bc468983b72fde508.tar.bz2 rails-d52b4a664538943b8042cd2bc468983b72fde508.zip | |
Moved in deprecated assertions and remove duplicated requires
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4935 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 7 |
1 files changed, 1 insertions, 6 deletions
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 |