From 7c7213c3374ef069a4bf1a2953d4c112a38ec70a Mon Sep 17 00:00:00 2001
From: dinsmol <dinar184@mail.ru>
Date: Sat, 15 Jan 2022 23:09:31 +0300
Subject: [PATCH] Fix tests

---
 test/fixtures/contacts.yml              |  2 ++
 test/models/domain/force_delete_test.rb | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/fixtures/contacts.yml b/test/fixtures/contacts.yml
index 4d45738bd..6e362d7a6 100644
--- a/test/fixtures/contacts.yml
+++ b/test/fixtures/contacts.yml
@@ -1,6 +1,7 @@
 john:
   name: John
   email: john@inbox.test
+  email_history: john@inbox.test
   phone: '+555.555'
   ident: 1234
   ident_type: priv
@@ -18,6 +19,7 @@ john:
 william: &william
   name: William
   email: william@inbox.test
+  email_history: william@inbox.test
   phone: '+555.555'
   fax: '+666.6'
   ident: 12345
diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb
index b57367d49..b55fd2249 100644
--- a/test/models/domain/force_delete_test.rb
+++ b/test/models/domain/force_delete_test.rb
@@ -417,12 +417,16 @@ class ForceDeleteTest < ActionMailer::TestCase
     assert_not domain.force_delete_scheduled?
     travel_to Time.zone.parse('2010-07-05')
     email_1 = '`@internet.ee'
-    asserted_text = "Invalid email: #{email_1}"
+    email_2 = '`@internet2.ee'
+    asserted_text = "Invalid email: #{email_2}"
 
     Truemail.configure.default_validation_type = :regex
 
     contact_first = domain.admin_contacts.first
-    contact_first.update_attribute(:email, email_1)
+    old_email = contact_first.email
+    contact_first.update(
+      email: email_1,
+      email_history: old_email)
 
     ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do
       contact_first.verify_email
@@ -431,7 +435,6 @@ class ForceDeleteTest < ActionMailer::TestCase
     assert contact_first.email_verification_failed?
 
     domain.reload
-    email_2 = '`@internet2.ee'
     contact_second = domain.admin_contacts.last
     contact_second.update_attribute(:email, email_2)
 
@@ -447,9 +450,8 @@ class ForceDeleteTest < ActionMailer::TestCase
       email_history: email_1
     )
 
-    ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do
-      contact_first.verify_email
-    end
+    contact_first.verify_email
+    assert contact_first.need_to_lift_force_delete?
 
     domain.reload
     assert domain.force_delete_scheduled?