From 892e38c78e03c11afaa5f01d995e3a21bd92b415 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Fri, 21 Dec 2018 02:44:01 +0900
Subject: Enable `Style/RedundantBegin` cop to avoid newly adding redundant
 begin block

Currently we sometimes find a redundant begin block in code review
(e.g. https://github.com/rails/rails/pull/33604#discussion_r209784205).

I'd like to enable `Style/RedundantBegin` cop to avoid that, since
rescue/else/ensure are allowed inside do/end blocks in Ruby 2.5
(https://bugs.ruby-lang.org/issues/12906), so we'd probably meets with
that situation than before.
---
 actioncable/test/channel/base_test.rb        | 106 +++++++++++++--------------
 actioncable/test/server/broadcasting_test.rb |  76 +++++++++----------
 2 files changed, 85 insertions(+), 97 deletions(-)

(limited to 'actioncable/test')

diff --git a/actioncable/test/channel/base_test.rb b/actioncable/test/channel/base_test.rb
index c2968226c7..39b5879607 100644
--- a/actioncable/test/channel/base_test.rb
+++ b/actioncable/test/channel/base_test.rb
@@ -190,81 +190,73 @@ class ActionCable::Channel::BaseTest < ActionCable::TestCase
   end
 
   test "notification for perform_action" do
-    begin
-      events = []
-      ActiveSupport::Notifications.subscribe "perform_action.action_cable" do |*args|
-        events << ActiveSupport::Notifications::Event.new(*args)
-      end
+    events = []
+    ActiveSupport::Notifications.subscribe "perform_action.action_cable" do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
+    end
 
-      data = { "action" => :speak, "content" => "hello" }
-      @channel.perform_action data
+    data = { "action" => :speak, "content" => "hello" }
+    @channel.perform_action 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"
-    end
+    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"
   end
 
   test "notification for transmit" do
-    begin
-      events = []
-      ActiveSupport::Notifications.subscribe "transmit.action_cable" do |*args|
-        events << ActiveSupport::Notifications::Event.new(*args)
-      end
-
-      @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"
+    events = []
+    ActiveSupport::Notifications.subscribe "transmit.action_cable" do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
     end
+
+    @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"
   end
 
   test "notification for transmit_subscription_confirmation" do
-    begin
-      @channel.subscribe_to_channel
+    @channel.subscribe_to_channel
 
-      events = []
-      ActiveSupport::Notifications.subscribe "transmit_subscription_confirmation.action_cable" do |*args|
-        events << ActiveSupport::Notifications::Event.new(*args)
-      end
+    events = []
+    ActiveSupport::Notifications.subscribe "transmit_subscription_confirmation.action_cable" do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
+    end
 
-      @channel.stub(:subscription_confirmation_sent?, false) do
-        @channel.send(:transmit_subscription_confirmation)
+    @channel.stub(:subscription_confirmation_sent?, false) do
+      @channel.send(:transmit_subscription_confirmation)
 
-        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]
-      end
-    ensure
-      ActiveSupport::Notifications.unsubscribe "transmit_subscription_confirmation.action_cable"
+      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]
     end
+  ensure
+    ActiveSupport::Notifications.unsubscribe "transmit_subscription_confirmation.action_cable"
   end
 
   test "notification for transmit_subscription_rejection" do
-    begin
-      events = []
-      ActiveSupport::Notifications.subscribe "transmit_subscription_rejection.action_cable" do |*args|
-        events << ActiveSupport::Notifications::Event.new(*args)
-      end
+    events = []
+    ActiveSupport::Notifications.subscribe "transmit_subscription_rejection.action_cable" do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
+    end
 
-      @channel.send(:transmit_subscription_rejection)
+    @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]
-    ensure
-      ActiveSupport::Notifications.unsubscribe "transmit_subscription_rejection.action_cable"
-    end
+    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]
+  ensure
+    ActiveSupport::Notifications.unsubscribe "transmit_subscription_rejection.action_cable"
   end
 
   test "behaves like rescuable" do
diff --git a/actioncable/test/server/broadcasting_test.rb b/actioncable/test/server/broadcasting_test.rb
index 03c900182a..860e79b821 100644
--- a/actioncable/test/server/broadcasting_test.rb
+++ b/actioncable/test/server/broadcasting_test.rb
@@ -13,50 +13,46 @@ class BroadcastingTest < ActionCable::TestCase
   end
 
   test "broadcast generates notification" do
-    begin
-      server = TestServer.new
-
-      events = []
-      ActiveSupport::Notifications.subscribe "broadcast.action_cable" do |*args|
-        events << ActiveSupport::Notifications::Event.new(*args)
-      end
-
-      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"
+    server = TestServer.new
+
+    events = []
+    ActiveSupport::Notifications.subscribe "broadcast.action_cable" do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
     end
+
+    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"
   end
 
   test "broadcaster from broadcaster_for generates notification" do
-    begin
-      server = TestServer.new
-
-      events = []
-      ActiveSupport::Notifications.subscribe "broadcast.action_cable" do |*args|
-        events << ActiveSupport::Notifications::Event.new(*args)
-      end
-
-      broadcasting = "test_queue"
-      message = { body: "test message" }
-
-      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"
+    server = TestServer.new
+
+    events = []
+    ActiveSupport::Notifications.subscribe "broadcast.action_cable" do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
     end
+
+    broadcasting = "test_queue"
+    message = { body: "test message" }
+
+    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"
   end
 end
-- 
cgit v1.2.3