From 38cd2aae43d8081785a79a81e4fef200a616e4ca Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Sun, 17 Jul 2016 21:41:09 +0900
Subject: Fix `payload[:class_name]` to `payload[:spec_name]`

Follow up to #20818.

`retrieve_connection` is passed `spec_name` instead of `klass` since #24844.
---
 activerecord/test/cases/connection_pool_test.rb | 4 ++--
 activerecord/test/cases/fixtures_test.rb        | 4 ++--
 activerecord/test/cases/query_cache_test.rb     | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 2bdabaee62..bbcb42d58e 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -347,8 +347,8 @@ module ActiveRecord
           payloads << payload
         end
         ActiveRecord::Base.establish_connection :arunit
-        assert_equal [:class_name, :config, :connection_id], payloads[0].keys.sort
-        assert_equal 'primary', payloads[0][:class_name]
+        assert_equal [:config, :connection_id, :spec_name], payloads[0].keys.sort
+        assert_equal 'primary', payloads[0][:spec_name]
       ensure
         ActiveSupport::Notifications.unsubscribe(subscription) if subscription
       end
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index a06aa4b247..df53bbf950 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -650,10 +650,10 @@ class TransactionalFixturesOnConnectionNotification < ActiveRecord::TestCase
   private
 
     def fire_connection_notification(connection)
-      ActiveRecord::Base.connection_handler.stubs(:retrieve_connection).with(Book).returns(connection)
+      ActiveRecord::Base.connection_handler.stubs(:retrieve_connection).with('book').returns(connection)
       message_bus = ActiveSupport::Notifications.instrumenter
       payload = {
-        class_name: 'Book',
+        spec_name: 'book',
         config: nil,
         connection_id: connection.object_id
       }
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 03ec063671..085636553e 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -6,6 +6,8 @@ require 'models/post'
 require 'rack'
 
 class QueryCacheTest < ActiveRecord::TestCase
+  self.use_transactional_tests = false
+
   fixtures :tasks, :topics, :categories, :posts, :categories_posts
 
   teardown do
-- 
cgit v1.2.3