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/models/contact/contact_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ContactTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @contact = contacts(:john)
   end
 

test/models/contact/identical_test.rb

@@ -12,11 +12,16 @@ class ContactIdenticalTest < ActiveSupport::TestCase
     org_name
   ]
 
-  def setup
+  setup do
+    @original_address_processing = Setting.address_processing
     @contact = contacts(:william)
     @identical = contacts(:identical_to_william)
   end
 
+  teardown do
+    Setting.address_processing = @original_address_processing
+  end
+
   def test_returns_identical
     assert_equal @identical, @contact.identical(@identical.registrar)
   end
@@ -33,30 +38,24 @@ class ContactIdenticalTest < ActiveSupport::TestCase
     assert_nil @contact.identical(@identical.registrar)
   end
 
-  def test_takes_address_into_account_when_processing_enabled
+  def test_takes_address_into_account_when_address_processing_is_on
+    Setting.address_processing = true
+
     Contact.address_attribute_names.each do |attribute|
       previous_value = @identical.public_send(attribute)
       @identical.update_attribute(attribute, 'other')
-
-      Contact.stub :address_processing?, true do
-        assert_nil @contact.identical(@identical.registrar)
-      end
-
+      assert_nil @contact.identical(@identical.registrar)
       @identical.update_attribute(attribute, previous_value)
     end
   end
 
-  def test_ignores_address_when_processing_disabled
+  def test_ignores_address_when_address_processing_is_off
     Setting.address_processing = false
 
     Contact.address_attribute_names.each do |attribute|
       previous_value = @identical.public_send(attribute)
       @identical.update_attribute(attribute, 'other')
-
-      Contact.stub :address_processing?, false do
-        assert_equal @identical, @contact.identical(@identical.registrar)
-      end
-
+      assert_equal @identical, @contact.identical(@identical.registrar)
       @identical.update_attribute(attribute, previous_value)
     end
   end

test/models/contact/postal_address_test.rb

@@ -1,10 +1,15 @@
 require 'test_helper'
 
 class ContactPostalAddressTest < ActiveSupport::TestCase
-  def setup
+  setup do
+    @original_address_processing = Setting.address_processing
     @contact = contacts(:john)
   end
 
+  teardown do
+    Setting.address_processing = @original_address_processing
+  end
+
   def test_invalid_if_country_code_is_invalid_and_address_processing_is_on
     Setting.address_processing = true
     @contact.country_code = 'invalid'

test/models/contact/transfer_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ContactTransferTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @contact = contacts(:john)
     @new_registrar = registrars(:goodnames)
   end

test/models/domain/domain_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class DomainTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @domain = domains(:shop)
   end
 

test/models/domain/transferable_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class DomainTransferableTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @domain = domains(:shop)
     @new_registrar = registrars(:goodnames)
   end

test/models/domain_transfer_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class DomainTransferTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @domain_transfer = domain_transfers(:shop)
   end
 

test/models/epp_session_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class EppSessionTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @epp_session = epp_sessions(:api_bestnames)
   end
 

test/models/message_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class MessageTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @message = messages(:greeting)
   end
 

test/models/nameserver/glue_record_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class NameserverGlueRecordTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @nameserver = nameservers(:shop_ns1)
   end
 

test/models/nameserver_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class NameserverTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @nameserver = nameservers(:shop_ns1)
   end
 

test/models/registrar/code_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class RegistrarCodeTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @registrar = registrars(:bestnames).dup
   end
 

test/models/registrar/delete_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class DeleteRegistrarTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @registrar = registrars(:not_in_use)
   end
 

test/models/registrar_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class RegistrarTest < ActiveSupport::TestCase
-  def setup
+  setup do
     @registrar = registrars(:bestnames)
   end