Merge branch 'master' into registry-790

# Conflicts:
#	test/integration/epp/domain/domain_delete_test.rb
#	test/integration/epp/domain/domain_update_test.rb
#	test/integration/epp/domain/transfer/request_test.rb
#	test/system/admin_area/domains_test.rb
This commit is contained in:
Artur Beljajev 2018-08-09 15:01:23 +03:00
commit 1d79f6548d
61 changed files with 731 additions and 84 deletions

View file

@ -0,0 +1,21 @@
require 'test_helper'
class AdminAreaDomainDetailsTest < ApplicationSystemTestCase
setup do
sign_in users(:admin)
@domain = domains(:shop)
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
end