aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/test/channel/base_test.rb
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2016-03-31 07:08:49 -0700
committerJeremy Daer <jeremydaer@gmail.com>2016-03-31 07:08:49 -0700
commit9a83ef38912063db127a3918b0f155d5d3acfe3b (patch)
treee6225bc33dcc1dcefdfefca4537bde07bc8df94a /actioncable/test/channel/base_test.rb
parent903f447e436a7c909c3afc552f27bbbc1b4770c8 (diff)
parentb168eb5819fa5fea940c9865d5c9a3ec5ba2a7ec (diff)
downloadrails-9a83ef38912063db127a3918b0f155d5d3acfe3b.tar.gz
rails-9a83ef38912063db127a3918b0f155d5d3acfe3b.tar.bz2
rails-9a83ef38912063db127a3918b0f155d5d3acfe3b.zip
Merge pull request #24233 from jeremy/cable/encoding
Cable message encoding
Diffstat (limited to 'actioncable/test/channel/base_test.rb')
-rw-r--r--actioncable/test/channel/base_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/test/channel/base_test.rb b/actioncable/test/channel/base_test.rb
index bed54eb6b3..daa782eeb3 100644
--- a/actioncable/test/channel/base_test.rb
+++ b/actioncable/test/channel/base_test.rb
@@ -146,12 +146,12 @@ class ActionCable::Channel::BaseTest < ActiveSupport::TestCase
test "transmitting data" do
@channel.perform_action 'action' => :get_latest
- expected = ActiveSupport::JSON.encode "identifier" => "{id: 1}", "message" => { "data" => "latest" }
+ expected = { "identifier" => "{id: 1}", "message" => { "data" => "latest" }}
assert_equal expected, @connection.last_transmission
end
test "subscription confirmation" do
- expected = ActiveSupport::JSON.encode "identifier" => "{id: 1}", "type" => "confirm_subscription"
+ expected = { "identifier" => "{id: 1}", "type" => "confirm_subscription" }
assert_equal expected, @connection.last_transmission
end