1 files changed, 15 insertions, 13 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/citext_test.rb b/activerecord/test/cases/adapters/postgresql/citext_test.rb
index 2acb64f81c..bd62041e79 100644
--- a/activerecord/test/cases/adapters/postgresql/citext_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/citext_test.rb
@@ -1,8 +1,9 @@
-# encoding: utf-8
 require 'cases/helper'
+require 'support/schema_dumping_helper'
 
 if ActiveRecord::Base.connection.supports_extensions?
-  class PostgresqlCitextTest < ActiveRecord::TestCase
+  class PostgresqlCitextTest < ActiveRecord::PostgreSQLTestCase
+    include SchemaDumpingHelper
     class Citext < ActiveRecord::Base
       self.table_name = 'citexts'
     end
@@ -10,12 +11,7 @@ if ActiveRecord::Base.connection.supports_extensions?
     def setup
       @connection = ActiveRecord::Base.connection
 
-      unless @connection.extension_enabled?('citext')
-        @connection.enable_extension 'citext'
-        @connection.commit_db_transaction
-      end
-
-      @connection.reconnect!
+      enable_extension!('citext', @connection)
 
       @connection.create_table('citexts') do |t|
         t.citext 'cival'
@@ -23,8 +19,8 @@ if ActiveRecord::Base.connection.supports_extensions?
     end
 
     teardown do
-      @connection.execute 'DROP TABLE IF EXISTS citexts;'
-      @connection.execute 'DROP EXTENSION IF EXISTS citext CASCADE;'
+      @connection.drop_table 'citexts', if_exists: true
+      disable_extension!('citext', @connection)
     end
 
     def test_citext_enabled
@@ -35,9 +31,10 @@ if ActiveRecord::Base.connection.supports_extensions?
       column = Citext.columns_hash['cival']
       assert_equal :citext, column.type
       assert_equal 'citext', column.sql_type
-      assert_not column.number?
-      assert_not column.binary?
-      assert_not column.array
+      assert_not column.array?
+
+      type = Citext.type_for_attribute('cival')
+      assert_not type.binary?
     end
 
     def test_change_table_supports_json
@@ -72,5 +69,10 @@ if ActiveRecord::Base.connection.supports_extensions?
       x = Citext.where(cival: 'cased text').first
       assert_equal 'Cased Text', x.cival
     end
+
+    def test_schema_dump_with_shorthand
+      output = dump_table_schema("citexts")
+      assert_match %r[t\.citext "cival"], output
+    end
   end
 end