From edbfd10876f938bd04b9034b1e4c4329cd4f2d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 30 Mar 2016 00:03:11 -0300
Subject: Keep logging in the ActionCable::Channel::Base

To move Action Cable logging to a LoggingSubscriber we need to pass the
log tags in the notification payload since Action Cable logging use the
Channel instance to tag the logs.
---
 actioncable/test/channel/log_subscriber_test.rb | 69 -------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 actioncable/test/channel/log_subscriber_test.rb

(limited to 'actioncable/test')

diff --git a/actioncable/test/channel/log_subscriber_test.rb b/actioncable/test/channel/log_subscriber_test.rb
deleted file mode 100644
index 18acdc9fbd..0000000000
--- a/actioncable/test/channel/log_subscriber_test.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'test_helper'
-require 'stubs/test_connection'
-require 'active_support/log_subscriber/test_helper'
-require 'action_cable/channel/log_subscriber'
-
-class ActionCable::Channel::LogSubscriberTest < ActiveSupport::TestCase
-  include ActiveSupport::LogSubscriber::TestHelper
-
-  class ChatChannel < ActionCable::Channel::Base
-    attr_reader :last_action
-
-    def speak(data)
-      @last_action = [ :speak, data ]
-    end
-
-    def get_latest
-      transmit data: 'latest'
-    end
-  end
-
-  def setup
-    super
-    @connection = TestConnection.new
-    @channel = ChatChannel.new @connection, "{id: 1}", { id: 1 }
-    ActionCable::Channel::LogSubscriber.attach_to :action_cable
-  end
-
-  def test_perform_action
-    data = {'action' => :speak, 'content' => 'hello'}
-    @channel.perform_action(data)
-    wait
-
-    assert_equal(1, logs.size)
-    assert_match(/Completed #{channel_class}#speak in \d+ms/, logs.first)
-  end
-
-  def test_transmit
-    @channel.perform_action('action' => :get_latest)
-    wait
-
-    assert_equal(2, logs.size)
-    assert_match(/^#{channel_class} transmitting/, logs.first)
-  end
-
-  def test_transmit_subscription_confirmation
-    @channel.stubs(:subscription_confirmation_sent?).returns(false)
-    @channel.send(:transmit_subscription_confirmation)
-    wait
-
-    assert_equal(1, logs.size)
-    assert_equal("#{channel_class} is transmitting the subscription confirmation", logs.first)
-  end
-
-  def test_transmit_subscription_rejection
-    @channel.send(:transmit_subscription_rejection)
-    wait
-
-    assert_equal(1, logs.size)
-    assert_equal("#{channel_class} is transmitting the subscription rejection", logs.first)
-  end
-
-  def channel_class
-    "ActionCable::Channel::LogSubscriberTest::ChatChannel"
-  end
-
-  def logs
-    @logs ||= @logger.logged(:info)
-  end
-end
-- 
cgit v1.2.3