aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/postgresql
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-02-12 12:20:03 +0100
committerYves Senn <yves.senn@gmail.com>2015-02-12 12:20:03 +0100
commitefeaa01e74dd4514568774ce82c4a94271d55cbf (patch)
tree6c0bb41d2810fc901f889d51e019e0ecd98ec3bc /activerecord/test/cases/adapters/postgresql
parentd93aae9ae728c9cbf88e4c083270a49b9c75542d (diff)
downloadrails-efeaa01e74dd4514568774ce82c4a94271d55cbf.tar.gz
rails-efeaa01e74dd4514568774ce82c4a94271d55cbf.tar.bz2
rails-efeaa01e74dd4514568774ce82c4a94271d55cbf.zip
pg tests, be clear about the missing type that causes a test skip.
Also removed some cruft in the `setup` and `teardown` methods.
Diffstat (limited to 'activerecord/test/cases/adapters/postgresql')
-rw-r--r--activerecord/test/cases/adapters/postgresql/json_test.rb13
1 files changed, 6 insertions, 7 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index cbe7e62870..3b123f979e 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
require "cases/helper"
require 'support/schema_dumping_helper'
@@ -13,20 +14,18 @@ module PostgresqlJSONSharedTestCases
def setup
@connection = ActiveRecord::Base.connection
begin
- @connection.transaction do
- @connection.create_table('json_data_type') do |t|
- t.public_send column_type, 'payload', default: {} # t.json 'payload', default: {}
- t.public_send column_type, 'settings' # t.json 'settings'
- end
+ @connection.create_table('json_data_type') do |t|
+ t.public_send column_type, 'payload', default: {} # t.json 'payload', default: {}
+ t.public_send column_type, 'settings' # t.json 'settings'
end
rescue ActiveRecord::StatementInvalid
- skip "do not test on PG without json"
+ skip "do not test on PostgreSQL without #{column_type} type."
end
@column = JsonDataType.columns_hash['payload']
end
def teardown
- @connection.execute 'drop table if exists json_data_type'
+ @connection.drop_table :json_data_type, if_exists: true
end
def test_column