Fix some keyword args for ruby 3 compatibility

app/helpers/notifications_helper.rb

@@ -20,11 +20,11 @@ module NotificationsHelper
         opts.merge!(opts_for_birthday(note))
       end
     end
-    translation(target_type, opts)
+    translation(target_type, **opts)
   end
 
-  def translation(target_type, opts = {})
+  def translation(target_type, **kwargs)
-    t("#{target_type}", opts).html_safe
+    t(target_type, **kwargs).html_safe # rubocop:disable Rails/OutputSafety
   end
 
   def opts_for_post(post)

app/mailers/report_mailer.rb

@@ -26,7 +26,7 @@ class ReportMailer < ApplicationMailer
   private
 
   def format(resource)
-    body = I18n.t("notifier.report_email.body", resource)
+    body = I18n.t("notifier.report_email.body", **resource)
     mail(to: resource[:email], subject: I18n.t("notifier.report_email.subject", type: resource[:type])) do |format|
       format.html { render "notifier/plain_markdown_email", locals: {body: body} }
       format.text { render "notifier/plain_markdown_email", locals: {body: body} }

app/presenters/base_presenter.rb

@@ -20,8 +20,12 @@ class BasePresenter
     @current_user = curr_user
   end
 
-  def method_missing(method, *args)
+  def respond_to_missing?(method, include_private=false)
-    @presentable.public_send(method, *args)
+    @presentable.respond_to?(method) || super
+  end
+
+  def method_missing(method, *args, **kwargs) # rubocop:disable Lint/MissingSuper
+    @presentable.public_send(method, *args, **kwargs)
   end
 
   class NilPresenter

features/support/application_cuke_helpers.rb

@@ -20,7 +20,7 @@ module ApplicationCukeHelpers
   def flash_message(opts={})
     selector = opts.delete(:selector)
     selector &&= ".alert-#{selector}"
-    find(selector || ".flash-message", {match: :first}.merge(opts))
+    find(selector || ".flash-message", **{match: :first}.merge(opts))
   end
 
   def confirm_form_validation_error(element)

features/support/paths.rb

@@ -63,7 +63,7 @@ module NavigationHelpers
     if path.is_a?(Hash)
       visit(path[:path])
       await_elem = path[:special_elem]
-      find(await_elem.delete(:selector), await_elem)
+      find(await_elem.delete(:selector), **await_elem)
     else
       visit(path)
     end

spec/lib/diaspora/federated/retraction_spec.rb

@@ -71,7 +71,7 @@ describe Retraction do
 
       expect(Workers::DeferredRetraction).to receive(:perform_async).with(
         local_luke.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [remote_raphael.id],
-        "service_types" => []
+        {"service_types" => []}
       )
 
       retraction.defer_dispatch(local_luke)
@@ -87,7 +87,7 @@ describe Retraction do
 
       expect(Workers::DeferredRetraction).to receive(:perform_async).with(
         alice.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [],
-        "service_types" => ["Services::Twitter"], "tweet_id" => "123"
+        {"service_types" => ["Services::Twitter"], "tweet_id" => "123"}
       )
 
       retraction.defer_dispatch(alice)
@@ -98,7 +98,7 @@ describe Retraction do
       federation_retraction = Diaspora::Federation::Entities.retraction(retraction)
 
       expect(Workers::DeferredRetraction).to receive(:perform_async).with(
-        alice.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [], "service_types" => []
+        alice.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [], {"service_types" => []}
       )
 
       retraction.defer_dispatch(alice)

spec/models/user/connecting_spec.rb

@@ -181,7 +181,7 @@ describe User::Connecting, type: :model do
       it "delivers profile for remote persons" do
         allow(Diaspora::Federation::Dispatcher).to receive(:defer_dispatch)
         expect(Diaspora::Federation::Dispatcher)
-          .to receive(:defer_dispatch).with(alice, alice.profile, subscriber_ids: [remote_raphael.id])
+          .to receive(:defer_dispatch).with(alice, alice.profile, {subscriber_ids: [remote_raphael.id]})
 
         alice.share_with(remote_raphael, alice.aspects.first)
       end

spec/workers/mail/invite_email_spec.rb

@@ -6,8 +6,7 @@ describe Workers::Mail::InviteEmail do
   let(:email_inviter) { double('EmailInviter') }
 
   it 'creates a new email inviter' do
-    expect(EmailInviter).to receive(:new).with(emails, alice, message: message)
+    expect(EmailInviter).to receive(:new).with(emails, alice, {message: message}).and_return(email_inviter)
-      .and_return(email_inviter)
     expect(email_inviter).to receive(:send!)
     Workers::Mail::InviteEmail.new.perform(emails, alice.id, message: message)
   end