itest

Author: seuros

spec/spec_helper.rb

@@ -32,18 +32,16 @@
   }
 }
 
+puts "Testing with #{ActiveRecord::Base.configurations}"
+
 # Configure ActiveRecord
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.table_name_prefix = ENV['DB_PREFIX'].to_s
 ActiveRecord::Base.table_name_suffix = ENV['DB_SUFFIX'].to_s
 ActiveRecord::Base.establish_connection
 
 def env_db
-  @env_db ||= if ActiveRecord::Base.respond_to?(:connection_db_config)
-                ActiveRecord::Base.connection_db_config.adapter
-              else
-                ActiveRecord::Base.connection_config[:adapter]
-              end.to_sym
+  @env_db ||= ActiveRecord::Base.connection_db_config.adapter.to_sym
 end
 
 # Use in specs to skip some tests

test/closure_tree/model_test.rb

@@ -8,7 +8,7 @@
   end
 end
 
-describe "multi database support" do
+describe 'multi database support' do
   it 'should have a different connection for menu items' do
     # These 2 models are in the same database
     assert_equal Tag.connection, Metal.connection
@@ -20,5 +20,4 @@
     # The hierarchy table is in the same database
     assert_equal MenuItem.connection, MenuItemHierarchy.connection
   end
-
-end
+end

test/test_helper.rb

@@ -19,9 +19,10 @@
   }
 }
 
+puts "Testing with #{ActiveRecord::Base.configurations}"
+
 ENV['WITH_ADVISORY_LOCK_PREFIX'] ||= SecureRandom.hex
 
-ActiveRecord::Base.establish_connection
 
 def env_db
   @env_db ||= ActiveRecord::Base.connection_db_config.adapter.to_sym