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

# Conflicts:
#	test/integration/registrar/bulk_change/nameserver_test.rb
#	test/integration/registrar/domain_transfers_test.rb

test/integration/admin/domains/force_delete_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest
   include ActionMailer::TestHelper
 
-  def setup
+  setup do
     login_as users(:admin)
     @domain = domains(:shop)
     ActionMailer::Base.deliveries.clear

test/integration/admin/domains_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class AdminDomainsTestTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     login_as users(:admin)
   end
 

test/integration/admin/registrars/delete_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class AdminAreaDeleteRegistrarTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     login_as users(:admin)
   end
 

test/integration/admin/registrars/edit_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class AdminAreaEditRegistrarTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     login_as users(:admin)
     @registrar = registrars(:bestnames)
   end

test/integration/admin/registrars/new_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class AdminAreaNewRegistrarTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     login_as users(:admin)
   end
 

test/integration/admin/registrars/show_registrar_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ShowRegistrarTest < ActionDispatch::IntegrationTest
   include ActionView::Helpers::NumberHelper
 
-  def setup
+  setup do
     login_as users(:admin)
     @registrar = registrars(:bestnames)
     visit admin_registrar_path(@registrar)

test/integration/api/domain_transfers_test.rb

@@ -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

test/integration/epp/domain/create/transfer_code_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     travel_to Time.zone.parse('2010-07-05')
   end
 

test/integration/epp/domain/domain_renew_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class EppDomainRenewTest < ActionDispatch::IntegrationTest
   self.use_transactional_fixtures = false
 
-  def setup
+  setup do
     travel_to Time.zone.parse('2010-07-05')
   end
 

test/integration/epp/domain/transfer/request_test.rb

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

test/integration/epp/login/session_limit_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class EppLoginSessionLimitTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     travel_to Time.zone.parse('2010-07-05')
     EppSession.delete_all
   end

test/integration/registrant/domains_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class RegistrantDomainsTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     login_as users(:registrant)
 
     Setting.days_to_keep_business_registry_cache = 1