aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/connection_adapters
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-12-26 02:00:59 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-12-26 02:00:59 +0900
commit237397e41a6a71fbc8424201a21cad00e132ff21 (patch)
tree6f3b667db18523d97719115a6aa3618103501e7a /activerecord/test/cases/connection_adapters
parent08a3c1cf5a74873f44a9ff1d0605456984305fdf (diff)
downloadrails-237397e41a6a71fbc8424201a21cad00e132ff21.tar.gz
rails-237397e41a6a71fbc8424201a21cad00e132ff21.tar.bz2
rails-237397e41a6a71fbc8424201a21cad00e132ff21.zip
Don't pass `object_id` to `refute_nil` since `object_id` never to be nil
And prefer `assert_same` over `assert_equal`.
Diffstat (limited to 'activerecord/test/cases/connection_adapters')
-rw-r--r--activerecord/test/cases/connection_adapters/connection_handler_test.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
index cae74a2b9b..603ed63a8c 100644
--- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb
+++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
@@ -232,15 +232,15 @@ module ActiveRecord
def test_a_class_using_custom_pool_and_switching_back_to_primary
klass2 = Class.new(Base) { def self.name; "klass2"; end }
- assert_equal klass2.connection.object_id, ActiveRecord::Base.connection.object_id
+ assert_same klass2.connection, ActiveRecord::Base.connection
pool = klass2.establish_connection(ActiveRecord::Base.connection_pool.spec.config)
- assert_equal klass2.connection.object_id, pool.connection.object_id
- refute_equal klass2.connection.object_id, ActiveRecord::Base.connection.object_id
+ assert_same klass2.connection, pool.connection
+ refute_same klass2.connection, ActiveRecord::Base.connection
klass2.remove_connection
- assert_equal klass2.connection.object_id, ActiveRecord::Base.connection.object_id
+ assert_same klass2.connection, ActiveRecord::Base.connection
end
def test_connection_specification_name_should_fallback_to_parent
@@ -255,8 +255,8 @@ module ActiveRecord
def test_remove_connection_should_not_remove_parent
klass2 = Class.new(Base) { def self.name; "klass2"; end }
klass2.remove_connection
- refute_nil ActiveRecord::Base.connection.object_id
- assert_equal klass2.connection.object_id, ActiveRecord::Base.connection.object_id
+ refute_nil ActiveRecord::Base.connection
+ assert_same klass2.connection, ActiveRecord::Base.connection
end
end
end