From 7a24eab63a6ee684526a5140c505c0cf2dba6f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Thu, 3 Sep 2020 10:46:05 +0300 Subject: [PATCH] Fix contact archivation tests --- test/models/contact_test.rb | 3 +-- test/tasks/contacts/archive_test.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/models/contact_test.rb b/test/models/contact_test.rb index 1083a54f3..942b71b06 100644 --- a/test/models/contact_test.rb +++ b/test/models/contact_test.rb @@ -265,9 +265,8 @@ class ContactTest < ActiveSupport::TestCase def test_unlinked_scope_skips_contact_that_is_linked_as_registrant contact = unlinked_contact - domains(:shop).update_columns(registrant_id: contact.becomes(Registrant)) + domains(:shop).update_columns(registrant_id: contact.becomes(Registrant).id) - reload assert Contact.unlinked.exclude?(contact), 'Contact should be excluded' end diff --git a/test/tasks/contacts/archive_test.rb b/test/tasks/contacts/archive_test.rb index cd137a8c4..a22110ae3 100644 --- a/test/tasks/contacts/archive_test.rb +++ b/test/tasks/contacts/archive_test.rb @@ -36,7 +36,7 @@ class ArchiveContactsTaskTest < ActiveSupport::TestCase def eliminate_effect_of_all_contacts_except(contact) Contact.connection.disable_referential_integrity do - Contact.delete_all("id != #{contact.id}") + Contact.where("id != #{contact.id}").delete_all end end