diff options
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/active_record_unit.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb index 02cf3f707d..bcca8822d8 100644 --- a/actionpack/test/active_record_unit.rb +++ b/actionpack/test/active_record_unit.rb @@ -57,7 +57,7 @@ class ActiveRecordTestConnector ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => connection_options } ActiveRecord::Base.connection rescue Exception # errors from establishing a connection - $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.' + $stderr.puts 'SQLite 3 unavailable; trying SQLite 2.' connection_options = {:adapter => 'sqlite', :dbfile => ':memory:'} ActiveRecord::Base.establish_connection(connection_options) ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => connection_options } @@ -95,8 +95,8 @@ class ActiveRecordTestCase < Test::Unit::TestCase super if ActiveRecordTestConnector.connected end - def setup - abort_tests unless ActiveRecordTestConnector.connected + def run(*args) + super if ActiveRecordTestConnector.connected end # Default so Test::Unit::TestCase doesn't complain |