Merge branch 'master' into registry-623

# Conflicts:
#	test/integration/admin/registrars/show_registrar_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/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