Improve instrumentation tests

Don't build AS::Notifications::Event manually, similar to 95b6fbd
Also assert that options get passed.

Author: p8

actionpack/test/controller/caching_test.rb

@@ -257,8 +257,8 @@ def test_render_inline_before_fragment_caching
   def test_fragment_cache_instrumentation
     payload = nil
 
-    subscriber = proc do |_, _, _, _, event_payload|
-      payload = event_payload
+    subscriber = proc do |event|
+      payload = event.payload
     end
 
     ActiveSupport::Notifications.subscribed(subscriber, "read_fragment.action_controller") do

actionpack/test/controller/redirect_test.rb

@@ -604,8 +604,7 @@ def test_url_from_fallback
   def test_redirect_to_instrumentation
     payload = nil
 
-    subscriber = proc do |*args|
-      event = ActiveSupport::Notifications::Event.new(*args)
+    subscriber = proc do |event|
       payload = event.payload
     end
 

actionpack/test/controller/send_file_test.rb

@@ -208,10 +208,10 @@ def test_send_file_from_before_action
   end
 
   def test_send_file_instrumentation
+    @controller.options = { disposition: :inline }
     payload = nil
 
-    subscriber = proc do |*args|
-      event = ActiveSupport::Notifications::Event.new(*args)
+    subscriber = proc do |event|
       payload = event.payload
     end
 
@@ -220,21 +220,22 @@ def test_send_file_instrumentation
     end
 
     assert_equal __FILE__, payload[:path]
+    assert_equal :inline, payload[:disposition]
   end
 
   def test_send_data_instrumentation
+    @controller.options = { content_type: "application/x-ruby" }
     payload = nil
 
-    subscriber = proc do |*args|
-      event = ActiveSupport::Notifications::Event.new(*args)
+    subscriber = proc do |event|
       payload = event.payload
     end
 
     ActiveSupport::Notifications.subscribed(subscriber, "send_data.action_controller") do
       process("data")
     end
 
-    assert_equal({}, payload)
+    assert_equal("application/x-ruby", payload[:content_type])
   end
 
   %w(file data).each do |method|