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

@ -1,6 +1,6 @@
require 'test_helper'
class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest
class EppDomainTransferRequestTest < ApplicationIntegrationTest
def setup
@domain = domains(:shop)
@new_registrar = registrars(:goodnames)