aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/test/connection
diff options
context:
space:
mode:
authorJon Moss <me@jonathanmoss.me>2016-02-12 21:13:37 -0500
committerJon Moss <me@jonathanmoss.me>2016-03-02 09:01:43 -0500
commit45635098ac827ee5b243ac01b6267843cd89200a (patch)
tree6363c74dac57bd35542e1630904d1dc230e204fa /actioncable/test/connection
parentfc1b32f8d1d26e41fa79d7a38c852acae24c77a0 (diff)
downloadrails-45635098ac827ee5b243ac01b6267843cd89200a.tar.gz
rails-45635098ac827ee5b243ac01b6267843cd89200a.tar.bz2
rails-45635098ac827ee5b243ac01b6267843cd89200a.zip
Accept JSON with no backslashes/escaping
Fixes #22675 Allow channel identifiers and also data with no backslahes/escaping to be accepted by the subscription storer.
Diffstat (limited to 'actioncable/test/connection')
-rw-r--r--actioncable/test/connection/subscriptions_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/test/connection/subscriptions_test.rb b/actioncable/test/connection/subscriptions_test.rb
index 62e41484fe..68a79c6e4c 100644
--- a/actioncable/test/connection/subscriptions_test.rb
+++ b/actioncable/test/connection/subscriptions_test.rb
@@ -82,13 +82,13 @@ class ActionCable::Connection::SubscriptionsTest < ActionCable::TestCase
end
end
- test "unsubscrib from all" do
+ test "unsubscribe from all" do
run_in_eventmachine do
setup_connection
channel1 = subscribe_to_chat_channel
- channel2_id = ActiveSupport::JSON.encode(id: 2, channel: 'ActionCable::Connection::SubscriptionsTest::ChatChannel')
+ channel2_id = ActiveSupport::JSON.encode({ id: 2, channel: 'ActionCable::Connection::SubscriptionsTest::ChatChannel' })
channel2 = subscribe_to_chat_channel(channel2_id)
channel1.expects(:unsubscribe_from_channel)