diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-04-17 23:05:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 23:05:59 +0900 |
| commit | 6378a386ddd1beb998ec9149a284d5fb13d491c7 (patch) | |
| tree | bc0bc32caa09f3883e005e5c7e8ff8c930d63b8f | |
| parent | 1fa91ee450227c5a5f0bfc2f99cabdc4c8ecb9da (diff) | |
| parent | 86cafe7c9ddfd7e53f8596187c960bb893590844 (diff) | |
| download | rails-6378a386ddd1beb998ec9149a284d5fb13d491c7.tar.gz rails-6378a386ddd1beb998ec9149a284d5fb13d491c7.tar.bz2 rails-6378a386ddd1beb998ec9149a284d5fb13d491c7.zip | |
Merge pull request #32556 from utilum/splat
2.6 warning: passing splat keyword arguments as a single Hash
| -rw-r--r-- | actioncable/test/channel/stream_test.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/cache/behaviors/cache_store_behavior.rb | 4 |
2 files changed, 3 insertions, 3 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 diff --git a/activesupport/test/cache/behaviors/cache_store_behavior.rb b/activesupport/test/cache/behaviors/cache_store_behavior.rb index e2146a1b3a..f6763d195a 100644 --- a/activesupport/test/cache/behaviors/cache_store_behavior.rb +++ b/activesupport/test/cache/behaviors/cache_store_behavior.rb @@ -454,8 +454,8 @@ module CacheStoreBehavior 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? |