Merge branch 'master' into registry-623

# Conflicts:
#	test/integration/admin/registrars/show_registrar_test.rb

app/views/admin/mail_templates/_form.haml

@@ -37,7 +37,7 @@
               = f.email_field :bcc, class: 'form-control'
           .form-group
             .col-md-12
-              = f.label :body, t(:html_body)
+              = f.label :body, t('admin.mail_templates.html_body')
               = liquid_help
             .col-md-12
               = f.text_area(:body, class: 'form-control', size: '15x15')

app/views/admin/mail_templates/new.haml

@@ -1,3 +1,3 @@
-= render 'shared/title', name: t(:new_mail_template)
+= render 'shared/title', name: t('admin.mail_templates.new_mail_template')
 
 = render 'form', mail_template: @mail_template

config/environments/test.rb

@@ -43,6 +43,7 @@ Rails.application.configure do
   config.log_level = :debug
   config.active_job.queue_adapter = :test
   config.logger = ActiveSupport::Logger.new(nil)
+  config.active_support.test_order = :random # :random is the default in Rails 5
 end
 
 # In this mode, any jobs you queue will be run in the same thread, synchronously

config/locales/admin/mail_templates.en.yml

@@ -0,0 +1,5 @@
+en:
+  admin:
+    mail_templates:
+      html_body: HTML body
+      new_mail_template: New mail template

config/locales/en.yml

@@ -729,7 +729,6 @@ en:
   is_registrant: 'Is registrant'
   force_delete_set_on_domain: 'Force delete set on domain %{domain_name}'
   mail_templates: Mail Templates
-  new_mail_template: New mail template
   failure: "It was not saved"
   contact_is_not_valid: 'Contact %{value} is not valid, please fix the invalid contact'
   welcome_to_eis_registrar_portal: 'Welcome to EIS Registrar portal'

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/mail_templates/new_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class AdminAreaNewMailTemplateTest < ActionDispatch::IntegrationTest
+  def setup
+    login_as users(:admin)
+  end
+
+  def test_new_mail_template_does_not_throw_template_error
+    visit admin_mail_templates_url
+    click_link_or_button 'New'
+    assert_text "HTML body"
+    assert_text "New mail template"
+  end
+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/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

test/integration/registrar/domain_transfers_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class RegistrarDomainTransfersTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     WebMock.reset!
     login_as users(:api_goodnames)
   end

test/integration/registrar/nameserver_replacement_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class RegistrarNameserverReplacementTest < ActionDispatch::IntegrationTest
-  def setup
+  setup do
     WebMock.reset!
     login_as users(:api_goodnames)
   end

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

test/test_helper.rb

@@ -21,6 +21,10 @@ class ActiveSupport::TestCase
 
   ActiveRecord::Migration.check_pending!
   fixtures :all
+
+  teardown do
+    travel_back
+  end
 end
 
 class ActionDispatch::IntegrationTest
@@ -29,8 +33,9 @@ class ActionDispatch::IntegrationTest
   include Capybara::Minitest::Assertions
   include AbstractController::Translation
 
-  def teardown
+  teardown do
     Warden.test_reset!
+    WebMock.reset!
     Capybara.reset_sessions!
     Capybara.use_default_driver
   end