From 6673cf7071094e87d473459452a2d0e4c2ccfebe Mon Sep 17 00:00:00 2001
From: bogdanvlviv <bogdanvlviv@gmail.com>
Date: Sun, 11 Jun 2017 15:59:23 +0300
Subject: Use `require_relative` instead of `require` with full path

---
 actioncable/test/subscription_adapter/async_test.rb         | 2 +-
 actioncable/test/subscription_adapter/evented_redis_test.rb | 4 ++--
 actioncable/test/subscription_adapter/inline_test.rb        | 2 +-
 actioncable/test/subscription_adapter/postgresql_test.rb    | 2 +-
 actioncable/test/subscription_adapter/redis_test.rb         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'actioncable/test')

diff --git a/actioncable/test/subscription_adapter/async_test.rb b/actioncable/test/subscription_adapter/async_test.rb
index 7bc2e55d40..8a447c7a4f 100644
--- a/actioncable/test/subscription_adapter/async_test.rb
+++ b/actioncable/test/subscription_adapter/async_test.rb
@@ -1,5 +1,5 @@
 require "test_helper"
-require_relative "./common"
+require_relative "common"
 
 class AsyncAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index 256458bc24..5453511549 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
-require_relative "./common"
-require_relative "./channel_prefix"
+require_relative "common"
+require_relative "channel_prefix"
 
 class EventedRedisAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest
diff --git a/actioncable/test/subscription_adapter/inline_test.rb b/actioncable/test/subscription_adapter/inline_test.rb
index 52bfa00aba..eafa3df2df 100644
--- a/actioncable/test/subscription_adapter/inline_test.rb
+++ b/actioncable/test/subscription_adapter/inline_test.rb
@@ -1,5 +1,5 @@
 require "test_helper"
-require_relative "./common"
+require_relative "common"
 
 class InlineAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest
diff --git a/actioncable/test/subscription_adapter/postgresql_test.rb b/actioncable/test/subscription_adapter/postgresql_test.rb
index beb6efab28..ada4c2e2bd 100644
--- a/actioncable/test/subscription_adapter/postgresql_test.rb
+++ b/actioncable/test/subscription_adapter/postgresql_test.rb
@@ -1,5 +1,5 @@
 require "test_helper"
-require_relative "./common"
+require_relative "common"
 
 require "active_record"
 
diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb
index 4df5e0cbcd..11120b3f85 100644
--- a/actioncable/test/subscription_adapter/redis_test.rb
+++ b/actioncable/test/subscription_adapter/redis_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
-require_relative "./common"
-require_relative "./channel_prefix"
+require_relative "common"
+require_relative "channel_prefix"
 
 class RedisAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest
-- 
cgit v1.2.3


