Merge branch 'replace-warden-helpers-with-devise' into registry-790

# Conflicts:
#	test/integration/admin/domains_test.rb

spec/rails_helper.rb

@@ -32,6 +32,8 @@ RSpec.configure do |config|
   config.include AbstractController::Translation, type: :mailer
   config.include Requests::EPPHelpers, epp: true
   config.include Matchers::EPP, epp: true
+  config.include Devise::Test::IntegrationHelpers, type: :feature
+  config.include Devise::Test::IntegrationHelpers, type: :request
 
   config.define_derived_metadata(file_path: %r[/spec/features/]) do |metadata|
     metadata[:db] = true if metadata[:db].nil?

spec/requests/epp/contact/create/ident_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'EPP contact:create' do
 
   before do
     Setting.address_processing = false
-    login_as user
+    sign_in user
   end
 
   context 'when all ident params are valid' do

spec/requests/epp/contact/create/phone_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'EPP contact:create' do
   }
 
   before do
-    login_as user
+    sign_in user
     allow(Contact).to receive(:address_processing?).and_return(false)
   end
 

spec/requests/epp/contact/create_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe 'EPP contact:create' do
   subject(:address_saved) { Contact.last.attributes.slice(*Contact.address_attribute_names).compact.any? }
 
   before do
-    login_as user
+    sign_in user
   end
 
   context 'when address processing is enabled' do

spec/requests/epp/contact/delete/used_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe 'EPP contact:delete' do
   }
 
   before do
-    login_as user
+    sign_in user
   end
 
   context 'when contact is used' do

spec/requests/epp/contact/info_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe 'EPP contact:update' do
                               .count }
 
   before do
-    login_as user
+    sign_in user
     create(:contact, code: 'TEST')
   end
 

spec/requests/epp/contact/update/ident_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe 'EPP contact:update' do
   }
 
   before do
-    login_as user
+    sign_in user
   end
 
   context 'when contact ident is valid' do

spec/requests/epp/contact/update/phone_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe 'EPP contact:update' do
   }
 
   before do
-    login_as user
+    sign_in user
     allow(Contact).to receive(:address_processing?).and_return(false)
   end
 

spec/requests/epp/contact/update_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe 'EPP contact:update' do
   subject(:response_description) { response_xml.css('result msg').text }
 
   before do
-    login_as user
+    sign_in user
     create(:contact, code: 'TEST')
   end
 

spec/requests/epp/domain/create/account_balance_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe 'EPP domain:create', settings: false do
   before :example do
     travel_to Time.zone.parse('05.07.2010')
     Setting.days_to_renew_domain_before_expire = 0
-    login_as user
+    sign_in user
   end
 
   context 'when account balance is sufficient' do

spec/requests/epp/domain/create/default_period_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe 'EPP domain:create', settings: false do
   before :example do
     travel_to Time.zone.parse('05.07.2010 10:30')
     Setting.days_to_renew_domain_before_expire = 0
-    login_as user
+    sign_in user
   end
 
   context 'when period is absent' do

spec/requests/epp/domain/create/optional_nameserver_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'EPP domain:create', settings: false do
 
   before :example do
     travel_to Time.zone.parse('05.07.2010')
-    login_as user
+    sign_in user
   end
 
   context 'when nameserver is optional' do

spec/requests/epp/domain/create/period_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe 'EPP domain:create', settings: false do
   before :example do
     travel_to Time.zone.parse('05.07.2010 10:30')
     Setting.days_to_renew_domain_before_expire = 0
-    login_as user
+    sign_in user
   end
 
   context 'when period is 3 months' do

spec/requests/epp/domain/create/price_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe 'EPP domain:create', settings: false do
   before :example do
     travel_to Time.zone.parse('05.07.2010')
     Setting.days_to_renew_domain_before_expire = 0
-    login_as user
+    sign_in user
   end
 
   context 'when price is present' do

spec/requests/epp/domain/create/required_nameserver_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'EPP domain:create', settings: false do
 
   before :example do
     travel_to Time.zone.parse('05.07.2010')
-    login_as user
+    sign_in user
   end
 
   context 'when nameserver is required' do

spec/requests/epp/domain/renew/account_balance_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe 'EPP domain:renew' do
   before :example do
     Setting.days_to_renew_domain_before_expire = 0
     travel_to Time.zone.parse('05.07.2010')
-    login_as user
+    sign_in user
   end
 
   context 'when account balance is sufficient' do

spec/requests/epp/domain/renew/default_period_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe 'EPP domain:renew', settings: false do
   before :example do
     travel_to Time.zone.parse('05.07.2010')
     Setting.days_to_renew_domain_before_expire = 0
-    login_as user
+    sign_in user
   end
 
   context 'when period is absent' do

