diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-17 12:46:51 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-17 12:46:51 +1100 |
| commit | 6f663addaa7ed40f1133687d7a2be0958bf0c059 (patch) | |
| tree | 7beb7f092c1979d1fd5ea6e7aaaf4f59c2f4abf4 /actionpack/test/active_record_unit.rb | |
| parent | 8834b2612b7ddda70ee6a685eb0063d3daa8e63d (diff) | |
| parent | 3e94032227d450d479f511070c51f37f53d0ecc4 (diff) | |
| download | rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.tar.gz rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.tar.bz2 rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/test/active_record_unit.rb')
| -rw-r--r-- | actionpack/test/active_record_unit.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb index 9a094cf66b..4f2b052720 100644 --- a/actionpack/test/active_record_unit.rb +++ b/actionpack/test/active_record_unit.rb @@ -17,7 +17,6 @@ unless defined?(ActiveRecord) && defined?(Fixtures) raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR) $LOAD_PATH.unshift PATH_TO_AR require 'active_record' - require 'active_record/fixtures' rescue LoadError => e $stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}" ActiveRecordTestConnector.able_to_connect = false |