kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Move test to more correct file

Browse source 
This test is about connection swapping but not nested connections so it
fits better in the connection handler test. Additionally I renamed the
tests to make more sense and removed unnecessary parts like using
ApplicationRecord, the bug is reproducible on ActiveRecord::Base alone.
This commit is contained in:
eileencodes 2021-06-23 10:25:29 -04:00
parent d4d560bc4b
commit b56e5c1fa1
No known key found for this signature in database
GPG key ID: BA5C575120BBE8DF
2 changed files with 26 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
activerecord/test/cases/connection_adapters/connection_handler_test.rb
View file

@ -62,6 +62,32 @@ module ActiveRecord
end
unless in_memory_db?
def test_not_setting_writing_role_while_using_another_named_role_raises
connection_handler = ActiveRecord::Base.connection_handler
ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
ActiveRecord::Base.connects_to(shards: { default: { all: :arunit }, one: { all: :arunit } })
assert_raises(ArgumentError) { setup_shared_connection_pool }
ensure
ActiveRecord::Base.connection_handler = connection_handler
ActiveRecord::Base.establish_connection :arunit
end
def test_setting_writing_role_while_using_another_named_role_does_not_raise
connection_handler = ActiveRecord::Base.connection_handler
ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
old_role, ActiveRecord.writing_role = ActiveRecord.writing_role, :all
ActiveRecord::Base.connects_to(shards: { default: { all: :arunit }, one: { all: :arunit } })
assert_nothing_raised { setup_shared_connection_pool }
ensure
ActiveRecord.writing_role = old_role
ActiveRecord::Base.connection_handler = connection_handler
ActiveRecord::Base.establish_connection :arunit
end
def test_establish_connection_with_primary_works_without_deprecation
old_config = ActiveRecord::Base.configurations
config = { "primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" } }

32
activerecord/test/cases/connection_adapters/connection_swapping_nested_test.rb
View file

@ -434,38 +434,6 @@ module ActiveRecord
self.abstract_class = true
end
def test_using_a_role_other_than_writing_raises
connection_handler = ActiveRecord::Base.connection_handler
ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
Object.const_set(:ApplicationRecord, ApplicationRecord)
ApplicationRecord.connects_to(shards: { default: { all: :arunit }, one: { all: :arunit } })
assert_raises(ArgumentError) { setup_shared_connection_pool }
ensure
ActiveRecord.application_record_class = nil
Object.send(:remove_const, :ApplicationRecord)
ActiveRecord::Base.connection_handler = connection_handler
ActiveRecord::Base.establish_connection :arunit
end
def test_setting_writing_role_is_used_over_writing
connection_handler = ActiveRecord::Base.connection_handler
ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
old_role, ActiveRecord.writing_role = ActiveRecord.writing_role, :all
Object.const_set(:ApplicationRecord, ApplicationRecord)
ApplicationRecord.connects_to(shards: { default: { all: :arunit }, one: { all: :arunit } })
assert_nothing_raised { setup_shared_connection_pool }
ensure
ActiveRecord.writing_role = old_role
ActiveRecord.application_record_class = nil
Object.send(:remove_const, :ApplicationRecord)
ActiveRecord::Base.connection_handler = connection_handler
ActiveRecord::Base.establish_connection :arunit
end
def test_application_record_prevent_writes_can_be_changed
Object.const_set(:ApplicationRecord, ApplicationRecord)