zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-24 03:30:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'registry-791' into registry-790

Browse source 
# Conflicts:
#	app/views/admin/domains/edit.html.erb
#	config/locales/admin/domains.en.yml
This commit is contained in:
Artur Beljajev 2018-08-09 16:42:43 +03:00
commit 732997bf9e
6 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,6 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
end
def test_cancels_scheduled_domain_force_delete
@domain.discard
@domain.schedule_force_delete
visit edit_admin_domain_url(@domain)
@ -55,4 +54,13 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
assert_current_path edit_admin_domain_path(@domain)
assert_text 'Force delete procedure has been cancelled'
end
end
def test_force_delete_cannot_be_cancelled_when_a_domain_is_discarded
@domain.discard
@domain.schedule_force_delete
visit edit_admin_domain_url(@domain)
assert_no_button 'Cancel force delete'
assert_no_link 'Cancel force delete'
end
end