Upgrade to Rails 5.0

Closes #377
This commit is contained in:
Artur Beljajev 2019-09-15 15:38:52 +03:00
parent bb108efedd
commit fa52001be6
141 changed files with 1388 additions and 1664 deletions

View file

@ -28,7 +28,7 @@ class ContactDisclosableTest < ActiveSupport::TestCase
@contact.disclosed_attributes = %w[some undisclosable]
assert @contact.invalid?
assert_includes @contact.errors.get(:disclosed_attributes), 'contain unsupported attribute(s)'
assert_includes @contact.errors[:disclosed_attributes], 'contain unsupported attribute(s)'
end
def test_valid_when_attribute_is_disclosable

View file

@ -169,15 +169,15 @@ class ContactTest < ActiveSupport::TestCase
end
def test_linked_when_in_use_as_registrant
Domain.update_all(registrant_id: @contact)
Domain.update_all(registrant_id: @contact.id)
DomainContact.delete_all
assert @contact.linked?
end
def test_linked_when_in_use_as_domain_contact
Domain.update_all(registrant_id: contacts(:william))
DomainContact.update_all(contact_id: @contact)
Domain.update_all(registrant_id: contacts(:william).id)
DomainContact.update_all(contact_id: @contact.id)
assert @contact.linked?
end
@ -253,11 +253,11 @@ class ContactTest < ActiveSupport::TestCase
def make_contact_free_of_domains_where_it_acts_as_a_registrant(contact)
other_contact = contacts(:william)
assert_not_equal other_contact, contact
Domain.update_all(registrant_id: other_contact)
Domain.update_all(registrant_id: other_contact.id)
end
def unlinked_contact
Domain.update_all(registrant_id: contacts(:william))
Domain.update_all(registrant_id: contacts(:william).id)
DomainContact.delete_all
contacts(:john)
end

View file

@ -2,7 +2,7 @@ require 'test_helper'
class DomainReleasableAuctionableTest < ActiveSupport::TestCase
# Needed for `test_updates_whois` test because of `after_commit :update_whois_record` in Domain
self.use_transactional_fixtures = false
self.use_transactional_tests = false
setup do
@domain = domains(:shop)

View file

@ -247,7 +247,7 @@ class DomainTest < ActiveSupport::TestCase
domain3 = domains(:library)
domain3.update!(outzone_at: Time.zone.parse('2010-07-05 08:00:01'))
Domain.connection.disable_referential_integrity do
Domain.delete_all("id NOT IN (#{[domain1.id, domain2.id, domain3.id].join(',')})")
Domain.where("id NOT IN (#{[domain1.id, domain2.id, domain3.id].join(',')})").delete_all
end
assert_equal [domain1.id], Domain.outzone_candidates.ids
@ -262,7 +262,7 @@ class DomainTest < ActiveSupport::TestCase
domain3 = domains(:library)
domain3.update!(valid_to: Time.zone.parse('2010-07-05 08:00:01'))
Domain.connection.disable_referential_integrity do
Domain.delete_all("id NOT IN (#{[domain1.id, domain2.id, domain3.id].join(',')})")
Domain.where("id NOT IN (#{[domain1.id, domain2.id, domain3.id].join(',')})").delete_all
end
assert_equal [domain1.id, domain2.id].sort, Domain.expired.ids.sort