Merge branch 'tune-test-env' into registry-662

# Conflicts:
#	test/integration/registrar/bulk_change/nameserver_test.rb
#	test/integration/registrar/domain_transfers_test.rb
This commit is contained in:
Artur Beljajev 2018-04-06 00:44:24 +03:00
commit 77135b34ba
28 changed files with 49 additions and 39 deletions

View file

@ -1,7 +1,7 @@
require 'test_helper'
class APIDomainTransfersTest < ActionDispatch::IntegrationTest
def setup
setup do
@domain = domains(:shop)
@new_registrar = registrars(:goodnames)
Setting.transfer_wait_time = 0 # Auto-approval