spec/requests/epp/domain/renew/expire_time_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe 'EPP domain:renew' do
   before :example do
     Setting.days_to_renew_domain_before_expire = 0
     travel_to Time.zone.parse('05.07.2010')
-    login_as user
+    sign_in user
   end
 
   context 'when given expire time and current match' do

spec/requests/epp/domain/renew/max_expire_time_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe 'EPP domain:renew' do
   before :example do
     travel_to Time.zone.parse('05.07.2010')
     Setting.days_to_renew_domain_before_expire = 0
-    login_as user
+    sign_in user
   end
 
   context 'when domain can be renewed' do

spec/requests/epp/domain/renew/period_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe 'EPP domain:renew', settings: false do
   before :example do
     travel_to Time.zone.parse('05.07.2010')
     Setting.days_to_renew_domain_before_expire = 0
-    login_as user
+    sign_in user
   end
 
   context 'when period is 3 months' do

spec/requests/epp/domain/renew/price_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'EPP domain:renew', settings: false do
   before :example do
     travel_to Time.zone.parse('05.07.2010')
     Setting.days_to_renew_domain_before_expire = 0
-    login_as user
+    sign_in user
   end
 
   context 'when price is present' do

spec/requests/epp/domain/update/nameserver_add_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe 'EPP domain:update' do
   subject(:response_description) { response_xml.css('result msg').text }
 
   before :example do
-    login_as user
+    sign_in user
 
     allow(Domain).to receive(:nameserver_required?).and_return(false)
     Setting.ns_min_count = 2

spec/requests/epp/domain/update/nameserver_remove_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'EPP domain:update' do
   subject(:response_description) { response_xml.css('result msg').text }
 
   before :example do
-    login_as user
+    sign_in user
     allow(Domain).to receive(:nameserver_required?).and_return(false)
   end
 

spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'EPP domain:update' do
   let!(:domain) { create(:domain, name: 'test.com', registrant: registrant) }
 
   before :example do
-    login_as user
+    sign_in user
   end
 
   context 'when registrant change confirmation is enabled' do

spec/requests/epp/domain/update/registrant_change/verified_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe 'EPP domain:update' do
   let!(:new_registrant) { create(:registrant, code: 'new-code') }
 
   before :example do
-    login_as user
+    sign_in user
   end
 
   context 'when registrant change confirmation is enabled' do

spec/requests/epp/domain/update/status_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe 'EPP domain:update' do
   }
 
   before :example do
-    login_as user
+    sign_in user
   end
 
   context 'when domain has both SERVER_DELETE_PROHIBITED and PENDING_UPDATE statuses' do

spec/support/features/session_helpers.rb

@@ -20,7 +20,7 @@ module Features
 
     def sign_in_to_registrant_area
       user = create(:registrant_user)
-      login_as(user, scope: :user)
+      sign_in(user, scope: :user)
     end
   end
 end

test/integration/admin/contact_versions_test.rb

@@ -5,7 +5,7 @@ class ContactVersionsTest < ActionDispatch::IntegrationTest
     super
 
     create_contact_with_history
-    login_as users(:admin)
+    sign_in users(:admin)
   end
 
   def teardown

test/integration/admin/contacts_test.rb

@@ -5,7 +5,7 @@ class AdminContactsTest < ActionDispatch::IntegrationTest
     super
 
     @contact = contacts(:william)
-    login_as users(:admin)
+    sign_in users(:admin)
   end
 
   def test_display_list

test/integration/admin/domain_versions_test.rb

@@ -5,7 +5,7 @@ class DomainVersionsTest < ActionDispatch::IntegrationTest
     super
 
     create_domain_with_history
-    login_as users(:admin)
+    sign_in users(:admin)
   end
 
   def teardown

test/integration/admin/domains/details_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class AdminAreaDomainDetailsTest < ActionDispatch::IntegrationTest
   setup do
-    login_as users(:admin)
+    sign_in users(:admin)
     @domain = domains(:shop)
   end
 

test/integration/admin/domains/force_delete_test.rb

@@ -4,7 +4,7 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest
   include ActionMailer::TestHelper
 
   setup do
-    login_as users(:admin)
+    sign_in users(:admin)
     @domain = domains(:shop)
     ActionMailer::Base.deliveries.clear
   end

test/integration/admin/domains_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class AdminDomainsTestTest < ActionDispatch::IntegrationTest
   def setup
-    login_as users(:admin)
+    sign_in users(:admin)
     @domain = domains(:shop)
   end
 

test/integration/admin/mail_templates/new_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class AdminAreaNewMailTemplateTest < ActionDispatch::IntegrationTest
   setup do
-    login_as users(:admin)
+    sign_in users(:admin)
   end
 
   def test_new_mail_template_does_not_throw_template_error

test/integration/admin/registrars/delete_test.rb

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

