Update tests to support guarded InstrumentationSubscriberError

Author: theojulienne

activerecord/test/cases/adapter_test.rb

@@ -213,9 +213,10 @@ def test_numeric_value_out_of_ranges_are_translated_to_specific_exception
     def test_exceptions_from_notifications_are_not_translated
       original_error = StandardError.new("This StandardError shouldn't get translated")
       subscriber = ActiveSupport::Notifications.subscribe("sql.active_record") { raise original_error }
-      actual_error = assert_raises(StandardError) do
+      wrapped_error = assert_raises(ActiveSupport::Notifications::InstrumentationSubscriberError) do
         @connection.execute("SELECT * FROM posts")
       end
+      actual_error = wrapped_error.exceptions.first
 
       assert_equal original_error, actual_error
 

activerecord/test/cases/query_cache_test.rb

@@ -489,11 +489,13 @@ def test_query_cache_does_not_allow_sql_key_mutation
       payload[:sql].downcase!
     end
 
-    assert_raises FrozenError do
+    error = assert_raises ActiveSupport::Notifications::InstrumentationSubscriberError do
       ActiveRecord::Base.cache do
         assert_queries(1) { Task.find(1); Task.find(1) }
       end
     end
+
+    assert error.exceptions.first.is_a?(FrozenError)
   ensure
     ActiveSupport::Notifications.unsubscribe subscriber
   end