Merge pull request #32556 from utilum/splat

2.6 warning: passing splat keyword arguments as a single Hash

actioncable/test/channel/stream_test.rb

@@ -200,7 +200,7 @@ def open_connection
       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

activesupport/test/cache/behaviors/cache_store_behavior.rb

@@ -454,8 +454,8 @@ def assert_uncompressed(value, **options)
 
     def assert_compression(should_compress, value, **options)
       freeze_time do
-        @cache.write("actual", value, **options)
-        @cache.write("uncompressed", value, **options, compress: false)
+        @cache.write("actual", value, options)
+        @cache.write("uncompressed", value, options.merge(compress: false))
       end
 
       if value.nil?