From f55ecc6a7c7866a13fe9f5b84b295f2935c6ff1f Mon Sep 17 00:00:00 2001
From: Marc Ignacio <marcrendlignacio@gmail.com>
Date: Thu, 22 Jun 2017 09:10:08 +0800
Subject: Allows for other common redis options to be in cable.yml, by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Adds RedisAdapterTest::AlternateConfiguration to account
  for a relatively common alternative setup, as it’s used
  as the first example in the
  [Redis rubygem](https://github.com/redis/redis-rb#getting-started)

- Supplies original RedisAdapterTest with more complete
  redis:// url format by adding a ‘userinfo’ (blank user),
  so that it resembles the alternate configuration

- Supplies original EventedRedisAdapterTest with more complete
  redis:// url as well

- Adds before_script to start redis-server with password as a daemon
  and with explicit defaults copied from the default redis.conf
  (Instead of using Travis' default init/upstart scripts for `redis` service)
---
 actioncable/test/subscription_adapter/evented_redis_test.rb |  2 +-
 actioncable/test/subscription_adapter/redis_test.rb         | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'actioncable/test')

diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index 5453511549..1c99031ab0 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -54,6 +54,6 @@ class EventedRedisAdapterTest < ActionCable::TestCase
   end
 
   def cable_config
-    { adapter: "evented_redis", url: "redis://127.0.0.1:6379/12" }
+    { adapter: "evented_redis", url: "redis://:password@127.0.0.1:6379/12" }
   end
 end
diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb
index 11120b3f85..60596dd205 100644
--- a/actioncable/test/subscription_adapter/redis_test.rb
+++ b/actioncable/test/subscription_adapter/redis_test.rb
@@ -7,7 +7,7 @@ class RedisAdapterTest < ActionCable::TestCase
   include ChannelPrefixTest
 
   def cable_config
-    { adapter: "redis", driver: "ruby", url: "redis://127.0.0.1:6379/12" }
+    { adapter: "redis", driver: "ruby", url: "redis://:password@127.0.0.1:6379/12" }
   end
 end
 
@@ -16,3 +16,11 @@ class RedisAdapterTest::Hiredis < RedisAdapterTest
     super.merge(driver: "hiredis")
   end
 end
+
+class RedisAdapterTest::AlternateConfiguration < RedisAdapterTest
+  def cable_config
+    alt_cable_config = super.dup
+    alt_cable_config.delete(:url)
+    alt_cable_config.merge(host: "127.0.0.1", port: 6379, db: 12, password: "password")
+  end
+end
-- 
cgit v1.2.3


From cfade1ec7ee7b5b51f3c1578e3474f9c156f2971 Mon Sep 17 00:00:00 2001
From: Kir Shatrov <shatrov@me.com>
Date: Thu, 22 Jun 2017 22:59:18 -0400
Subject: Enforce frozen string in Rubocop

---
 actioncable/test/channel/base_test.rb                        | 1 +
 actioncable/test/channel/broadcasting_test.rb                | 1 +
 actioncable/test/channel/naming_test.rb                      | 1 +
 actioncable/test/channel/periodic_timers_test.rb             | 1 +
 actioncable/test/channel/rejection_test.rb                   | 1 +
 actioncable/test/channel/stream_test.rb                      | 1 +
 actioncable/test/client_test.rb                              | 1 +
 actioncable/test/connection/authorization_test.rb            | 1 +
 actioncable/test/connection/base_test.rb                     | 1 +
 actioncable/test/connection/client_socket_test.rb            | 1 +
 actioncable/test/connection/cross_site_forgery_test.rb       | 1 +
 actioncable/test/connection/identifier_test.rb               | 1 +
 actioncable/test/connection/multiple_identifiers_test.rb     | 1 +
 actioncable/test/connection/stream_test.rb                   | 1 +
 actioncable/test/connection/string_identifier_test.rb        | 1 +
 actioncable/test/connection/subscriptions_test.rb            | 1 +
 actioncable/test/server/base_test.rb                         | 1 +
 actioncable/test/server/broadcasting_test.rb                 | 1 +
 actioncable/test/stubs/global_id.rb                          | 1 +
 actioncable/test/stubs/room.rb                               | 1 +
 actioncable/test/stubs/test_adapter.rb                       | 1 +
 actioncable/test/stubs/test_connection.rb                    | 1 +
 actioncable/test/stubs/test_server.rb                        | 1 +
 actioncable/test/stubs/user.rb                               | 1 +
 actioncable/test/subscription_adapter/async_test.rb          | 1 +
 actioncable/test/subscription_adapter/base_test.rb           | 1 +
 actioncable/test/subscription_adapter/channel_prefix.rb      | 1 +
 actioncable/test/subscription_adapter/common.rb              | 1 +
 actioncable/test/subscription_adapter/evented_redis_test.rb  | 1 +
 actioncable/test/subscription_adapter/inline_test.rb         | 1 +
 actioncable/test/subscription_adapter/postgresql_test.rb     | 1 +
 actioncable/test/subscription_adapter/redis_test.rb          | 1 +
 actioncable/test/subscription_adapter/subscriber_map_test.rb | 1 +
 actioncable/test/test_helper.rb                              | 1 +
 actioncable/test/worker_test.rb                              | 1 +
 35 files changed, 35 insertions(+)

(limited to 'actioncable/test')

diff --git a/actioncable/test/channel/base_test.rb b/actioncable/test/channel/base_test.rb
index 9a3a3581e6..afefbaf076 100644
--- a/actioncable/test/channel/base_test.rb
+++ b/actioncable/test/channel/base_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/channel/broadcasting_test.rb b/actioncable/test/channel/broadcasting_test.rb
index 3476c1db31..9062a244e4 100644
--- a/actioncable/test/channel/broadcasting_test.rb
+++ b/actioncable/test/channel/broadcasting_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/channel/naming_test.rb b/actioncable/test/channel/naming_test.rb
index 08f0e7be48..b6ac7cfd42 100644
--- a/actioncable/test/channel/naming_test.rb
+++ b/actioncable/test/channel/naming_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class ActionCable::Channel::NamingTest < ActiveSupport::TestCase
diff --git a/actioncable/test/channel/periodic_timers_test.rb b/actioncable/test/channel/periodic_timers_test.rb
index 17a8e45a35..02945a2eed 100644
--- a/actioncable/test/channel/periodic_timers_test.rb
+++ b/actioncable/test/channel/periodic_timers_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/channel/rejection_test.rb b/actioncable/test/channel/rejection_test.rb
index 99c4a7603a..989ecef1f1 100644
--- a/actioncable/test/channel/rejection_test.rb
+++ b/actioncable/test/channel/rejection_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/channel/stream_test.rb b/actioncable/test/channel/stream_test.rb
index 50fc7be30b..14b5d24fbd 100644
--- a/actioncable/test/channel/stream_test.rb
+++ b/actioncable/test/channel/stream_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
index 30ac1e9c38..d38d280339 100644
--- a/actioncable/test/client_test.rb
+++ b/actioncable/test/client_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "concurrent"
 
diff --git a/actioncable/test/connection/authorization_test.rb b/actioncable/test/connection/authorization_test.rb
index dcdbe9c1d1..174821f785 100644
--- a/actioncable/test/connection/authorization_test.rb
+++ b/actioncable/test/connection/authorization_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/base_test.rb b/actioncable/test/connection/base_test.rb
index 9bcd0700cf..a460fa2a33 100644
--- a/actioncable/test/connection/base_test.rb
+++ b/actioncable/test/connection/base_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 require "active_support/core_ext/object/json"
diff --git a/actioncable/test/connection/client_socket_test.rb b/actioncable/test/connection/client_socket_test.rb
index bc3ff6a3d7..b0e01fa5cc 100644
--- a/actioncable/test/connection/client_socket_test.rb
+++ b/actioncable/test/connection/client_socket_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/cross_site_forgery_test.rb b/actioncable/test/connection/cross_site_forgery_test.rb
index 37bedfd734..f94717fecd 100644
--- a/actioncable/test/connection/cross_site_forgery_test.rb
+++ b/actioncable/test/connection/cross_site_forgery_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/identifier_test.rb b/actioncable/test/connection/identifier_test.rb
index f3d3bc0603..de9447ba3b 100644
--- a/actioncable/test/connection/identifier_test.rb
+++ b/actioncable/test/connection/identifier_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 require "stubs/user"
diff --git a/actioncable/test/connection/multiple_identifiers_test.rb b/actioncable/test/connection/multiple_identifiers_test.rb
index ca1a08f4d6..754e76a123 100644
--- a/actioncable/test/connection/multiple_identifiers_test.rb
+++ b/actioncable/test/connection/multiple_identifiers_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 require "stubs/user"
diff --git a/actioncable/test/connection/stream_test.rb b/actioncable/test/connection/stream_test.rb
index 36e1d3c095..b0f7408cac 100644
--- a/actioncable/test/connection/stream_test.rb
+++ b/actioncable/test/connection/stream_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/string_identifier_test.rb b/actioncable/test/connection/string_identifier_test.rb
index 6d53e249cb..22dc95b8f6 100644
--- a/actioncable/test/connection/string_identifier_test.rb
+++ b/actioncable/test/connection/string_identifier_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/subscriptions_test.rb b/actioncable/test/connection/subscriptions_test.rb
index a1c8a4613c..20333376e9 100644
--- a/actioncable/test/connection/subscriptions_test.rb
+++ b/actioncable/test/connection/subscriptions_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class ActionCable::Connection::SubscriptionsTest < ActionCable::TestCase
diff --git a/actioncable/test/server/base_test.rb b/actioncable/test/server/base_test.rb
index f0a51c5a7d..bb79ed2ab9 100644
--- a/actioncable/test/server/base_test.rb
+++ b/actioncable/test/server/base_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 require "active_support/core_ext/hash/indifferent_access"
diff --git a/actioncable/test/server/broadcasting_test.rb b/actioncable/test/server/broadcasting_test.rb
index ed377b7d5d..b941eb1e4f 100644
--- a/actioncable/test/server/broadcasting_test.rb
+++ b/actioncable/test/server/broadcasting_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/stubs/global_id.rb b/actioncable/test/stubs/global_id.rb
index 334f0d03e8..374503487d 100644
--- a/actioncable/test/stubs/global_id.rb
+++ b/actioncable/test/stubs/global_id.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class GlobalID
   attr_reader :uri
   delegate :to_param, :to_s, to: :uri
diff --git a/actioncable/test/stubs/room.rb b/actioncable/test/stubs/room.rb
index 1664b07d12..662200aa68 100644
--- a/actioncable/test/stubs/room.rb
+++ b/actioncable/test/stubs/room.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Room
   attr_reader :id, :name
 
diff --git a/actioncable/test/stubs/test_adapter.rb b/actioncable/test/stubs/test_adapter.rb
index bbd142b287..0d23576d2c 100644
--- a/actioncable/test/stubs/test_adapter.rb
+++ b/actioncable/test/stubs/test_adapter.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class SuccessAdapter < ActionCable::SubscriptionAdapter::Base
   def broadcast(channel, payload)
   end
diff --git a/actioncable/test/stubs/test_connection.rb b/actioncable/test/stubs/test_connection.rb
index cd2e219d88..c543518929 100644
--- a/actioncable/test/stubs/test_connection.rb
+++ b/actioncable/test/stubs/test_connection.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "stubs/user"
 
 class TestConnection
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb
index 5bf2a151dc..fc5b0df6bc 100644
--- a/actioncable/test/stubs/test_server.rb
+++ b/actioncable/test/stubs/test_server.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "ostruct"
 
 class TestServer
diff --git a/actioncable/test/stubs/user.rb b/actioncable/test/stubs/user.rb
index a66b4f87d5..e6b917b281 100644
--- a/actioncable/test/stubs/user.rb
+++ b/actioncable/test/stubs/user.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class User
   attr_reader :name
 
diff --git a/actioncable/test/subscription_adapter/async_test.rb b/actioncable/test/subscription_adapter/async_test.rb
index 8a447c7a4f..0b5bfb2fa9 100644
--- a/actioncable/test/subscription_adapter/async_test.rb
+++ b/actioncable/test/subscription_adapter/async_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 
diff --git a/actioncable/test/subscription_adapter/base_test.rb b/actioncable/test/subscription_adapter/base_test.rb
index 212ea49d2f..15ce40b1c1 100644
--- a/actioncable/test/subscription_adapter/base_test.rb
+++ b/actioncable/test/subscription_adapter/base_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/subscription_adapter/channel_prefix.rb b/actioncable/test/subscription_adapter/channel_prefix.rb
index 9ad659912e..71f993b72a 100644
--- a/actioncable/test/subscription_adapter/channel_prefix.rb
+++ b/actioncable/test/subscription_adapter/channel_prefix.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class ActionCable::Server::WithIndependentConfig < ActionCable::Server::Base
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb
index 3aa88c2caa..10639cb112 100644
--- a/actioncable/test/subscription_adapter/common.rb
+++ b/actioncable/test/subscription_adapter/common.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "concurrent"
 
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index 1c99031ab0..33aab4672b 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 require_relative "channel_prefix"
diff --git a/actioncable/test/subscription_adapter/inline_test.rb b/actioncable/test/subscription_adapter/inline_test.rb
index eafa3df2df..a3d83c07fc 100644
--- a/actioncable/test/subscription_adapter/inline_test.rb
+++ b/actioncable/test/subscription_adapter/inline_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 
diff --git a/actioncable/test/subscription_adapter/postgresql_test.rb b/actioncable/test/subscription_adapter/postgresql_test.rb
index ada4c2e2bd..4534846e6e 100644
--- a/actioncable/test/subscription_adapter/postgresql_test.rb
+++ b/actioncable/test/subscription_adapter/postgresql_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 
diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb
index 60596dd205..64dbd74a60 100644
--- a/actioncable/test/subscription_adapter/redis_test.rb
+++ b/actioncable/test/subscription_adapter/redis_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 require_relative "channel_prefix"
diff --git a/actioncable/test/subscription_adapter/subscriber_map_test.rb b/actioncable/test/subscription_adapter/subscriber_map_test.rb
index 76b984c849..ee36dd7a22 100644
--- a/actioncable/test/subscription_adapter/subscriber_map_test.rb
+++ b/actioncable/test/subscription_adapter/subscriber_map_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class SubscriberMapTest < ActionCable::TestCase
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb
index 5d246c2b76..b9d407fb6d 100644
--- a/actioncable/test/test_helper.rb
+++ b/actioncable/test/test_helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "action_cable"
 require "active_support/testing/autorun"
 
diff --git a/actioncable/test/worker_test.rb b/actioncable/test/worker_test.rb
index 3385593f74..2512df59e8 100644
--- a/actioncable/test/worker_test.rb
+++ b/actioncable/test/worker_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class WorkerTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 87b3e226d65ac1ed371620bfdcd2f950c87cfece Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 2 Jul 2017 02:15:17 +0930
Subject: Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"

This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing
changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
---
 actioncable/test/channel/base_test.rb                        | 1 -
 actioncable/test/channel/broadcasting_test.rb                | 1 -
 actioncable/test/channel/naming_test.rb                      | 1 -
 actioncable/test/channel/periodic_timers_test.rb             | 1 -
 actioncable/test/channel/rejection_test.rb                   | 1 -
 actioncable/test/channel/stream_test.rb                      | 1 -
 actioncable/test/client_test.rb                              | 1 -
 actioncable/test/connection/authorization_test.rb            | 1 -
 actioncable/test/connection/base_test.rb                     | 1 -
 actioncable/test/connection/client_socket_test.rb            | 1 -
 actioncable/test/connection/cross_site_forgery_test.rb       | 1 -
 actioncable/test/connection/identifier_test.rb               | 1 -
 actioncable/test/connection/multiple_identifiers_test.rb     | 1 -
 actioncable/test/connection/stream_test.rb                   | 1 -
 actioncable/test/connection/string_identifier_test.rb        | 1 -
 actioncable/test/connection/subscriptions_test.rb            | 1 -
 actioncable/test/server/base_test.rb                         | 1 -
 actioncable/test/server/broadcasting_test.rb                 | 1 -
 actioncable/test/stubs/global_id.rb                          | 1 -
 actioncable/test/stubs/room.rb                               | 1 -
 actioncable/test/stubs/test_adapter.rb                       | 1 -
 actioncable/test/stubs/test_connection.rb                    | 1 -
 actioncable/test/stubs/test_server.rb                        | 1 -
 actioncable/test/stubs/user.rb                               | 1 -
 actioncable/test/subscription_adapter/async_test.rb          | 1 -
 actioncable/test/subscription_adapter/base_test.rb           | 1 -
 actioncable/test/subscription_adapter/channel_prefix.rb      | 1 -
 actioncable/test/subscription_adapter/common.rb              | 1 -
 actioncable/test/subscription_adapter/evented_redis_test.rb  | 1 -
 actioncable/test/subscription_adapter/inline_test.rb         | 1 -
 actioncable/test/subscription_adapter/postgresql_test.rb     | 1 -
 actioncable/test/subscription_adapter/redis_test.rb          | 1 -
 actioncable/test/subscription_adapter/subscriber_map_test.rb | 1 -
 actioncable/test/test_helper.rb                              | 1 -
 actioncable/test/worker_test.rb                              | 1 -
 35 files changed, 35 deletions(-)

(limited to 'actioncable/test')

diff --git a/actioncable/test/channel/base_test.rb b/actioncable/test/channel/base_test.rb
index afefbaf076..9a3a3581e6 100644
--- a/actioncable/test/channel/base_test.rb
+++ b/actioncable/test/channel/base_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/channel/broadcasting_test.rb b/actioncable/test/channel/broadcasting_test.rb
index 9062a244e4..3476c1db31 100644
--- a/actioncable/test/channel/broadcasting_test.rb
+++ b/actioncable/test/channel/broadcasting_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/channel/naming_test.rb b/actioncable/test/channel/naming_test.rb
index b6ac7cfd42..08f0e7be48 100644
--- a/actioncable/test/channel/naming_test.rb
+++ b/actioncable/test/channel/naming_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 
 class ActionCable::Channel::NamingTest < ActiveSupport::TestCase
diff --git a/actioncable/test/channel/periodic_timers_test.rb b/actioncable/test/channel/periodic_timers_test.rb
index 02945a2eed..17a8e45a35 100644
--- a/actioncable/test/channel/periodic_timers_test.rb
+++ b/actioncable/test/channel/periodic_timers_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/channel/rejection_test.rb b/actioncable/test/channel/rejection_test.rb
index 989ecef1f1..99c4a7603a 100644
--- a/actioncable/test/channel/rejection_test.rb
+++ b/actioncable/test/channel/rejection_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/channel/stream_test.rb b/actioncable/test/channel/stream_test.rb
index 14b5d24fbd..50fc7be30b 100644
--- a/actioncable/test/channel/stream_test.rb
+++ b/actioncable/test/channel/stream_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_connection"
 require "stubs/room"
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
index d38d280339..30ac1e9c38 100644
--- a/actioncable/test/client_test.rb
+++ b/actioncable/test/client_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "concurrent"
 
diff --git a/actioncable/test/connection/authorization_test.rb b/actioncable/test/connection/authorization_test.rb
index 174821f785..dcdbe9c1d1 100644
--- a/actioncable/test/connection/authorization_test.rb
+++ b/actioncable/test/connection/authorization_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/base_test.rb b/actioncable/test/connection/base_test.rb
index a460fa2a33..9bcd0700cf 100644
--- a/actioncable/test/connection/base_test.rb
+++ b/actioncable/test/connection/base_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 require "active_support/core_ext/object/json"
diff --git a/actioncable/test/connection/client_socket_test.rb b/actioncable/test/connection/client_socket_test.rb
index b0e01fa5cc..bc3ff6a3d7 100644
--- a/actioncable/test/connection/client_socket_test.rb
+++ b/actioncable/test/connection/client_socket_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/cross_site_forgery_test.rb b/actioncable/test/connection/cross_site_forgery_test.rb
index f94717fecd..37bedfd734 100644
--- a/actioncable/test/connection/cross_site_forgery_test.rb
+++ b/actioncable/test/connection/cross_site_forgery_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/identifier_test.rb b/actioncable/test/connection/identifier_test.rb
index de9447ba3b..f3d3bc0603 100644
--- a/actioncable/test/connection/identifier_test.rb
+++ b/actioncable/test/connection/identifier_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 require "stubs/user"
diff --git a/actioncable/test/connection/multiple_identifiers_test.rb b/actioncable/test/connection/multiple_identifiers_test.rb
index 754e76a123..ca1a08f4d6 100644
--- a/actioncable/test/connection/multiple_identifiers_test.rb
+++ b/actioncable/test/connection/multiple_identifiers_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 require "stubs/user"
diff --git a/actioncable/test/connection/stream_test.rb b/actioncable/test/connection/stream_test.rb
index b0f7408cac..36e1d3c095 100644
--- a/actioncable/test/connection/stream_test.rb
+++ b/actioncable/test/connection/stream_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/string_identifier_test.rb b/actioncable/test/connection/string_identifier_test.rb
index 22dc95b8f6..6d53e249cb 100644
--- a/actioncable/test/connection/string_identifier_test.rb
+++ b/actioncable/test/connection/string_identifier_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/connection/subscriptions_test.rb b/actioncable/test/connection/subscriptions_test.rb
index 20333376e9..a1c8a4613c 100644
--- a/actioncable/test/connection/subscriptions_test.rb
+++ b/actioncable/test/connection/subscriptions_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 
 class ActionCable::Connection::SubscriptionsTest < ActionCable::TestCase
diff --git a/actioncable/test/server/base_test.rb b/actioncable/test/server/base_test.rb
index bb79ed2ab9..f0a51c5a7d 100644
--- a/actioncable/test/server/base_test.rb
+++ b/actioncable/test/server/base_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 require "active_support/core_ext/hash/indifferent_access"
diff --git a/actioncable/test/server/broadcasting_test.rb b/actioncable/test/server/broadcasting_test.rb
index b941eb1e4f..ed377b7d5d 100644
--- a/actioncable/test/server/broadcasting_test.rb
+++ b/actioncable/test/server/broadcasting_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/stubs/global_id.rb b/actioncable/test/stubs/global_id.rb
index 374503487d..334f0d03e8 100644
--- a/actioncable/test/stubs/global_id.rb
+++ b/actioncable/test/stubs/global_id.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class GlobalID
   attr_reader :uri
   delegate :to_param, :to_s, to: :uri
diff --git a/actioncable/test/stubs/room.rb b/actioncable/test/stubs/room.rb
index 662200aa68..1664b07d12 100644
--- a/actioncable/test/stubs/room.rb
+++ b/actioncable/test/stubs/room.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Room
   attr_reader :id, :name
 
diff --git a/actioncable/test/stubs/test_adapter.rb b/actioncable/test/stubs/test_adapter.rb
index 0d23576d2c..bbd142b287 100644
--- a/actioncable/test/stubs/test_adapter.rb
+++ b/actioncable/test/stubs/test_adapter.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class SuccessAdapter < ActionCable::SubscriptionAdapter::Base
   def broadcast(channel, payload)
   end
diff --git a/actioncable/test/stubs/test_connection.rb b/actioncable/test/stubs/test_connection.rb
index c543518929..cd2e219d88 100644
--- a/actioncable/test/stubs/test_connection.rb
+++ b/actioncable/test/stubs/test_connection.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "stubs/user"
 
 class TestConnection
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb
index fc5b0df6bc..5bf2a151dc 100644
--- a/actioncable/test/stubs/test_server.rb
+++ b/actioncable/test/stubs/test_server.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "ostruct"
 
 class TestServer
diff --git a/actioncable/test/stubs/user.rb b/actioncable/test/stubs/user.rb
index e6b917b281..a66b4f87d5 100644
--- a/actioncable/test/stubs/user.rb
+++ b/actioncable/test/stubs/user.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class User
   attr_reader :name
 
diff --git a/actioncable/test/subscription_adapter/async_test.rb b/actioncable/test/subscription_adapter/async_test.rb
index 0b5bfb2fa9..8a447c7a4f 100644
--- a/actioncable/test/subscription_adapter/async_test.rb
+++ b/actioncable/test/subscription_adapter/async_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 
diff --git a/actioncable/test/subscription_adapter/base_test.rb b/actioncable/test/subscription_adapter/base_test.rb
index 15ce40b1c1..212ea49d2f 100644
--- a/actioncable/test/subscription_adapter/base_test.rb
+++ b/actioncable/test/subscription_adapter/base_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "stubs/test_server"
 
diff --git a/actioncable/test/subscription_adapter/channel_prefix.rb b/actioncable/test/subscription_adapter/channel_prefix.rb
index 71f993b72a..9ad659912e 100644
--- a/actioncable/test/subscription_adapter/channel_prefix.rb
+++ b/actioncable/test/subscription_adapter/channel_prefix.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 
 class ActionCable::Server::WithIndependentConfig < ActionCable::Server::Base
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb
index 10639cb112..3aa88c2caa 100644
--- a/actioncable/test/subscription_adapter/common.rb
+++ b/actioncable/test/subscription_adapter/common.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require "concurrent"
 
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index 33aab4672b..1c99031ab0 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 require_relative "channel_prefix"
diff --git a/actioncable/test/subscription_adapter/inline_test.rb b/actioncable/test/subscription_adapter/inline_test.rb
index a3d83c07fc..eafa3df2df 100644
--- a/actioncable/test/subscription_adapter/inline_test.rb
+++ b/actioncable/test/subscription_adapter/inline_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 
diff --git a/actioncable/test/subscription_adapter/postgresql_test.rb b/actioncable/test/subscription_adapter/postgresql_test.rb
index 4534846e6e..ada4c2e2bd 100644
--- a/actioncable/test/subscription_adapter/postgresql_test.rb
+++ b/actioncable/test/subscription_adapter/postgresql_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 
diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb
index 64dbd74a60..60596dd205 100644
--- a/actioncable/test/subscription_adapter/redis_test.rb
+++ b/actioncable/test/subscription_adapter/redis_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 require_relative "common"
 require_relative "channel_prefix"
diff --git a/actioncable/test/subscription_adapter/subscriber_map_test.rb b/actioncable/test/subscription_adapter/subscriber_map_test.rb
index ee36dd7a22..76b984c849 100644
--- a/actioncable/test/subscription_adapter/subscriber_map_test.rb
+++ b/actioncable/test/subscription_adapter/subscriber_map_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 
 class SubscriberMapTest < ActionCable::TestCase
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb
index b9d407fb6d..5d246c2b76 100644
--- a/actioncable/test/test_helper.rb
+++ b/actioncable/test/test_helper.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "action_cable"
 require "active_support/testing/autorun"
 
diff --git a/actioncable/test/worker_test.rb b/actioncable/test/worker_test.rb
index 2512df59e8..3385593f74 100644
--- a/actioncable/test/worker_test.rb
+++ b/actioncable/test/worker_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "test_helper"
 
 class WorkerTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 6aa658e329e54f94519268a02b29dc102b415c07 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Mon, 3 Jul 2017 00:16:53 +0900
Subject: Remove redundant `assert_respond_to`

It is covered by following assertion.
---
 actioncable/test/subscription_adapter/base_test.rb | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'actioncable/test')

