From e6d3895b7514b1bd40964f6bbd037b163861a897 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@eestiinternet.ee>
Date: Thu, 19 Jul 2018 10:32:06 +0300
Subject: [PATCH 1/3] Fix typo in assertions filename

---
 test/support/{rails5_assetions.rb => rails5_assertions.rb} | 0
 test/test_helper.rb                                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/support/{rails5_assetions.rb => rails5_assertions.rb} (100%)

diff --git a/test/support/rails5_assetions.rb b/test/support/rails5_assertions.rb
similarity index 100%
rename from test/support/rails5_assetions.rb
rename to test/support/rails5_assertions.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 500861f75..56a4a7aeb 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -11,7 +11,7 @@ require 'minitest/mock'
 require 'capybara/rails'
 require 'capybara/minitest'
 require 'webmock/minitest'
-require 'support/rails5_assetions' # Remove once upgraded to Rails 5
+require 'support/rails5_assertions' # Remove once upgraded to Rails 5
 
 require 'application_system_test_case'
 

From c36b780c7131d41424010e234ead7155478b8637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20V=C3=B5hmar?= <timo.vohmar@internet.ee>
Date: Fri, 27 Jul 2018 01:19:18 +0300
Subject: [PATCH 2/3] Changelog update 180726

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecefbb279..44b66ef4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+26.07.2018
+* Grape (1.0.3), mustermann (1.0.2), multi_json (1.13.1) gem updates [#912](https://github.com/internetee/registry/issues/912)
+* Capybara (3.3.1), mini_mime (0.1.3), nokogiri (1.8), rack (1.6.0), xpath (3.1) gem updates [#980](https://github.com/internetee/registry/issues/908)
+* Webmock (3.4.2), addressable (2.5.2), hashdiff (0.3.7), public_suffix (3.0.2) gem updates [#907](https://github.com/internetee/registry/issues/907)
+* fixed typo in assertions filename [#920](https://github.com/internetee/registry/issues/920)
+* regenerate structure.sql [#915](https://github.com/internetee/registry/issues/915)
+
 12.07.2018
 * Implemented JavaScript testing framework to catch web UI problems [#900](https://github.com/internetee/registry/issues/900)
 

From 526a9ccd58df1c6b5228efb612b95fbdfef4ea1e Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@eestiinternet.ee>
Date: Fri, 27 Jul 2018 09:36:27 +0300
Subject: [PATCH 3/3] Change test structure to follow closer newer Rails 5
 rules

* Create new class called ApplicationIntegrationTest, so we don't have
  to override ActionDispatch::IntegrationTest
* Move UI tests to inherit from ApplicationSystemTestCase
* Existing REST API or EPP tests inherit from
  ApplicationIntegrationTest.
* Move `require 'application_system_test_case'` at the end of
  `test_helper`

I don't particularly agree with the Rails' convention of treating UI
tests as system tests and API tests as integration tests, but I see no
benefit in actively fighting against it.
---
 test/application_system_test_case.rb                        | 2 +-
 test/integration/api/domain_contacts_test.rb                | 2 +-
 test/integration/api/domain_transfers_test.rb               | 2 +-
 test/integration/api/nameservers/put_test.rb                | 2 +-
 test/integration/epp/domain/create/nameservers_test.rb      | 2 +-
 test/integration/epp/domain/create/transfer_code_test.rb    | 2 +-
 test/integration/epp/domain/domain_delete_test.rb           | 2 +-
 test/integration/epp/domain/domain_renew_test.rb            | 2 +-
 test/integration/epp/domain/domain_update_test.rb           | 2 +-
 test/integration/epp/domain/transfer/base_test.rb           | 2 +-
 test/integration/epp/domain/transfer/query_test.rb          | 2 +-
 test/integration/epp/domain/transfer/request_test.rb        | 2 +-
 test/integration/epp/login/credentials_test.rb              | 2 +-
 test/integration/epp/login/session_limit_test.rb            | 2 +-
 test/integration/epp/logout_test.rb                         | 2 +-
 test/integration/epp/poll_test.rb                           | 2 +-
 .../admin => system/admin_area}/contact_versions_test.rb    | 2 +-
 .../admin => system/admin_area}/contacts_test.rb            | 2 +-
 .../admin => system/admin_area}/domain_versions_test.rb     | 2 +-
 .../admin => system/admin_area}/domains/details_test.rb     | 2 +-
 .../admin_area}/domains/force_delete_test.rb                | 2 +-
 .../admin => system/admin_area}/domains_test.rb             | 2 +-
 .../admin => system/admin_area}/mail_templates/new_test.rb  | 2 +-
 .../admin => system/admin_area}/registrars/delete_test.rb   | 2 +-
 .../admin => system/admin_area}/registrars/details_test.rb  | 2 +-
 .../admin => system/admin_area}/registrars/edit_test.rb     | 2 +-
 .../admin => system/admin_area}/registrars/new_test.rb      | 2 +-
 .../registrant => system/registrant_area}/domains_test.rb   | 2 +-
 .../registrant => system/registrant_area}/layout_test.rb    | 2 +-
 .../registrar_area}/billing/balance_top_up_test.rb          | 2 +-
 .../registrar_area}/bulk_change/bulk_transfer_test.rb       | 2 +-
 .../registrar_area}/bulk_change/nameserver_test.rb          | 2 +-
 .../registrar_area}/bulk_change/tech_contact_test.rb        | 2 +-
 .../registrar => system/registrar_area}/domains_test.rb     | 2 +-
 .../registrar_area}/invoices/list_test.rb                   | 2 +-
 .../registrar_area}/invoices/new_invoice_payment_test.rb    | 2 +-
 .../registrar_area}/invoices/new_test.rb                    | 2 +-
 .../registrar_area}/invoices/payment_callback_test.rb       | 2 +-
 .../registrar_area}/invoices/payment_return_test.rb         | 2 +-
 test/system/{registrar => registrar_area}/sign_in_test.rb   | 0
 test/test_helper.rb                                         | 6 +++---
 41 files changed, 42 insertions(+), 42 deletions(-)
 rename test/{integration/admin => system/admin_area}/contact_versions_test.rb (96%)
 rename test/{integration/admin => system/admin_area}/contacts_test.rb (89%)
 rename test/{integration/admin => system/admin_area}/domain_versions_test.rb (97%)
 rename test/{integration/admin => system/admin_area}/domains/details_test.rb (85%)
 rename test/{integration/admin => system/admin_area}/domains/force_delete_test.rb (95%)
 rename test/{integration/admin => system/admin_area}/domains_test.rb (77%)
 rename test/{integration/admin => system/admin_area}/mail_templates/new_test.rb (79%)
 rename test/{integration/admin => system/admin_area}/registrars/delete_test.rb (91%)
 rename test/{integration/admin => system/admin_area}/registrars/details_test.rb (84%)
 rename test/{integration/admin => system/admin_area}/registrars/edit_test.rb (97%)
 rename test/{integration/admin => system/admin_area}/registrars/new_test.rb (95%)
 rename test/{integration/registrant => system/registrant_area}/domains_test.rb (90%)
 rename test/{integration/registrant => system/registrant_area}/layout_test.rb (88%)
 rename test/{integration/registrar => system/registrar_area}/billing/balance_top_up_test.rb (91%)
 rename test/{integration/registrar => system/registrar_area}/bulk_change/bulk_transfer_test.rb (95%)
 rename test/{integration/registrar => system/registrar_area}/bulk_change/nameserver_test.rb (96%)
 rename test/{integration/registrar => system/registrar_area}/bulk_change/tech_contact_test.rb (95%)
 rename test/{integration/registrar => system/registrar_area}/domains_test.rb (92%)
 rename test/{integration/registrar => system/registrar_area}/invoices/list_test.rb (90%)
 rename test/{integration/registrar => system/registrar_area}/invoices/new_invoice_payment_test.rb (95%)
 rename test/{integration/registrar => system/registrar_area}/invoices/new_test.rb (95%)
 rename test/{integration/registrar => system/registrar_area}/invoices/payment_callback_test.rb (96%)
 rename test/{integration/registrar => system/registrar_area}/invoices/payment_return_test.rb (98%)
 rename test/system/{registrar => registrar_area}/sign_in_test.rb (100%)

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 6c06ef937..cceeb27c5 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 require 'database_cleaner'
 require 'selenium/webdriver'
 
