Migrate applicable activestorage tests to use NotificationAssertions

Author: larouxn

activestorage/test/analyzer/audio_analyzer_test.rb

@@ -18,12 +18,13 @@ class ActiveStorage::Analyzer::AudioAnalyzerTest < ActiveSupport::TestCase
   end
 
   test "instrumenting analysis" do
-    events = subscribe_events_from("analyze.active_storage")
+    events = capture_notifications("analyze.active_storage") do
+      assert_notifications_count("analyze.active_storage", 1) do
+        blob = create_file_blob(filename: "audio.mp3", content_type: "audio/mp3")
+        blob.analyze
+      end
+    end
 
-    blob = create_file_blob(filename: "audio.mp3", content_type: "audio/mp3")
-    blob.analyze
-
-    assert_equal 1, events.size
     assert_equal({ analyzer: "ffprobe" }, events.first.payload)
   end
 end

activestorage/test/analyzer/image_analyzer/image_magick_test.rb

@@ -48,10 +48,10 @@ class ActiveStorage::Analyzer::ImageAnalyzer::ImageMagickTest < ActiveSupport::T
 
   test "instrumenting analysis" do
     analyze_with_image_magick do
-      events = subscribe_events_from("analyze.active_storage")
-
-      blob = create_file_blob(filename: "racecar.jpg", content_type: "image/jpeg")
-      blob.analyze
+      events = capture_notifications("analyze.active_storage") do
+        blob = create_file_blob(filename: "racecar.jpg", content_type: "image/jpeg")
+        blob.analyze
+      end
 
       assert_equal 1, events.size
       assert_equal({ analyzer: "mini_magick" }, events.first.payload)

activestorage/test/analyzer/image_analyzer/vips_test.rb

@@ -48,10 +48,10 @@ class ActiveStorage::Analyzer::ImageAnalyzer::VipsTest < ActiveSupport::TestCase
 
   test "instrumenting analysis" do
     analyze_with_vips do
-      events = subscribe_events_from("analyze.active_storage")
-
-      blob = create_file_blob(filename: "racecar.jpg", content_type: "image/jpeg")
-      blob.analyze
+      events = capture_notifications("analyze.active_storage") do
+        blob = create_file_blob(filename: "racecar.jpg", content_type: "image/jpeg")
+        blob.analyze
+      end
 
       assert_equal 1, events.size
       assert_equal({ analyzer: "vips" }, events.first.payload)

activestorage/test/analyzer/video_analyzer_test.rb

@@ -87,10 +87,10 @@ class ActiveStorage::Analyzer::VideoAnalyzerTest < ActiveSupport::TestCase
   end
 
   test "instrumenting analysis" do
-    events = subscribe_events_from("analyze.active_storage")
-
-    blob = create_file_blob(filename: "video_without_audio_stream.mp4", content_type: "video/mp4")
-    blob.analyze
+    events = capture_notifications("analyze.active_storage") do
+      blob = create_file_blob(filename: "video_without_audio_stream.mp4", content_type: "video/mp4")
+      blob.analyze
+    end
 
     assert_equal 1, events.size
     assert_equal({ analyzer: "ffprobe" }, events.first.payload)

activestorage/test/test_helper.rb

@@ -114,12 +114,6 @@ def with_raise_on_open_redirects(service)
       ActionController::Base.raise_on_open_redirects = old_raise_on_open_redirects
       ActiveStorage::Blob.service = old_service
     end
-
-    def subscribe_events_from(name)
-      events = []
-      ActiveSupport::Notifications.subscribe(name) { |event| events << event }
-      events
-    end
 end
 
 require "global_id"