aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorVladimir Dementyev <dementiev.vm@gmail.com>2019-01-13 22:58:47 -0500
committerVladimir Dementyev <dementiev.vm@gmail.com>2019-01-14 11:16:59 -0500
commita4099debcfd7e5e1fe3e5fd9111b7cb0242eb56d (patch)
treea2549a96628b1c0bb4fe0b7ca4722ca7af6ea547 /actioncable
parentfc95836f8776b708ac30e4f1b83cc2a3cddfa77d (diff)
downloadrails-a4099debcfd7e5e1fe3e5fd9111b7cb0242eb56d.tar.gz
rails-a4099debcfd7e5e1fe3e5fd9111b7cb0242eb56d.tar.bz2
rails-a4099debcfd7e5e1fe3e5fd9111b7cb0242eb56d.zip
Add Action Cable Testing guides
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/CHANGELOG.md4
-rw-r--r--actioncable/lib/action_cable/connection/test_case.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index 162de0df0b..f43a955a76 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Merge [`action-cable-testing`](https://github.com/palkan/action-cable-testing) to Rails.
+
+ *Vladimir Dementyev*
+
* The JavaScript WebSocket client will no longer try to reconnect
when you call `reject_unauthorized_connection` on the connection.
diff --git a/actioncable/lib/action_cable/connection/test_case.rb b/actioncable/lib/action_cable/connection/test_case.rb
index 233fd837e0..26a183d1ec 100644
--- a/actioncable/lib/action_cable/connection/test_case.rb
+++ b/actioncable/lib/action_cable/connection/test_case.rb
@@ -75,7 +75,7 @@ module ActionCable
# def test_connects_with_proper_cookie
# # Simulate the connection request with a cookie.
# cookies["user_id"] = users(:john).id
-
+ #
# connect
#
# # Assert the connection identifier matches the fixture.