aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2017-12-05 15:12:12 -0700
committerGitHub <noreply@github.com>2017-12-05 15:12:12 -0700
commit23226d04f921b79f0077ba38c5a5a923b6d43f89 (patch)
treed583f6509f6f6e78b5daf76fe0c106768eb44580 /activerecord/test
parent7544cf7603959f25100b21f70b5e70354bed7e45 (diff)
parent29d081c47a43cc5d979836541cb73a816c95981d (diff)
downloadrails-23226d04f921b79f0077ba38c5a5a923b6d43f89.tar.gz
rails-23226d04f921b79f0077ba38c5a5a923b6d43f89.tar.bz2
rails-23226d04f921b79f0077ba38c5a5a923b6d43f89.zip
Merge pull request #31341 from yahonda/skip_json_attribute_test
Execute `JsonAttributeTest` only if `supports_json?` returns `true`
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/json_attribute_test.rb46
1 files changed, 24 insertions, 22 deletions
diff --git a/activerecord/test/cases/json_attribute_test.rb b/activerecord/test/cases/json_attribute_test.rb
index 63f3c77fc3..a6fd4f34dc 100644
--- a/activerecord/test/cases/json_attribute_test.rb
+++ b/activerecord/test/cases/json_attribute_test.rb
@@ -3,33 +3,35 @@
require "cases/helper"
require "cases/json_shared_test_cases"
-class JsonAttributeTest < ActiveRecord::TestCase
- include JSONSharedTestCases
- self.use_transactional_tests = false
+if ActiveRecord::Base.connection.supports_json?
+ class JsonAttributeTest < ActiveRecord::TestCase
+ include JSONSharedTestCases
+ self.use_transactional_tests = false
- class JsonDataTypeOnText < ActiveRecord::Base
- self.table_name = "json_data_type"
+ class JsonDataTypeOnText < ActiveRecord::Base
+ self.table_name = "json_data_type"
- attribute :payload, :json
- attribute :settings, :json
+ attribute :payload, :json
+ attribute :settings, :json
- store_accessor :settings, :resolution
- end
-
- def setup
- super
- @connection.create_table("json_data_type") do |t|
- t.text "payload"
- t.text "settings"
+ store_accessor :settings, :resolution
end
- end
- private
- def column_type
- :text
+ def setup
+ super
+ @connection.create_table("json_data_type") do |t|
+ t.text "payload"
+ t.text "settings"
+ end
end
- def klass
- JsonDataTypeOnText
- end
+ private
+ def column_type
+ :text
+ end
+
+ def klass
+ JsonDataTypeOnText
+ end
+ end
end