diff --git a/actioncable/test/subscription_adapter/base_test.rb b/actioncable/test/subscription_adapter/base_test.rb
index 212ea49d2f..5793415b5f 100644
--- a/actioncable/test/subscription_adapter/base_test.rb
+++ b/actioncable/test/subscription_adapter/base_test.rb
@@ -39,35 +39,25 @@ class ActionCable::SubscriptionAdapter::BaseTest < ActionCable::TestCase
   # TEST METHODS THAT ARE REQUIRED OF THE ADAPTER'S BACKEND STORAGE OBJECT
 
   test "#broadcast is implemented" do
-    broadcast = SuccessAdapter.new(@server).broadcast("channel", "payload")
-
-    assert_respond_to(SuccessAdapter.new(@server), :broadcast)
-
     assert_nothing_raised do
-      broadcast
+      SuccessAdapter.new(@server).broadcast("channel", "payload")
     end
   end
 
   test "#subscribe is implemented" do
     callback = lambda { puts "callback" }
     success_callback = lambda { puts "success" }
-    subscribe = SuccessAdapter.new(@server).subscribe("channel", callback, success_callback)
-
-    assert_respond_to(SuccessAdapter.new(@server), :subscribe)
 
     assert_nothing_raised do
-      subscribe
+      SuccessAdapter.new(@server).subscribe("channel", callback, success_callback)
     end
   end
 
   test "#unsubscribe is implemented" do
     callback = lambda { puts "callback" }
