From 4917539a7d5d6ffa75e044c3d048e7f9741e9f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Fri, 9 Oct 2020 14:57:03 +0300 Subject: [PATCH] Return pending_update? value based on status, regardless of force delete state --- app/models/domain.rb | 2 +- test/models/domain/force_delete_test.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 679669728..391c9c030 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -489,7 +489,7 @@ class Domain < ApplicationRecord end def pending_update? - statuses.include?(DomainStatus::PENDING_UPDATE) && !statuses.include?(DomainStatus::FORCE_DELETE) + statuses.include?(DomainStatus::PENDING_UPDATE) end # depricated not used, not valid diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index e3818c484..83cb57b13 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -242,4 +242,14 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase assert_not_includes(@domain.statuses, asserted_status) end + + def test_does_force_delete_does_not_affect_pending_update_check + @domain.schedule_force_delete(type: :soft) + @domain.reload + + @domain.statuses << DomainStatus::PENDING_DELETE + + assert @domain.force_delete_scheduled? + assert @domain.pending_update? + end end