From 352560308bc13b881efd6d062134a9a67102b204 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Mon, 9 Sep 2019 22:25:05 +0900 Subject: [PATCH] Fix keyword arguments warnings --- actionmailer/lib/action_mailer/base.rb | 2 +- actionpack/test/dispatch/ssl_test.rb | 2 +- activerecord/lib/active_record/schema_migration.rb | 2 +- railties/test/application/middleware/cache_test.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 71aecbbed9..8fa99f3dbb 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -918,7 +918,7 @@ def set_content_type(m, user_content_type, class_default) # :doc: # If the subject has interpolations, you can pass them through the +interpolations+ parameter. def default_i18n_subject(interpolations = {}) # :doc: mailer_scope = self.class.mailer_name.tr("/", ".") - I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize)) + I18n.t(:subject, **interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize)) end # Emails do not support relative path links. diff --git a/actionpack/test/dispatch/ssl_test.rb b/actionpack/test/dispatch/ssl_test.rb index 44fe433c5f..bc73bf19a4 100644 --- a/actionpack/test/dispatch/ssl_test.rb +++ b/actionpack/test/dispatch/ssl_test.rb @@ -9,7 +9,7 @@ class SSLTest < ActionDispatch::IntegrationTest def build_app(headers: {}, ssl_options: {}) headers = HEADERS.merge(headers) - ActionDispatch::SSL.new lambda { |env| [200, headers, []] }, ssl_options.reverse_merge(hsts: { subdomains: true }) + ActionDispatch::SSL.new lambda { |env| [200, headers, []] }, **ssl_options.reverse_merge(hsts: { subdomains: true }) end end diff --git a/activerecord/lib/active_record/schema_migration.rb b/activerecord/lib/active_record/schema_migration.rb index dec7fee986..6fa0089b61 100644 --- a/activerecord/lib/active_record/schema_migration.rb +++ b/activerecord/lib/active_record/schema_migration.rb @@ -27,7 +27,7 @@ def create_table version_options = connection.internal_string_options_for_primary_key connection.create_table(table_name, id: false) do |t| - t.string :version, version_options + t.string :version, **version_options end end end diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb index 3768d8ce2d..fa8590c41d 100644 --- a/railties/test/application/middleware/cache_test.rb +++ b/railties/test/application/middleware/cache_test.rb @@ -38,7 +38,7 @@ def keeps_if_modified_since end private def render_conditionally(headers) - if stale?(headers.merge(public: !params[:private])) + if stale?(**headers.merge(public: !params[:private])) render plain: SecureRandom.hex(16) end end