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

MERGE: merged staging at 3235647, resolved merge conflict

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 16:12:20 +02:00
commit 45588dc72a
78 changed files with 308808 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/features/admin/domain_spec.rb
View file

@ -59,7 +59,7 @@ feature 'Domain', type: :feature do
click_link 'Edit statuses'
page.should have_content('ok')
click_link 'Set force delete'
page.should have_content('forceDelete')
page.should have_content('serverForceDelete')
page.should have_content('serverRenewProhibited')
page.should have_content('serverTransferProhibited')
page.should have_content('serverUpdateProhibited')
@ -74,7 +74,7 @@ feature 'Domain', type: :feature do
click_link 'Back to domain'
click_link 'Edit statuses'
click_link 'Unset force delete'
page.should_not have_content('forceDelete')
page.should_not have_content('serverForceDelete')
page.should_not have_content('serverRenewProhibited')
page.should_not have_content('serverTransferProhibited')
page.should_not have_content('serverUpdateProhibited')

4
spec/models/domain_spec.rb
View file

@ -245,7 +245,7 @@ describe Domain do
@domain.set_force_delete
@domain.statuses.should match_array([
"forceDelete",
"serverForceDelete",
"pendingDelete",
"serverManualInzone",
"serverRenewProhibited",
@ -286,7 +286,7 @@ describe Domain do
"clientHold",
"deleteCandidate",
"expired",
"forceDelete",
"serverForceDelete",
"pendingDelete",
"serverHold",
"serverRenewProhibited",