zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 14:44:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-790

Browse source 
# Conflicts:
#	test/models/domain/force_delete_test.rb
#	test/system/admin_area/domains/force_delete_test.rb
This commit is contained in:
Artur Beljajev 2018-08-24 14:54:41 +03:00
commit 4b2948986b
5 changed files with 43 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/models/domain/force_delete_test.rb
View file

@ -73,12 +73,10 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
assert @domain.force_delete_scheduled?
end
def test_force_delete_cannot_be_cancelled_when_a_domain_is_discarded
@domain.delete_at = Time.zone.parse('2010-07-05 10:00')
def test_force_delete_cannot_be_scheduled_when_a_domain_is_discarded
@domain.discard
@domain.schedule_force_delete
assert_raises StandardError do
@domain.cancel_force_delete
@domain.schedule_force_delete
end
end