From f8eda810f99c49b34b5aed3332b795761baa8607 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 4 Apr 2018 01:42:59 +0300 Subject: [PATCH] Use setup/teardown blocks instead of methods --- test/integration/admin/domains/force_delete_test.rb | 2 +- test/integration/admin/domains_test.rb | 2 +- test/integration/admin/registrars/delete_test.rb | 2 +- test/integration/admin/registrars/edit_test.rb | 2 +- test/integration/admin/registrars/new_test.rb | 2 +- test/integration/admin/registrars/show_registrar_test.rb | 2 +- test/integration/api/domain_transfers_test.rb | 2 +- test/integration/epp/domain/create/transfer_code_test.rb | 2 +- test/integration/epp/domain/domain_renew_test.rb | 2 +- test/integration/epp/domain/transfer/request_test.rb | 2 +- test/integration/epp/login/session_limit_test.rb | 2 +- test/integration/registrant/domains_test.rb | 2 +- test/integration/registrar/domain_transfers_test.rb | 2 +- test/integration/registrar/nameserver_replacement_test.rb | 2 +- test/models/contact/contact_test.rb | 2 +- test/models/contact/identical_test.rb | 2 +- test/models/contact/postal_address_test.rb | 2 +- test/models/contact/transfer_test.rb | 2 +- test/models/domain/domain_test.rb | 2 +- test/models/domain/transferable_test.rb | 2 +- test/models/domain_transfer_test.rb | 2 +- test/models/epp_session_test.rb | 2 +- test/models/message_test.rb | 2 +- test/models/nameserver/glue_record_test.rb | 2 +- test/models/nameserver_test.rb | 2 +- test/models/registrar/code_test.rb | 2 +- test/models/registrar/delete_test.rb | 2 +- test/models/registrar_test.rb | 2 +- test/test_helper.rb | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/integration/admin/domains/force_delete_test.rb index 731de151b..0ef017c11 100644 --- a/test/integration/admin/domains/force_delete_test.rb +++ b/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 diff --git a/test/integration/admin/domains_test.rb b/test/integration/admin/domains_test.rb index 1dfb0dfd1..81261f017 100644 --- a/test/integration/admin/domains_test.rb +++ b/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 diff --git a/test/integration/admin/registrars/delete_test.rb b/test/integration/admin/registrars/delete_test.rb index 34eb142bf..737c830c1 100644 --- a/test/integration/admin/registrars/delete_test.rb +++ b/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 diff --git a/test/integration/admin/registrars/edit_test.rb b/test/integration/admin/registrars/edit_test.rb index af420b179..22b93657d 100644 --- a/test/integration/admin/registrars/edit_test.rb +++ b/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 diff --git a/test/integration/admin/registrars/new_test.rb b/test/integration/admin/registrars/new_test.rb index 61a7a43be..47b7aded6 100644 --- a/test/integration/admin/registrars/new_test.rb +++ b/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 diff --git a/test/integration/admin/registrars/show_registrar_test.rb b/test/integration/admin/registrars/show_registrar_test.rb index cb310317c..bb1320d2a 100644 --- a/test/integration/admin/registrars/show_registrar_test.rb +++ b/test/integration/admin/registrars/show_registrar_test.rb @@ -3,7 +3,7 @@ require 'test_helper' class ShowRegistrarTest < ActionDispatch::IntegrationTest include ActionView::Helpers::NumberHelper - def setup + setup do login_as users(:admin) @registrar = registrars(:bestnames) visit admin_registrar_path(@registrar) diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 08ce2e34c..04301e3e3 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/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 diff --git a/test/integration/epp/domain/create/transfer_code_test.rb b/test/integration/epp/domain/create/transfer_code_test.rb index 276386851..60133cb35 100644 --- a/test/integration/epp/domain/create/transfer_code_test.rb +++ b/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 diff --git a/test/integration/epp/domain/domain_renew_test.rb b/test/integration/epp/domain/domain_renew_test.rb index a60ec6843..338ecf766 100644 --- a/test/integration/epp/domain/domain_renew_test.rb +++ b/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 diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index 508ec4334..f3ea644fc 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/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 diff --git a/test/integration/epp/login/session_limit_test.rb b/test/integration/epp/login/session_limit_test.rb index 513699415..b2fdfe88f 100644 --- a/test/integration/epp/login/session_limit_test.rb +++ b/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 diff --git a/test/integration/registrant/domains_test.rb b/test/integration/registrant/domains_test.rb index 9b1151b84..db1acfeea 100644 --- a/test/integration/registrant/domains_test.rb +++ b/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 diff --git a/test/integration/registrar/domain_transfers_test.rb b/test/integration/registrar/domain_transfers_test.rb index e29a11070..4cd6fc66c 100644 --- a/test/integration/registrar/domain_transfers_test.rb +++ b/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 diff --git a/test/integration/registrar/nameserver_replacement_test.rb b/test/integration/registrar/nameserver_replacement_test.rb index 9523d2bbd..8ed0f9419 100644 --- a/test/integration/registrar/nameserver_replacement_test.rb +++ b/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 diff --git a/test/models/contact/contact_test.rb b/test/models/contact/contact_test.rb index 286ded534..b2a7a02a8 100644 --- a/test/models/contact/contact_test.rb +++ b/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 diff --git a/test/models/contact/identical_test.rb b/test/models/contact/identical_test.rb index 61d0946bc..43df8b7d2 100644 --- a/test/models/contact/identical_test.rb +++ b/test/models/contact/identical_test.rb @@ -12,7 +12,7 @@ class ContactIdenticalTest < ActiveSupport::TestCase org_name ] - def setup + setup do @contact = contacts(:william) @identical = contacts(:identical_to_william) end diff --git a/test/models/contact/postal_address_test.rb b/test/models/contact/postal_address_test.rb index 645207a9f..24a5c8002 100644 --- a/test/models/contact/postal_address_test.rb +++ b/test/models/contact/postal_address_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class ContactPostalAddressTest < ActiveSupport::TestCase - def setup + setup do @contact = contacts(:john) end diff --git a/test/models/contact/transfer_test.rb b/test/models/contact/transfer_test.rb index a695c112a..cc35cfdea 100644 --- a/test/models/contact/transfer_test.rb +++ b/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 diff --git a/test/models/domain/domain_test.rb b/test/models/domain/domain_test.rb index c67c8ee87..9be97a8ec 100644 --- a/test/models/domain/domain_test.rb +++ b/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 diff --git a/test/models/domain/transferable_test.rb b/test/models/domain/transferable_test.rb index 35bf5f96b..56b2b21fb 100644 --- a/test/models/domain/transferable_test.rb +++ b/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 diff --git a/test/models/domain_transfer_test.rb b/test/models/domain_transfer_test.rb index 7f11caf80..9dde09fa7 100644 --- a/test/models/domain_transfer_test.rb +++ b/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 diff --git a/test/models/epp_session_test.rb b/test/models/epp_session_test.rb index fd795b23c..6f90e2445 100644 --- a/test/models/epp_session_test.rb +++ b/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 diff --git a/test/models/message_test.rb b/test/models/message_test.rb index 1c7c7bad1..5c557150d 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class MessageTest < ActiveSupport::TestCase - def setup + setup do @message = messages(:greeting) end diff --git a/test/models/nameserver/glue_record_test.rb b/test/models/nameserver/glue_record_test.rb index 7d5e39d8d..599f04ec6 100644 --- a/test/models/nameserver/glue_record_test.rb +++ b/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 diff --git a/test/models/nameserver_test.rb b/test/models/nameserver_test.rb index 5a552a7ee..8f2a07334 100644 --- a/test/models/nameserver_test.rb +++ b/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 diff --git a/test/models/registrar/code_test.rb b/test/models/registrar/code_test.rb index 7b5188878..579e4d660 100644 --- a/test/models/registrar/code_test.rb +++ b/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 diff --git a/test/models/registrar/delete_test.rb b/test/models/registrar/delete_test.rb index 2020c76dc..e9cb20acf 100644 --- a/test/models/registrar/delete_test.rb +++ b/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 diff --git a/test/models/registrar_test.rb b/test/models/registrar_test.rb index fda377d9b..7316633a1 100644 --- a/test/models/registrar_test.rb +++ b/test/models/registrar_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class RegistrarTest < ActiveSupport::TestCase - def setup + setup do @registrar = registrars(:bestnames) end diff --git a/test/test_helper.rb b/test/test_helper.rb index d85d5de73..2f39e06d8 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -28,7 +28,7 @@ class ActionDispatch::IntegrationTest include Capybara::Minitest::Assertions include AbstractController::Translation - def teardown + teardown do Warden.test_reset! Capybara.reset_sessions! Capybara.use_default_driver