zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 19:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into refactor-messages

Browse source 
# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-08-28 14:26:56 +03:00
commit aff5b68a2f
29 changed files with 297 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/system/admin_area/domains/details_test.rb
View file

@ -7,9 +7,14 @@ class AdminAreaDomainDetailsTest < ApplicationSystemTestCase
end
def test_discarded_domain_has_corresponding_label
travel_to Time.zone.parse('2010-07-05 10:30')
@domain.delete_at = Time.zone.parse('2010-07-05 10:00')
visit admin_domain_url(@domain)
assert_no_css 'span.label.label-warning', text: 'deleteCandidate'
@domain.discard
visit admin_domain_url(@domain)
assert_css 'span.label.label-warning', text: 'deleteCandidate'
end

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

@ -56,7 +56,7 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
end
def test_force_delete_procedure_cannot_be_scheduled_on_a_discarded_domain
@domain.discard
@domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE])
visit edit_admin_domain_url(@domain)
assert_no_button 'Schedule force delete'