Merge pull request #14561 from tgxworld/refactor_run_without_connection

Add ConnectionHelper to refactor tests.

4 files changed, 17 insertions, 26 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index 514ae20e3c..5f84c893c0 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -1,7 +1,10 @@
 require "cases/helper"
+require 'support/connection_helper'
 
 module ActiveRecord
   class PostgresqlConnectionTest < ActiveRecord::TestCase
+    include ConnectionHelper
+
     class NonExistentTable < ActiveRecord::Base
     end
 
@@ -198,17 +201,5 @@ module ActiveRecord
         ActiveRecord::Base.establish_connection(orig_connection.deep_merge({:variables => {:debug_print_plan => :default}}))
       end
     end
-
-    private
-
-    def run_without_connection
-      original_connection = ActiveRecord::Base.remove_connection
-      begin
-        yield original_connection
-      ensure
-        ActiveRecord::Base.establish_connection(original_connection)
-      end
-    end
-
   end
 end
diff --git a/activerecord/test/cases/adapters/postgresql/domain_test.rb b/activerecord/test/cases/adapters/postgresql/domain_test.rb
index ba25a64fac..214e89dd7f 100644
--- a/activerecord/test/cases/adapters/postgresql/domain_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/domain_test.rb
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 require "cases/helper"
-require 'support/postgresql_helper'
+require 'support/connection_helper'
 require 'active_record/base'
 require 'active_record/connection_adapters/postgresql_adapter'
 
 class PostgresqlDomainTest < ActiveRecord::TestCase
-  include PostgresqlHelper
+  include ConnectionHelper
 
   class PostgresqlDomain < ActiveRecord::Base
     self.table_name = "postgresql_domains"
@@ -27,7 +27,7 @@ class PostgresqlDomainTest < ActiveRecord::TestCase
   teardown do
     @connection.execute 'DROP TABLE IF EXISTS postgresql_domains'
     @connection.execute 'DROP DOMAIN IF EXISTS custom_money'
-    reset_pg_session
+    reset_connection
   end
 
   def test_column
diff --git a/activerecord/test/cases/adapters/postgresql/enum_test.rb b/activerecord/test/cases/adapters/postgresql/enum_test.rb
index fde01314a5..73da5a74ab 100644
--- a/activerecord/test/cases/adapters/postgresql/enum_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/enum_test.rb
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 require "cases/helper"
-require 'support/postgresql_helper'
+require 'support/connection_helper'
 require 'active_record/base'
 require 'active_record/connection_adapters/postgresql_adapter'
 
 class PostgresqlEnumTest < ActiveRecord::TestCase
-  include PostgresqlHelper
+  include ConnectionHelper
 
   class PostgresqlEnum < ActiveRecord::Base
     self.table_name = "postgresql_enums"
@@ -28,7 +28,7 @@ class PostgresqlEnumTest < ActiveRecord::TestCase
   teardown do
     @connection.execute 'DROP TABLE IF EXISTS postgresql_enums'
     @connection.execute 'DROP TYPE IF EXISTS mood'
-    reset_pg_session
+    reset_connection
   end
 
   def test_column
diff --git a/activerecord/test/cases/adapters/postgresql/range_test.rb b/activerecord/test/cases/adapters/postgresql/range_test.rb
index b57568dbad..57c7da2657 100644
--- a/activerecord/test/cases/adapters/postgresql/range_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/range_test.rb
@@ -1,5 +1,5 @@
 require "cases/helper"
-require 'support/postgresql_helper'
+require 'support/connection_helper'
 require 'active_record/base'
 require 'active_record/connection_adapters/postgresql_adapter'
 
@@ -10,13 +10,7 @@ if ActiveRecord::Base.connection.supports_ranges?
 
   class PostgresqlRangeTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
-    include PostgresqlHelper
-
-    teardown do
-      @connection.execute 'DROP TABLE IF EXISTS postgresql_ranges'
-      @connection.execute 'DROP TYPE IF EXISTS floatrange'
-      reset_pg_session
-    end
+    include ConnectionHelper
 
     def setup
       @connection = PostgresqlRange.connection
@@ -99,6 +93,12 @@ _SQL
       @empty_range = PostgresqlRange.find(105)
     end
 
+    teardown do
+      @connection.execute 'DROP TABLE IF EXISTS postgresql_ranges'
+      @connection.execute 'DROP TYPE IF EXISTS floatrange'
+      reset_connection
+    end
+
     def test_data_type_of_range_types
       assert_equal :daterange, @first_range.column_for_attribute(:date_range).type
       assert_equal :numrange, @first_range.column_for_attribute(:num_range).type