Merge branch 'registry-791' into registry-790

This commit is contained in:
Artur Beljajev 2018-07-27 16:18:28 +03:00
commit 4b30234c86
14 changed files with 189 additions and 142 deletions

View file

@ -44,8 +44,8 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest
end
def test_cancels_scheduled_domain_force_delete
@domain.update_attribute(:statuses, [DomainStatus::FORCE_DELETE])
assert @domain.force_delete_scheduled?
@domain.discard
@domain.schedule_force_delete
visit edit_admin_domain_url(@domain)
click_link_or_button 'Cancel force delete'