-    unsubscribe = SuccessAdapter.new(@server).unsubscribe("channel", callback)
-
-    assert_respond_to(SuccessAdapter.new(@server), :unsubscribe)
 
     assert_nothing_raised do
-      unsubscribe
+      SuccessAdapter.new(@server).unsubscribe("channel", callback)
     end
   end
 end
-- 
cgit v1.2.3


From 2bce7777b70efe81f45e4ae8dc61b25f1e18771e Mon Sep 17 00:00:00 2001
From: palkan <dementiev.vm@gmail.com>
Date: Thu, 6 Jul 2017 17:34:05 +0300
Subject: [Fix #28751] Hash stream long stream identifiers when using Postgres
 adapter

---
 actioncable/test/subscription_adapter/common.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'actioncable/test')

diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb
index 3aa88c2caa..80baf2f771 100644
--- a/actioncable/test/subscription_adapter/common.rb
+++ b/actioncable/test/subscription_adapter/common.rb
@@ -112,4 +112,18 @@ module CommonSubscriptionAdapterTest
       assert_equal "two", queue.pop
     end
   end
+
+  def test_long_identifiers
+    channel_1 = "a" * 100 + "1"
+    channel_2 = "a" * 100 + "2"
+    subscribe_as_queue(channel_1) do |queue|
+      subscribe_as_queue(channel_2) do |queue_2|
+        @tx_adapter.broadcast(channel_1, "apples")
+        @tx_adapter.broadcast(channel_2, "oranges")
+
+        assert_equal "apples", queue.pop
+        assert_equal "oranges", queue_2.pop
+      end
+    end
+  end
 end
-- 
cgit v1.2.3