-class ApplicationSystemTestCase < ActionDispatch::IntegrationTest; end
+ApplicationSystemTestCase = Class.new(ApplicationIntegrationTest)
 
 class JavaScriptApplicationSystemTestCase < ApplicationSystemTestCase
   self.use_transactional_fixtures = false
diff --git a/test/integration/api/domain_contacts_test.rb b/test/integration/api/domain_contacts_test.rb
index a6d6376f7..e99a45825 100644
--- a/test/integration/api/domain_contacts_test.rb
+++ b/test/integration/api/domain_contacts_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class APIDomainContactsTest < ActionDispatch::IntegrationTest
+class APIDomainContactsTest < ApplicationIntegrationTest
   def test_replace_all_tech_contacts_of_the_current_registrar
     patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001',
                                          new_contact_id: 'john-001' },
diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb
index 4b65b35de..d439a64e5 100644
--- a/test/integration/api/domain_transfers_test.rb
+++ b/test/integration/api/domain_transfers_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class APIDomainTransfersTest < ActionDispatch::IntegrationTest
+class APIDomainTransfersTest < ApplicationIntegrationTest
   setup do
     @domain = domains(:shop)
     @new_registrar = registrars(:goodnames)
diff --git a/test/integration/api/nameservers/put_test.rb b/test/integration/api/nameservers/put_test.rb
index 0967a1169..4c35d3e77 100644
--- a/test/integration/api/nameservers/put_test.rb
+++ b/test/integration/api/nameservers/put_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class APINameserversPutTest < ActionDispatch::IntegrationTest
+class APINameserversPutTest < ApplicationIntegrationTest
   def test_replaces_registrar_nameservers
     old_nameserver_ids = [nameservers(:shop_ns1).id,
                           nameservers(:airport_ns1).id,
diff --git a/test/integration/epp/domain/create/nameservers_test.rb b/test/integration/epp/domain/create/nameservers_test.rb
index ddaddf2d1..954d1f300 100644
--- a/test/integration/epp/domain/create/nameservers_test.rb
+++ b/test/integration/epp/domain/create/nameservers_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppDomainCreateNameserversTest < ActionDispatch::IntegrationTest
+class EppDomainCreateNameserversTest < ApplicationIntegrationTest
   # Glue record requirement
   def test_nameserver_ip_address_is_required_if_hostname_is_under_the_same_domain
     request_xml = <<-XML
diff --git a/test/integration/epp/domain/create/transfer_code_test.rb b/test/integration/epp/domain/create/transfer_code_test.rb
index 60133cb35..131baf67a 100644
--- a/test/integration/epp/domain/create/transfer_code_test.rb
+++ b/test/integration/epp/domain/create/transfer_code_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest
+class EppDomainCreateTransferCodeTest < ApplicationIntegrationTest
   setup do
     travel_to Time.zone.parse('2010-07-05')
   end
diff --git a/test/integration/epp/domain/domain_delete_test.rb b/test/integration/epp/domain/domain_delete_test.rb
index eae4d39ff..61cd7d6f3 100644
--- a/test/integration/epp/domain/domain_delete_test.rb
+++ b/test/integration/epp/domain/domain_delete_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppDomainDeleteTest < ActionDispatch::IntegrationTest
+class EppDomainDeleteTest < ApplicationIntegrationTest
   def test_bypasses_domain_and_registrant_and_contacts_validation
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/test/integration/epp/domain/domain_renew_test.rb b/test/integration/epp/domain/domain_renew_test.rb
index 338ecf766..ac48269ad 100644
--- a/test/integration/epp/domain/domain_renew_test.rb
+++ b/test/integration/epp/domain/domain_renew_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppDomainRenewTest < ActionDispatch::IntegrationTest
+class EppDomainRenewTest < ApplicationIntegrationTest
   self.use_transactional_fixtures = false
 
   setup do
diff --git a/test/integration/epp/domain/domain_update_test.rb b/test/integration/epp/domain/domain_update_test.rb
index ac7160558..f1db1b087 100644
--- a/test/integration/epp/domain/domain_update_test.rb
+++ b/test/integration/epp/domain/domain_update_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppDomainUpdateTest < ActionDispatch::IntegrationTest
+class EppDomainUpdateTest < ApplicationIntegrationTest
   def test_update_domain
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/test/integration/epp/domain/transfer/base_test.rb b/test/integration/epp/domain/transfer/base_test.rb
index aa9f841b6..e220f8ebd 100644
--- a/test/integration/epp/domain/transfer/base_test.rb
+++ b/test/integration/epp/domain/transfer/base_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest
+class EppDomainTransferBaseTest < ApplicationIntegrationTest
   def test_non_existent_domain
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/test/integration/epp/domain/transfer/query_test.rb b/test/integration/epp/domain/transfer/query_test.rb
index 1412dd9b3..8a9c589c8 100644
--- a/test/integration/epp/domain/transfer/query_test.rb
+++ b/test/integration/epp/domain/transfer/query_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest
+class EppDomainTransferQueryTest < ApplicationIntegrationTest
   def test_returns_domain_transfer_details
     post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
     xml_doc = Nokogiri::XML(response.body)
diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb
index 3e776331b..6335fb27e 100644
--- a/test/integration/epp/domain/transfer/request_test.rb
+++ b/test/integration/epp/domain/transfer/request_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest
+class EppDomainTransferRequestTest < ApplicationIntegrationTest
   setup do
     @domain = domains(:shop)
     @new_registrar = registrars(:goodnames)
diff --git a/test/integration/epp/login/credentials_test.rb b/test/integration/epp/login/credentials_test.rb
index 6a27c7393..3eac10da5 100644
--- a/test/integration/epp/login/credentials_test.rb
+++ b/test/integration/epp/login/credentials_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppLoginCredentialsTest < ActionDispatch::IntegrationTest
+class EppLoginCredentialsTest < ApplicationIntegrationTest
   def test_correct_credentials
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/test/integration/epp/login/session_limit_test.rb b/test/integration/epp/login/session_limit_test.rb
index b2fdfe88f..de7f85a06 100644
--- a/test/integration/epp/login/session_limit_test.rb
+++ b/test/integration/epp/login/session_limit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppLoginSessionLimitTest < ActionDispatch::IntegrationTest
+class EppLoginSessionLimitTest < ApplicationIntegrationTest
   setup do
     travel_to Time.zone.parse('2010-07-05')
     EppSession.delete_all
diff --git a/test/integration/epp/logout_test.rb b/test/integration/epp/logout_test.rb
index 75b26f2f3..dc8276e7e 100644
--- a/test/integration/epp/logout_test.rb
+++ b/test/integration/epp/logout_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppLogoutTest < ActionDispatch::IntegrationTest
+class EppLogoutTest < ApplicationIntegrationTest
   def test_success_response
     post '/epp/session/logout', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
     assert Nokogiri::XML(response.body).at_css('result[code="1500"]')
diff --git a/test/integration/epp/poll_test.rb b/test/integration/epp/poll_test.rb
index db6091cb0..30ee5c769 100644
--- a/test/integration/epp/poll_test.rb
+++ b/test/integration/epp/poll_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppPollTest < ActionDispatch::IntegrationTest
+class EppPollTest < ApplicationIntegrationTest
   def test_messages
     post '/epp/command/poll', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
     assert_equal '1301', Nokogiri::XML(response.body).at_css('result')[:code]
diff --git a/test/integration/admin/contact_versions_test.rb b/test/system/admin_area/contact_versions_test.rb
similarity index 96%
rename from test/integration/admin/contact_versions_test.rb
rename to test/system/admin_area/contact_versions_test.rb
index daaba64e8..10d20615a 100644
--- a/test/integration/admin/contact_versions_test.rb
+++ b/test/system/admin_area/contact_versions_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ContactVersionsTest < ActionDispatch::IntegrationTest
+class ContactVersionsTest < ApplicationSystemTestCase
   def setup
     super
 
diff --git a/test/integration/admin/contacts_test.rb b/test/system/admin_area/contacts_test.rb
similarity index 89%
rename from test/integration/admin/contacts_test.rb
rename to test/system/admin_area/contacts_test.rb
index 1d2d2e07e..c72004988 100644
--- a/test/integration/admin/contacts_test.rb
+++ b/test/system/admin_area/contacts_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminContactsTest < ActionDispatch::IntegrationTest
+class AdminContactsTest < ApplicationSystemTestCase
   def setup
     super
 
diff --git a/test/integration/admin/domain_versions_test.rb b/test/system/admin_area/domain_versions_test.rb
similarity index 97%
rename from test/integration/admin/domain_versions_test.rb
rename to test/system/admin_area/domain_versions_test.rb
index 760f4b4ef..6c375cefe 100644
--- a/test/integration/admin/domain_versions_test.rb
+++ b/test/system/admin_area/domain_versions_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DomainVersionsTest < ActionDispatch::IntegrationTest
+class DomainVersionsTest < ApplicationSystemTestCase
   def setup
     super
 
diff --git a/test/integration/admin/domains/details_test.rb b/test/system/admin_area/domains/details_test.rb
similarity index 85%
rename from test/integration/admin/domains/details_test.rb
rename to test/system/admin_area/domains/details_test.rb
index cb9fb96f3..31a46a19b 100644
--- a/test/integration/admin/domains/details_test.rb
+++ b/test/system/admin_area/domains/details_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminAreaDomainDetailsTest < ActionDispatch::IntegrationTest
+class AdminAreaDomainDetailsTest < ApplicationSystemTestCase
   setup do
     sign_in users(:admin)
     @domain = domains(:shop)
diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/system/admin_area/domains/force_delete_test.rb
similarity index 95%
rename from test/integration/admin/domains/force_delete_test.rb
rename to test/system/admin_area/domains/force_delete_test.rb
index 3e5d7d4d6..f98401173 100644
--- a/test/integration/admin/domains/force_delete_test.rb
+++ b/test/system/admin_area/domains/force_delete_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest
+class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
   include ActionMailer::TestHelper
 
   setup do
diff --git a/test/integration/admin/domains_test.rb b/test/system/admin_area/domains_test.rb
similarity index 77%
rename from test/integration/admin/domains_test.rb
rename to test/system/admin_area/domains_test.rb
index 6ef6443fc..538de2604 100644
--- a/test/integration/admin/domains_test.rb
+++ b/test/system/admin_area/domains_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminDomainsTestTest < ActionDispatch::IntegrationTest
+class AdminDomainsTestTest < ApplicationSystemTestCase
   setup do
     sign_in users(:admin)
   end
diff --git a/test/integration/admin/mail_templates/new_test.rb b/test/system/admin_area/mail_templates/new_test.rb
similarity index 79%
rename from test/integration/admin/mail_templates/new_test.rb
rename to test/system/admin_area/mail_templates/new_test.rb
index c2a01f3d0..dcaa5d592 100644
--- a/test/integration/admin/mail_templates/new_test.rb
+++ b/test/system/admin_area/mail_templates/new_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminAreaNewMailTemplateTest < ActionDispatch::IntegrationTest
+class AdminAreaNewMailTemplateTest < ApplicationSystemTestCase
   setup do
     sign_in users(:admin)
   end
diff --git a/test/integration/admin/registrars/delete_test.rb b/test/system/admin_area/registrars/delete_test.rb
similarity index 91%
rename from test/integration/admin/registrars/delete_test.rb
rename to test/system/admin_area/registrars/delete_test.rb
index 177564d79..f0ecaecc6 100644
--- a/test/integration/admin/registrars/delete_test.rb
+++ b/test/system/admin_area/registrars/delete_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminAreaDeleteRegistrarTest < ActionDispatch::IntegrationTest
+class AdminAreaDeleteRegistrarTest < ApplicationSystemTestCase
   setup do
     sign_in users(:admin)
   end
diff --git a/test/integration/admin/registrars/details_test.rb b/test/system/admin_area/registrars/details_test.rb
similarity index 84%
rename from test/integration/admin/registrars/details_test.rb
rename to test/system/admin_area/registrars/details_test.rb
index fe96f46e2..1dfb4b03a 100644
--- a/test/integration/admin/registrars/details_test.rb
+++ b/test/system/admin_area/registrars/details_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminAreaRegistrarDetailsTest < ActionDispatch::IntegrationTest
+class AdminAreaRegistrarDetailsTest < ApplicationSystemTestCase
   include ActionView::Helpers::NumberHelper
 
   setup do
diff --git a/test/integration/admin/registrars/edit_test.rb b/test/system/admin_area/registrars/edit_test.rb
similarity index 97%
rename from test/integration/admin/registrars/edit_test.rb
rename to test/system/admin_area/registrars/edit_test.rb
index 6c58fe4e5..9cb9d5020 100644
--- a/test/integration/admin/registrars/edit_test.rb
+++ b/test/system/admin_area/registrars/edit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminAreaEditRegistrarTest < ActionDispatch::IntegrationTest
+class AdminAreaEditRegistrarTest < ApplicationSystemTestCase
   setup do
     sign_in users(:admin)
     @registrar = registrars(:bestnames)
diff --git a/test/integration/admin/registrars/new_test.rb b/test/system/admin_area/registrars/new_test.rb
similarity index 95%
rename from test/integration/admin/registrars/new_test.rb
rename to test/system/admin_area/registrars/new_test.rb
index e0e286938..90425a714 100644
--- a/test/integration/admin/registrars/new_test.rb
+++ b/test/system/admin_area/registrars/new_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AdminAreaNewRegistrarTest < ActionDispatch::IntegrationTest
+class AdminAreaNewRegistrarTest < ApplicationSystemTestCase
   setup do
     sign_in users(:admin)
   end
diff --git a/test/integration/registrant/domains_test.rb b/test/system/registrant_area/domains_test.rb
similarity index 90%
rename from test/integration/registrant/domains_test.rb
rename to test/system/registrant_area/domains_test.rb
index fbed651b6..7eeebb6e7 100644
--- a/test/integration/registrant/domains_test.rb
+++ b/test/system/registrant_area/domains_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrantDomainsTest < ActionDispatch::IntegrationTest
+class RegistrantDomainsTest < ApplicationSystemTestCase
   setup do
     sign_in users(:registrant)
 
diff --git a/test/integration/registrant/layout_test.rb b/test/system/registrant_area/layout_test.rb
similarity index 88%
rename from test/integration/registrant/layout_test.rb
rename to test/system/registrant_area/layout_test.rb
index 131389b6c..90d6f8907 100644
--- a/test/integration/registrant/layout_test.rb
+++ b/test/system/registrant_area/layout_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrantLayoutTest < ActionDispatch::IntegrationTest
+class RegistrantLayoutTest < ApplicationSystemTestCase
   def setup
     super
     sign_in(users(:registrant))
diff --git a/test/integration/registrar/billing/balance_top_up_test.rb b/test/system/registrar_area/billing/balance_top_up_test.rb
similarity index 91%
rename from test/integration/registrar/billing/balance_top_up_test.rb
rename to test/system/registrar_area/billing/balance_top_up_test.rb
index d991bea45..2d44e8328 100644
--- a/test/integration/registrar/billing/balance_top_up_test.rb
+++ b/test/system/registrar_area/billing/balance_top_up_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class BalanceTopUpTest < ActionDispatch::IntegrationTest
+class BalanceTopUpTest < ApplicationSystemTestCase
   setup do
     sign_in users(:api_bestnames)
   end
diff --git a/test/integration/registrar/bulk_change/bulk_transfer_test.rb b/test/system/registrar_area/bulk_change/bulk_transfer_test.rb
similarity index 95%
rename from test/integration/registrar/bulk_change/bulk_transfer_test.rb
rename to test/system/registrar_area/bulk_change/bulk_transfer_test.rb
index 4cd374862..3a663a9bc 100644
--- a/test/integration/registrar/bulk_change/bulk_transfer_test.rb
+++ b/test/system/registrar_area/bulk_change/bulk_transfer_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrarAreaBulkTransferTest < ActionDispatch::IntegrationTest
+class RegistrarAreaBulkTransferTest < ApplicationSystemTestCase
   setup do
     sign_in users(:api_goodnames)
   end
diff --git a/test/integration/registrar/bulk_change/nameserver_test.rb b/test/system/registrar_area/bulk_change/nameserver_test.rb
similarity index 96%
rename from test/integration/registrar/bulk_change/nameserver_test.rb
rename to test/system/registrar_area/bulk_change/nameserver_test.rb
index 841e68db5..c5789a969 100644
--- a/test/integration/registrar/bulk_change/nameserver_test.rb
+++ b/test/system/registrar_area/bulk_change/nameserver_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrarAreaNameserverBulkChangeTest < ActionDispatch::IntegrationTest
+class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase
   setup do
     sign_in users(:api_goodnames)
   end
diff --git a/test/integration/registrar/bulk_change/tech_contact_test.rb b/test/system/registrar_area/bulk_change/tech_contact_test.rb
similarity index 95%
rename from test/integration/registrar/bulk_change/tech_contact_test.rb
rename to test/system/registrar_area/bulk_change/tech_contact_test.rb
index 9277cdb38..0b68b9db2 100644
--- a/test/integration/registrar/bulk_change/tech_contact_test.rb
+++ b/test/system/registrar_area/bulk_change/tech_contact_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrarAreaTechContactBulkChangeTest < ActionDispatch::IntegrationTest
+class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase
   setup do
     sign_in users(:api_bestnames)
   end
diff --git a/test/integration/registrar/domains_test.rb b/test/system/registrar_area/domains_test.rb
similarity index 92%
rename from test/integration/registrar/domains_test.rb
rename to test/system/registrar_area/domains_test.rb
index 55333dfb4..a01dd576b 100644
--- a/test/integration/registrar/domains_test.rb
+++ b/test/system/registrar_area/domains_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrarDomainsTest < ActionDispatch::IntegrationTest
+class RegistrarDomainsTest < ApplicationSystemTestCase
   def test_downloads_domain_list_as_csv
     sign_in users(:api_bestnames)
     travel_to Time.zone.parse('2010-07-05 10:30')
diff --git a/test/integration/registrar/invoices/list_test.rb b/test/system/registrar_area/invoices/list_test.rb
similarity index 90%
rename from test/integration/registrar/invoices/list_test.rb
rename to test/system/registrar_area/invoices/list_test.rb
index e9b051df7..be344d034 100644
--- a/test/integration/registrar/invoices/list_test.rb
+++ b/test/system/registrar_area/invoices/list_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ListInvoicesTest < ActionDispatch::IntegrationTest
+class ListInvoicesTest < ApplicationSystemTestCase
   def setup
     super
 
diff --git a/test/integration/registrar/invoices/new_invoice_payment_test.rb b/test/system/registrar_area/invoices/new_invoice_payment_test.rb
similarity index 95%
rename from test/integration/registrar/invoices/new_invoice_payment_test.rb
rename to test/system/registrar_area/invoices/new_invoice_payment_test.rb
index 2513751dd..6933ff9ad 100644
--- a/test/integration/registrar/invoices/new_invoice_payment_test.rb
+++ b/test/system/registrar_area/invoices/new_invoice_payment_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class NewInvoicePaymentTest < ActionDispatch::IntegrationTest
+class NewInvoicePaymentTest < ApplicationSystemTestCase
   def setup
     super
 
diff --git a/test/integration/registrar/invoices/new_test.rb b/test/system/registrar_area/invoices/new_test.rb
similarity index 95%
rename from test/integration/registrar/invoices/new_test.rb
rename to test/system/registrar_area/invoices/new_test.rb
index 35011826b..b9b6b6db4 100644
--- a/test/integration/registrar/invoices/new_test.rb
+++ b/test/system/registrar_area/invoices/new_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class NewInvoiceTest < ActionDispatch::IntegrationTest
+class NewInvoiceTest < ApplicationSystemTestCase
   def setup
     super
 
diff --git a/test/integration/registrar/invoices/payment_callback_test.rb b/test/system/registrar_area/invoices/payment_callback_test.rb
similarity index 96%
rename from test/integration/registrar/invoices/payment_callback_test.rb
rename to test/system/registrar_area/invoices/payment_callback_test.rb
index 20ecea3e5..c1920995d 100644
--- a/test/integration/registrar/invoices/payment_callback_test.rb
+++ b/test/system/registrar_area/invoices/payment_callback_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PaymentCallbackTest < ActionDispatch::IntegrationTest
+class PaymentCallbackTest < ApplicationSystemTestCase
   def setup
     super
 
diff --git a/test/integration/registrar/invoices/payment_return_test.rb b/test/system/registrar_area/invoices/payment_return_test.rb
similarity index 98%
rename from test/integration/registrar/invoices/payment_return_test.rb
rename to test/system/registrar_area/invoices/payment_return_test.rb
index 9530cf609..45e85118f 100644
--- a/test/integration/registrar/invoices/payment_return_test.rb
+++ b/test/system/registrar_area/invoices/payment_return_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PaymentReturnTest < ActionDispatch::IntegrationTest
+class PaymentReturnTest < ApplicationSystemTestCase
   def setup
     super
 
diff --git a/test/system/registrar/sign_in_test.rb b/test/system/registrar_area/sign_in_test.rb
similarity index 100%
rename from test/system/registrar/sign_in_test.rb
rename to test/system/registrar_area/sign_in_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 56a4a7aeb..ee6923367 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -13,8 +13,6 @@ require 'capybara/minitest'
 require 'webmock/minitest'
 require 'support/rails5_assertions' # Remove once upgraded to Rails 5
 
-require 'application_system_test_case'
-
 Setting.address_processing = false
 Setting.registry_country_code = 'US'
 
@@ -29,7 +27,7 @@ class ActiveSupport::TestCase
   end
 end
 
-class ActionDispatch::IntegrationTest
+class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
   include Capybara::DSL
   include Capybara::Minitest::Assertions
   include AbstractController::Translation
@@ -41,3 +39,5 @@ class ActionDispatch::IntegrationTest
     Capybara.use_default_driver
   end
 end
+
+require 'application_system_test_case'