zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 03:58:27 +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

8
test/system/admin_area/domains/force_delete_test.rb
View file

@ -55,13 +55,11 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
assert_text 'Force delete procedure has been cancelled'
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_procedure_cannot_be_scheduled_on_a_discarded_domain
@domain.discard
@domain.schedule_force_delete
visit edit_admin_domain_url(@domain)
assert_no_button 'Cancel force delete'
assert_no_link 'Cancel force delete'
assert_no_button 'Schedule force delete'
assert_no_link 'Schedule force delete'
end
end