test/integration/admin/registrars/details_test.rb

@@ -4,7 +4,7 @@ class AdminAreaRegistrarDetailsTest < ActionDispatch::IntegrationTest
   include ActionView::Helpers::NumberHelper
 
   setup do
-    login_as users(:admin)
+    sign_in users(:admin)
     @registrar = registrars(:complete)
   end
 

test/integration/admin/registrars/edit_test.rb

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

test/integration/admin/registrars/new_test.rb

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

test/integration/registrant/domains_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RegistrantDomainsTest < ActionDispatch::IntegrationTest
   setup do
-    login_as users(:registrant)
+    sign_in users(:registrant)
 
     Setting.days_to_keep_business_registry_cache = 1
     travel_to Time.zone.parse('2010-07-05')

test/integration/registrant/layout_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class RegistrantLayoutTest < ActionDispatch::IntegrationTest
   def setup
     super
-    login_as(users(:registrant))
+    sign_in(users(:registrant))
 
     Setting.days_to_keep_business_registry_cache = 1
     travel_to Time.zone.parse('2010-07-05')

test/integration/registrar/billing/balance_top_up_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class BalanceTopUpTest < ActionDispatch::IntegrationTest
   setup do
-    login_as users(:api_bestnames)
+    sign_in users(:api_bestnames)
   end
 
   def test_creates_new_invoice

test/integration/registrar/bulk_change/bulk_transfer_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RegistrarAreaBulkTransferTest < ActionDispatch::IntegrationTest
   setup do
-    login_as users(:api_goodnames)
+    sign_in users(:api_goodnames)
   end
 
   def test_transfer_multiple_domains_in_bulk

test/integration/registrar/bulk_change/nameserver_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RegistrarAreaNameserverBulkChangeTest < ActionDispatch::IntegrationTest
   setup do
-    login_as users(:api_goodnames)
+    sign_in users(:api_goodnames)
   end
 
   def test_replaces_current_registrar_nameservers

test/integration/registrar/bulk_change/tech_contact_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RegistrarAreaTechContactBulkChangeTest < ActionDispatch::IntegrationTest
   setup do
-    login_as users(:api_bestnames)
+    sign_in users(:api_bestnames)
   end
 
   def test_replace_domain_contacts_of_current_registrar

test/integration/registrar/domains_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RegistrarDomainsTest < ActionDispatch::IntegrationTest
   def test_downloads_domain_list_as_csv
-    login_as users(:api_bestnames)
+    sign_in users(:api_bestnames)
     travel_to Time.zone.parse('2010-07-05 10:30')
 
     expected_csv = <<-CSV.strip_heredoc

test/integration/registrar/invoices/list_test.rb

@@ -6,7 +6,7 @@ class ListInvoicesTest < ActionDispatch::IntegrationTest
 
     @user = users(:api_bestnames)
     @registrar_invoices = @user.registrar.invoices
-    login_as @user
+    sign_in @user
   end
 
   def test_show_balance

test/integration/registrar/invoices/new_invoice_payment_test.rb

@@ -7,7 +7,7 @@ class NewInvoicePaymentTest < ActionDispatch::IntegrationTest
     @original_vat_prc = Setting.registry_vat_prc
     Setting.registry_vat_prc = 0.2
     @user = users(:api_bestnames)
-    login_as @user
+    sign_in @user
   end
 
   def teardown

test/integration/registrar/invoices/new_test.rb

@@ -5,7 +5,7 @@ class NewInvoiceTest < ActionDispatch::IntegrationTest
     super
 
     @user = users(:api_bestnames)
-    login_as @user
+    sign_in @user
   end
 
   def test_show_balance

test/integration/registrar/invoices/payment_callback_test.rb

@@ -5,7 +5,7 @@ class PaymentCallbackTest < ActionDispatch::IntegrationTest
     super
 
     @user = users(:api_bestnames)
-    login_as @user
+    sign_in @user
   end
 
   def create_invoice_with_items

test/integration/registrar/invoices/payment_return_test.rb

@@ -5,7 +5,7 @@ class PaymentReturnTest < ActionDispatch::IntegrationTest
     super
 
     @user = users(:api_bestnames)
-    login_as @user
+    sign_in @user
   end
 
   def create_invoice_with_items

test/test_helper.rb

@@ -28,15 +28,14 @@ class ActiveSupport::TestCase
 end
 
 class ActionDispatch::IntegrationTest
-  include Warden::Test::Helpers
   include Capybara::DSL
   include Capybara::Minitest::Assertions
   include AbstractController::Translation
+  include Devise::Test::IntegrationHelpers
 
   teardown do
-    Warden.test_reset!
     WebMock.reset!
     Capybara.reset_sessions!
     Capybara.use_default_driver
   end
-end
+end