Migrate applicable actioncable tests to use NotificationAssertions

Author: larouxn

actioncable/test/channel/base_test.rb

@@ -199,67 +199,49 @@ def error_handler
   end
 
   test "notification for perform_action" do
-    events = []
-    ActiveSupport::Notifications.subscribe("perform_action.action_cable") { |event| events << event }
-
     data = { "action" => :speak, "content" => "hello" }
-    @channel.perform_action data
+    expected_payload = { channel_class: "ActionCable::Channel::BaseTest::ChatChannel", action: :speak, data: }
 
-    assert_equal 1, events.length
-    assert_equal "perform_action.action_cable", events[0].name
-    assert_equal "ActionCable::Channel::BaseTest::ChatChannel", events[0].payload[:channel_class]
-    assert_equal :speak, events[0].payload[:action]
-    assert_equal data, events[0].payload[:data]
-  ensure
-    ActiveSupport::Notifications.unsubscribe "perform_action.action_cable"
+    assert_notifications_count("perform_action.action_cable", 1) do
+      assert_notification("perform_action.action_cable", expected_payload) do
+        @channel.perform_action data
+      end
+    end
   end
 
   test "notification for transmit" do
-    events = []
-    ActiveSupport::Notifications.subscribe("transmit.action_cable") { |event| events << event }
+    data = { data: "latest" }
+    expected_payload = { channel_class: "ActionCable::Channel::BaseTest::ChatChannel", data:, via: nil }
 
-    @channel.perform_action "action" => :get_latest
-    expected_data = { data: "latest" }
-
-    assert_equal 1, events.length
-    assert_equal "transmit.action_cable", events[0].name
-    assert_equal "ActionCable::Channel::BaseTest::ChatChannel", events[0].payload[:channel_class]
-    assert_equal expected_data, events[0].payload[:data]
-    assert_nil events[0].payload[:via]
-  ensure
-    ActiveSupport::Notifications.unsubscribe "transmit.action_cable"
+    assert_notifications_count("transmit.action_cable", 1) do
+      assert_notification("transmit.action_cable", expected_payload) do
+        @channel.perform_action "action" => :get_latest
+      end
+    end
   end
 
   test "notification for transmit_subscription_confirmation" do
-    @channel.subscribe_to_channel
-
-    events = []
-    ActiveSupport::Notifications.subscribe("transmit_subscription_confirmation.action_cable") { |e| events << e }
+    expected_payload = { channel_class: "ActionCable::Channel::BaseTest::ChatChannel", identifier: "{id: 1}" }
 
-    @channel.stub(:subscription_confirmation_sent?, false) do
-      @channel.send(:transmit_subscription_confirmation)
+    @channel.subscribe_to_channel
 
-      assert_equal 1, events.length
-      assert_equal "transmit_subscription_confirmation.action_cable", events[0].name
-      assert_equal "ActionCable::Channel::BaseTest::ChatChannel", events[0].payload[:channel_class]
-      assert_equal "{id: 1}", events[0].payload[:identifier]
+    assert_notifications_count("transmit_subscription_confirmation.action_cable", 1) do
+      assert_notification("transmit_subscription_confirmation.action_cable", expected_payload) do
+        @channel.stub(:subscription_confirmation_sent?, false) do
+          @channel.send(:transmit_subscription_confirmation)
+        end
+      end
     end
-  ensure
-    ActiveSupport::Notifications.unsubscribe "transmit_subscription_confirmation.action_cable"
   end
 
   test "notification for transmit_subscription_rejection" do
-    events = []
-    ActiveSupport::Notifications.subscribe("transmit_subscription_rejection.action_cable") { |event| events << event }
+    expected_payload = { channel_class: "ActionCable::Channel::BaseTest::ChatChannel", identifier: "{id: 1}" }
 
-    @channel.send(:transmit_subscription_rejection)
-
-    assert_equal 1, events.length
-    assert_equal "transmit_subscription_rejection.action_cable", events[0].name
-    assert_equal "ActionCable::Channel::BaseTest::ChatChannel", events[0].payload[:channel_class]
-    assert_equal "{id: 1}", events[0].payload[:identifier]
-  ensure
-    ActiveSupport::Notifications.unsubscribe "transmit_subscription_rejection.action_cable"
+    assert_notifications_count("transmit_subscription_rejection.action_cable", 1) do
+      assert_notification("transmit_subscription_rejection.action_cable", expected_payload) do
+        @channel.send(:transmit_subscription_rejection)
+      end
+    end
   end
 
   test "behaves like rescuable" do

actioncable/test/server/broadcasting_test.rb

@@ -4,51 +4,37 @@
 require "stubs/test_server"
 
 class BroadcastingTest < ActionCable::TestCase
-  test "fetching a broadcaster converts the broadcasting queue to a string" do
-    broadcasting = :test_queue
-    server = TestServer.new
-    broadcaster = server.broadcaster_for(broadcasting)
+  setup do
+    @server = TestServer.new
+    @broadcasting = "test_queue"
+    @broadcaster = server.broadcaster_for(@broadcasting)
+  end
+
+  attr_reader :server, :broadcasting, :broadcaster
 
+  test "fetching a broadcaster converts the broadcasting queue to a string" do
     assert_equal "test_queue", broadcaster.broadcasting
   end
 
   test "broadcast generates notification" do
-    server = TestServer.new
-
-    events = []
-    ActiveSupport::Notifications.subscribe("broadcast.action_cable") { |event| events << event }
-
-    broadcasting = "test_queue"
     message = { body: "test message" }
-    server.broadcast(broadcasting, message)
-
-    assert_equal 1, events.length
-    assert_equal "broadcast.action_cable", events[0].name
-    assert_equal broadcasting, events[0].payload[:broadcasting]
-    assert_equal message, events[0].payload[:message]
-    assert_equal ActiveSupport::JSON, events[0].payload[:coder]
-  ensure
-    ActiveSupport::Notifications.unsubscribe "broadcast.action_cable"
+    expected_payload = { broadcasting:, message:, coder: ActiveSupport::JSON }
+
+    assert_notifications_count("broadcast.action_cable", 1) do
+      assert_notification("broadcast.action_cable", expected_payload) do
+        server.broadcast(broadcasting, message)
+      end
+    end
   end
 
   test "broadcaster from broadcaster_for generates notification" do
-    server = TestServer.new
-
-    events = []
-    ActiveSupport::Notifications.subscribe("broadcast.action_cable") { |event| events << event }
-
-    broadcasting = "test_queue"
     message = { body: "test message" }
+    expected_payload = { broadcasting:, message:, coder: ActiveSupport::JSON }
 
-    broadcaster = server.broadcaster_for(broadcasting)
-    broadcaster.broadcast(message)
-
-    assert_equal 1, events.length
-    assert_equal "broadcast.action_cable", events[0].name
-    assert_equal broadcasting, events[0].payload[:broadcasting]
-    assert_equal message, events[0].payload[:message]
-    assert_equal ActiveSupport::JSON, events[0].payload[:coder]
-  ensure
-    ActiveSupport::Notifications.unsubscribe "broadcast.action_cable"
+    assert_notifications_count("broadcast.action_cable", 1) do
+      assert_notification("broadcast.action_cable", expected_payload) do
+        broadcaster.broadcast(message)
+      end
+    end
   end
 end