aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/test/channel
diff options
context:
space:
mode:
authorutilum <oz@utilum.com>2018-04-13 07:23:19 +0200
committerutilum <oz@utilum.com>2018-04-15 10:09:38 +0200
commit86cafe7c9ddfd7e53f8596187c960bb893590844 (patch)
tree1782b12306b62af997bee463ed6f30c68235c9f2 /actioncable/test/channel
parentd472229f1fb76f73b6bc678191057a554ce52f51 (diff)
downloadrails-86cafe7c9ddfd7e53f8596187c960bb893590844.tar.gz
rails-86cafe7c9ddfd7e53f8596187c960bb893590844.tar.bz2
rails-86cafe7c9ddfd7e53f8596187c960bb893590844.zip
2.6 warning: passing splat keyword arguments as a single Hash
Ruby 2.6.0 warns about this. ``` ruby -v ruby 2.6.0dev (2018-04-04 trunk 63085) [x86_64-linux] ``` Before, see: https://travis-ci.org/rails/rails/jobs/365740163#L1262-L1264 https://travis-ci.org/rails/rails/jobs/365944863#L2121-L2174
Diffstat (limited to 'actioncable/test/channel')
-rw-r--r--actioncable/test/channel/stream_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/test/channel/stream_test.rb b/actioncable/test/channel/stream_test.rb
index e9e8849637..df9d44d8dd 100644
--- a/actioncable/test/channel/stream_test.rb
+++ b/actioncable/test/channel/stream_test.rb
@@ -200,7 +200,7 @@ module ActionCable::StreamTests
end
def receive(connection, command:, identifiers:, channel: "ActionCable::StreamTests::ChatChannel")
- identifier = JSON.generate(channel: channel, **identifiers)
+ identifier = JSON.generate(identifiers.merge(channel: channel))
connection.dispatch_websocket_message JSON.generate(command: command, identifier: identifier)
wait_for_async
end