Refactor Active Record test connection setup. Please see the RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.

1 files changed, 10 insertions, 8 deletions

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 9644ac1b02..7a214fa75a 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -1,5 +1,8 @@
 require File.expand_path('../../../../load_paths', __FILE__)
 
+test = File.expand_path('../..', __FILE__)
+$:.unshift(test) unless $:.include?('test') || $:.include?(test)
+
 lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
 $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
@@ -11,14 +14,13 @@ require 'mocha'
 
 require 'active_record'
 require 'active_support/dependencies'
-begin
-  require 'connection'
-rescue LoadError
-  # If we cannot load connection we assume that driver was not loaded for this test case, so we load sqlite3 as default one.
-  # This allows for running separate test cases by simply running test file.
-  connection_type = defined?(JRUBY_VERSION) ? 'jdbc' : 'native'
-  require "test/connections/#{connection_type}_sqlite3/connection"
-end
+
+require 'support/config'
+require 'support/connection'
+
+ARTest.connect
+
+# TODO: Move all these random hacks into the ARTest namespace and into the support/ dir
 
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true