36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From 84aff7aa2d9e5edaef43e980592e96d0fd03ce7c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
|
Date: Tue, 9 Feb 2021 19:06:19 +0100
|
|
Subject: [PATCH] Disable CPK test cases due to Rails 6.1 compatibility.
|
|
|
|
Relates #1396.
|
|
---
|
|
.../matchers/active_record/association_matcher_spec.rb | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb b/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb
|
|
index 290deb0b..1e1d2444 100644
|
|
--- a/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb
|
|
+++ b/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb
|
|
@@ -1446,6 +1446,8 @@ Expected Parent to have a has_many association called children through conceptio
|
|
end
|
|
|
|
it 'rejects an association with a valid :class_name and :foreign_key option (CPK), but no columns' do
|
|
+ pending "Rails 6.1 compatibilty"
|
|
+
|
|
define_model :person_detail
|
|
define_model :person do
|
|
has_one :detail, class_name: 'PersonDetail', foreign_key: %i[company_id person_detail_id]
|
|
@@ -1461,6 +1463,8 @@ Expected Parent to have a has_many association called children through conceptio
|
|
end
|
|
|
|
it 'accepts an association with a valid :class_name and :foreign_key option (CPK)' do
|
|
+ pending "Rails 6.1 compatibility"
|
|
+
|
|
define_model :person_detail, company_id: :integer, person_detail_id: :integer
|
|
define_model :person do
|
|
has_one :detail, class_name: 'PersonDetail', foreign_key: %i[company_id person_detail_id]
|
|
--
|
|
2.30.0
|
|
|