From 009c14653ab84da91cf278400350503e056bef29 Mon Sep 17 00:00:00 2001 From: Mac Siri Date: Thu, 1 Apr 2021 18:40:50 -0400 Subject: [PATCH] Fix app/services' ruby 2.7 kwargs warnings (#13177) --- app/services/articles/builder.rb | 4 ++-- app/services/articles/creator.rb | 4 ++-- app/services/articles/updater.rb | 4 ++-- app/services/authentication/authenticator.rb | 4 ++-- .../broadcasts/welcome_notification/generator.rb | 4 ++-- app/services/chat_channels/create_with_users.rb | 4 ++-- app/services/chat_channels/find_or_create.rb | 4 ++-- app/services/chat_channels/send_invitation.rb | 4 ++-- app/services/chat_channels/update_channel.rb | 4 ++-- app/services/credits/buyer.rb | 4 ++-- app/services/credits/ledger.rb | 4 ++-- app/services/exporter/service.rb | 2 +- app/services/images/generate_social_image.rb | 2 +- app/services/medium_article_retrieval_service.rb | 4 ++-- app/services/mentions/create_all.rb | 4 ++-- app/services/notifications/milestone/send.rb | 4 ++-- app/services/notifications/moderation/send.rb | 4 ++-- .../notifications/new_badge_achievement/send.rb | 4 ++-- app/services/notifications/new_comment/send.rb | 4 ++-- .../notifications/new_follower/follow_data.rb | 2 +- app/services/notifications/new_follower/send.rb | 4 ++-- app/services/notifications/new_mention/send.rb | 4 ++-- app/services/notifications/notifiable_action/send.rb | 4 ++-- .../notifications/reactions/reaction_data.rb | 2 +- app/services/notifications/reactions/send.rb | 4 ++-- app/services/notifications/remove_all.rb | 4 ++-- app/services/notifications/remove_all_by_action.rb | 4 ++-- .../tag_adjustment_notification/send.rb | 4 ++-- app/services/notifications/update.rb | 4 ++-- .../notifications/welcome_notification/send.rb | 4 ++-- app/services/podcasts/create_episode.rb | 4 ++-- app/services/podcasts/get_media_url.rb | 4 ++-- app/services/podcasts/update_episode_media_url.rb | 4 ++-- app/services/slack/announcer.rb | 4 ++-- .../slack/messengers/article_fetched_feed.rb | 4 ++-- app/services/slack/messengers/comment_user_warned.rb | 4 ++-- app/services/slack/messengers/feedback.rb | 4 ++-- app/services/slack/messengers/note.rb | 4 ++-- app/services/slack/messengers/potential_spammer.rb | 4 ++-- app/services/slack/messengers/reaction_vomit.rb | 4 ++-- app/services/slack/messengers/sponsorship.rb | 4 ++-- .../create_from_controller_params.rb | 4 ++-- .../is_subscribed_cache_checker.rb | 4 ++-- app/services/users/delete.rb | 4 ++-- app/services/users/remove_role.rb | 4 ++-- app/services/webhook/dispatch_event.rb | 4 ++-- bin/knapsack_pro_rspec | 1 + spec/services/articles/suggest_spec.rb | 3 ++- spec/services/push_notifications/send_spec.rb | 12 ++++++------ spec/services/slack/announcer_spec.rb | 4 ++-- .../slack/messengers/article_fetched_feed_spec.rb | 4 ++-- .../slack/messengers/article_published_spec.rb | 4 ++-- .../slack/messengers/comment_user_warned_spec.rb | 4 ++-- spec/services/slack/messengers/feedback_spec.rb | 12 ++++++------ spec/services/slack/messengers/note_spec.rb | 4 ++-- .../slack/messengers/potential_spammer_spec.rb | 4 ++-- .../services/slack/messengers/reaction_vomit_spec.rb | 4 ++-- spec/services/slack/messengers/sponsorship_spec.rb | 6 +++--- spec/services/users/delete_spec.rb | 4 ++-- spec/services/users/remove_role_spec.rb | 10 +++++----- 60 files changed, 127 insertions(+), 125 deletions(-) diff --git a/app/services/articles/builder.rb b/app/services/articles/builder.rb index b6c3a6b76..6419a304f 100644 --- a/app/services/articles/builder.rb +++ b/app/services/articles/builder.rb @@ -10,8 +10,8 @@ module Articles @editor_version2 = @user&.editor_version == "v2" end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end # the Builder returns a pair of [article, needs_authorization?] diff --git a/app/services/articles/creator.rb b/app/services/articles/creator.rb index ccfdb3d04..9c2ab2aef 100644 --- a/app/services/articles/creator.rb +++ b/app/services/articles/creator.rb @@ -6,8 +6,8 @@ module Articles @event_dispatcher = event_dispatcher end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/articles/updater.rb b/app/services/articles/updater.rb index 7db230509..112b1953f 100644 --- a/app/services/articles/updater.rb +++ b/app/services/articles/updater.rb @@ -9,8 +9,8 @@ module Articles @event_dispatcher = event_dispatcher end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/authentication/authenticator.rb b/app/services/authentication/authenticator.rb index 113921fd3..f3456f5cd 100644 --- a/app/services/authentication/authenticator.rb +++ b/app/services/authentication/authenticator.rb @@ -20,8 +20,8 @@ module Authentication @cta_variant = cta_variant end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/broadcasts/welcome_notification/generator.rb b/app/services/broadcasts/welcome_notification/generator.rb index e9705f71f..8831f5031 100644 --- a/app/services/broadcasts/welcome_notification/generator.rb +++ b/app/services/broadcasts/welcome_notification/generator.rb @@ -6,8 +6,8 @@ module Broadcasts @notification_enqueued = false end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/chat_channels/create_with_users.rb b/app/services/chat_channels/create_with_users.rb index 3738d42b4..14749f86a 100644 --- a/app/services/chat_channels/create_with_users.rb +++ b/app/services/chat_channels/create_with_users.rb @@ -7,8 +7,8 @@ module ChatChannels @membership_role = membership_role end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/chat_channels/find_or_create.rb b/app/services/chat_channels/find_or_create.rb index 2ff214b54..e98c31bd8 100644 --- a/app/services/chat_channels/find_or_create.rb +++ b/app/services/chat_channels/find_or_create.rb @@ -6,8 +6,8 @@ module ChatChannels @contrived_name = contrived_name end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/chat_channels/send_invitation.rb b/app/services/chat_channels/send_invitation.rb index 49ba53240..a2a9cdd9c 100644 --- a/app/services/chat_channels/send_invitation.rb +++ b/app/services/chat_channels/send_invitation.rb @@ -8,8 +8,8 @@ module ChatChannels @chat_channel = chat_channel end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/chat_channels/update_channel.rb b/app/services/chat_channels/update_channel.rb index 3129b9fd5..f82ee6fc0 100644 --- a/app/services/chat_channels/update_channel.rb +++ b/app/services/chat_channels/update_channel.rb @@ -7,8 +7,8 @@ module ChatChannels @params = params end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/credits/buyer.rb b/app/services/credits/buyer.rb index 549276e74..bdd898a60 100644 --- a/app/services/credits/buyer.rb +++ b/app/services/credits/buyer.rb @@ -6,8 +6,8 @@ module Credits @cost = cost end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/credits/ledger.rb b/app/services/credits/ledger.rb index f7b45b285..6b349d991 100644 --- a/app/services/credits/ledger.rb +++ b/app/services/credits/ledger.rb @@ -6,8 +6,8 @@ module Credits @user = user end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/exporter/service.rb b/app/services/exporter/service.rb index a7b34a56a..a27644298 100644 --- a/app/services/exporter/service.rb +++ b/app/services/exporter/service.rb @@ -18,7 +18,7 @@ module Exporter # export content with filenames EXPORTERS.each do |exporter| - files = exporter.new(user).export(config.fetch(exporter.name.demodulize.downcase.to_sym, {})) + files = exporter.new(user).export(**config.fetch(exporter.name.demodulize.downcase.to_sym, {})) files.each do |name, content| exports[name] = content end diff --git a/app/services/images/generate_social_image.rb b/app/services/images/generate_social_image.rb index 00078e6a7..8bc6ba909 100644 --- a/app/services/images/generate_social_image.rb +++ b/app/services/images/generate_social_image.rb @@ -45,7 +45,7 @@ module Images end def optimize_image(path) - Images::Optimizer.call("#{URL.url}/social_previews#{path}", OPTIMIZER_OPTIONS) + Images::Optimizer.call("#{URL.url}/social_previews#{path}", **OPTIMIZER_OPTIONS) end end end diff --git a/app/services/medium_article_retrieval_service.rb b/app/services/medium_article_retrieval_service.rb index 0fbdd9d54..a4a66ea60 100644 --- a/app/services/medium_article_retrieval_service.rb +++ b/app/services/medium_article_retrieval_service.rb @@ -5,8 +5,8 @@ class MediumArticleRetrievalService @url = url end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/mentions/create_all.rb b/app/services/mentions/create_all.rb index ada54cc0f..5f79030c5 100644 --- a/app/services/mentions/create_all.rb +++ b/app/services/mentions/create_all.rb @@ -4,8 +4,8 @@ module Mentions @notifiable = notifiable end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/milestone/send.rb b/app/services/notifications/milestone/send.rb index b20cb3c3f..b7f5c1d29 100644 --- a/app/services/notifications/milestone/send.rb +++ b/app/services/notifications/milestone/send.rb @@ -11,8 +11,8 @@ module Notifications @next_milestone = next_milestone end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/moderation/send.rb b/app/services/notifications/moderation/send.rb index b6ff287ea..f9654aa14 100644 --- a/app/services/notifications/moderation/send.rb +++ b/app/services/notifications/moderation/send.rb @@ -7,8 +7,8 @@ module Notifications @notifiable = notifiable end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end delegate :user_data, :comment_data, to: Notifications diff --git a/app/services/notifications/new_badge_achievement/send.rb b/app/services/notifications/new_badge_achievement/send.rb index db387104a..3fbb1b33c 100644 --- a/app/services/notifications/new_badge_achievement/send.rb +++ b/app/services/notifications/new_badge_achievement/send.rb @@ -8,8 +8,8 @@ module Notifications delegate :user_data, to: Notifications - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/new_comment/send.rb b/app/services/notifications/new_comment/send.rb index 759d46412..ad3f2706e 100644 --- a/app/services/notifications/new_comment/send.rb +++ b/app/services/notifications/new_comment/send.rb @@ -9,8 +9,8 @@ module Notifications delegate :user_data, :comment_data, to: Notifications - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/new_follower/follow_data.rb b/app/services/notifications/new_follower/follow_data.rb index 14c3ca290..a4d6711ad 100644 --- a/app/services/notifications/new_follower/follow_data.rb +++ b/app/services/notifications/new_follower/follow_data.rb @@ -12,7 +12,7 @@ module Notifications validates :followable_type, inclusion: { in: %w[User Organization] } validates :follower_id, numericality: { only_integer: true } - def initialize(*args, **kwargs) + def initialize(attributes) super raise DataError unless valid? end diff --git a/app/services/notifications/new_follower/send.rb b/app/services/notifications/new_follower/send.rb index a8da554a9..3df1bbb49 100644 --- a/app/services/notifications/new_follower/send.rb +++ b/app/services/notifications/new_follower/send.rb @@ -19,8 +19,8 @@ module Notifications delegate :user_data, to: Notifications - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/new_mention/send.rb b/app/services/notifications/new_mention/send.rb index f5208836a..55ddd908b 100644 --- a/app/services/notifications/new_mention/send.rb +++ b/app/services/notifications/new_mention/send.rb @@ -8,8 +8,8 @@ module Notifications @mention = mention end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/notifiable_action/send.rb b/app/services/notifications/notifiable_action/send.rb index 2f5c579df..107cc85ce 100644 --- a/app/services/notifications/notifiable_action/send.rb +++ b/app/services/notifications/notifiable_action/send.rb @@ -11,8 +11,8 @@ module Notifications delegate :user_data, :article_data, :organization_data, to: Notifications - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/reactions/reaction_data.rb b/app/services/notifications/reactions/reaction_data.rb index 9bb6dca1d..7eba21b00 100644 --- a/app/services/notifications/reactions/reaction_data.rb +++ b/app/services/notifications/reactions/reaction_data.rb @@ -12,7 +12,7 @@ module Notifications validates :reactable_type, inclusion: { in: %w[Article Comment] } validates :reactable_user_id, numericality: { only_integer: true } - def initialize(*args, **kwargs) + def initialize(attributes) super raise DataError unless valid? end diff --git a/app/services/notifications/reactions/send.rb b/app/services/notifications/reactions/send.rb index c388b9316..2e07c413c 100644 --- a/app/services/notifications/reactions/send.rb +++ b/app/services/notifications/reactions/send.rb @@ -16,8 +16,8 @@ module Notifications delegate :user_data, to: Notifications - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end # @return [OpenStruct, #action, #notification_id] diff --git a/app/services/notifications/remove_all.rb b/app/services/notifications/remove_all.rb index ff058f9e3..276010520 100644 --- a/app/services/notifications/remove_all.rb +++ b/app/services/notifications/remove_all.rb @@ -6,8 +6,8 @@ module Notifications @notifiable_collection = notifiable_type.constantize.where(id: notifiable_ids) end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/remove_all_by_action.rb b/app/services/notifications/remove_all_by_action.rb index 8fdd8577e..bf64b018e 100644 --- a/app/services/notifications/remove_all_by_action.rb +++ b/app/services/notifications/remove_all_by_action.rb @@ -7,8 +7,8 @@ module Notifications @action = action end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/tag_adjustment_notification/send.rb b/app/services/notifications/tag_adjustment_notification/send.rb index 32d348b4b..4e6906c13 100644 --- a/app/services/notifications/tag_adjustment_notification/send.rb +++ b/app/services/notifications/tag_adjustment_notification/send.rb @@ -6,8 +6,8 @@ module Notifications @tag_adjustment = tag_adjustment end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/update.rb b/app/services/notifications/update.rb index 5ae53317a..6d9e5ba96 100644 --- a/app/services/notifications/update.rb +++ b/app/services/notifications/update.rb @@ -7,8 +7,8 @@ module Notifications @action = action end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/notifications/welcome_notification/send.rb b/app/services/notifications/welcome_notification/send.rb index 34af72b32..7a6997f08 100644 --- a/app/services/notifications/welcome_notification/send.rb +++ b/app/services/notifications/welcome_notification/send.rb @@ -9,8 +9,8 @@ module Notifications delegate :user_data, to: Notifications - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/podcasts/create_episode.rb b/app/services/podcasts/create_episode.rb index c27244e0c..531188fd4 100644 --- a/app/services/podcasts/create_episode.rb +++ b/app/services/podcasts/create_episode.rb @@ -5,8 +5,8 @@ module Podcasts @item = item.is_a?(EpisodeRssItem) ? item : EpisodeRssItem.new(item) end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/podcasts/get_media_url.rb b/app/services/podcasts/get_media_url.rb index 4759dde5f..46bebbb8a 100644 --- a/app/services/podcasts/get_media_url.rb +++ b/app/services/podcasts/get_media_url.rb @@ -4,8 +4,8 @@ module Podcasts @enclosure_url = enclosure_url.to_s end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/podcasts/update_episode_media_url.rb b/app/services/podcasts/update_episode_media_url.rb index cbe280a06..c77f4395d 100644 --- a/app/services/podcasts/update_episode_media_url.rb +++ b/app/services/podcasts/update_episode_media_url.rb @@ -5,8 +5,8 @@ module Podcasts @enclosure_url = enclosure_url end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/slack/announcer.rb b/app/services/slack/announcer.rb index af9b9d7e7..d0ab85007 100644 --- a/app/services/slack/announcer.rb +++ b/app/services/slack/announcer.rb @@ -9,8 +9,8 @@ module Slack @icon_emoji = icon_emoji end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/slack/messengers/article_fetched_feed.rb b/app/services/slack/messengers/article_fetched_feed.rb index ea631c273..275808f11 100644 --- a/app/services/slack/messengers/article_fetched_feed.rb +++ b/app/services/slack/messengers/article_fetched_feed.rb @@ -10,8 +10,8 @@ module Slack @article = article end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/slack/messengers/comment_user_warned.rb b/app/services/slack/messengers/comment_user_warned.rb index b8f27c17b..74c7f147a 100644 --- a/app/services/slack/messengers/comment_user_warned.rb +++ b/app/services/slack/messengers/comment_user_warned.rb @@ -13,8 +13,8 @@ module Slack @user = comment.user end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/slack/messengers/feedback.rb b/app/services/slack/messengers/feedback.rb index 177809f38..4ca5674de 100644 --- a/app/services/slack/messengers/feedback.rb +++ b/app/services/slack/messengers/feedback.rb @@ -24,8 +24,8 @@ module Slack @message = message end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/slack/messengers/note.rb b/app/services/slack/messengers/note.rb index c5062ba04..dc329d9f7 100644 --- a/app/services/slack/messengers/note.rb +++ b/app/services/slack/messengers/note.rb @@ -17,8 +17,8 @@ module Slack @message = message end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/slack/messengers/potential_spammer.rb b/app/services/slack/messengers/potential_spammer.rb index e0c3a4c0c..8b80d94cd 100644 --- a/app/services/slack/messengers/potential_spammer.rb +++ b/app/services/slack/messengers/potential_spammer.rb @@ -9,8 +9,8 @@ module Slack @user = user end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/slack/messengers/reaction_vomit.rb b/app/services/slack/messengers/reaction_vomit.rb index b933e7c68..1b715428c 100644 --- a/app/services/slack/messengers/reaction_vomit.rb +++ b/app/services/slack/messengers/reaction_vomit.rb @@ -11,8 +11,8 @@ module Slack @reaction = reaction end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/slack/messengers/sponsorship.rb b/app/services/slack/messengers/sponsorship.rb index b850462ef..1b5fc4d95 100644 --- a/app/services/slack/messengers/sponsorship.rb +++ b/app/services/slack/messengers/sponsorship.rb @@ -12,8 +12,8 @@ module Slack @tag = tag end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/app/services/user_subscriptions/create_from_controller_params.rb b/app/services/user_subscriptions/create_from_controller_params.rb index 9f3bf449e..cf79751a6 100644 --- a/app/services/user_subscriptions/create_from_controller_params.rb +++ b/app/services/user_subscriptions/create_from_controller_params.rb @@ -6,8 +6,8 @@ module UserSubscriptions Response = Struct.new(:success, :data, :error, keyword_init: true) - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def initialize(user, user_subscription_params) diff --git a/app/services/user_subscriptions/is_subscribed_cache_checker.rb b/app/services/user_subscriptions/is_subscribed_cache_checker.rb index 2bc3d2ba1..a448a25bd 100644 --- a/app/services/user_subscriptions/is_subscribed_cache_checker.rb +++ b/app/services/user_subscriptions/is_subscribed_cache_checker.rb @@ -4,8 +4,8 @@ module UserSubscriptions class IsSubscribedCacheChecker attr_accessor :user, :source_type, :source_id - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def initialize(user, params) diff --git a/app/services/users/delete.rb b/app/services/users/delete.rb index ba09e97d7..fe72b23f7 100644 --- a/app/services/users/delete.rb +++ b/app/services/users/delete.rb @@ -15,8 +15,8 @@ module Users Rails.cache.delete("user-destroy-token-#{user.id}") end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end private diff --git a/app/services/users/remove_role.rb b/app/services/users/remove_role.rb index e7e1e46f8..b6a1e24ac 100644 --- a/app/services/users/remove_role.rb +++ b/app/services/users/remove_role.rb @@ -2,8 +2,8 @@ module Users class RemoveRole Response = Struct.new(:success, :error_message, keyword_init: true) - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def initialize(user:, role:, resource_type:, admin:) diff --git a/app/services/webhook/dispatch_event.rb b/app/services/webhook/dispatch_event.rb index bd89abe51..9c3fab000 100644 --- a/app/services/webhook/dispatch_event.rb +++ b/app/services/webhook/dispatch_event.rb @@ -5,8 +5,8 @@ module Webhook @record = record end - def self.call(*args) - new(*args).call + def self.call(...) + new(...).call end def call diff --git a/bin/knapsack_pro_rspec b/bin/knapsack_pro_rspec index 029371165..b00b8da8d 100755 --- a/bin/knapsack_pro_rspec +++ b/bin/knapsack_pro_rspec @@ -3,6 +3,7 @@ if [ "$KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC" = "" ]; then KNAPSACK_PRO_ENDPOINT=https://api-disabled-for-fork.knapsackpro.com \ KNAPSACK_PRO_MAX_REQUEST_RETRIES=0 \ KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC=disabled-for-fork \ + RUBYOPT="-W:deprecated"\ bundle exec rake knapsack_pro:rspec # use Regular Mode here always else bundle exec rake knapsack_pro:queue:rspec diff --git a/spec/services/articles/suggest_spec.rb b/spec/services/articles/suggest_spec.rb index 9ab54f1cb..e076ebca2 100644 --- a/spec/services/articles/suggest_spec.rb +++ b/spec/services/articles/suggest_spec.rb @@ -14,7 +14,8 @@ RSpec.describe Articles::Suggest, type: :service do expect(described_class.call(article).size).to eq(4) end - it "returns proper number of articles with post without tags" do + it "returns proper number of articles with post without tags", :flaky do + # Flaky because sometime it returns 3 instead of 4 create_list(:article, 5, tags: [], with_tags: false, featured: true) article = create(:article, featured: true, tag_list: "") expect(described_class.call(article).size).to eq(4) diff --git a/spec/services/push_notifications/send_spec.rb b/spec/services/push_notifications/send_spec.rb index 15fc40e83..fc8a31672 100644 --- a/spec/services/push_notifications/send_spec.rb +++ b/spec/services/push_notifications/send_spec.rb @@ -24,7 +24,7 @@ RSpec.describe PushNotifications::Send, type: :service do before { allow(FeatureFlag).to receive(:enabled?).with(:mobile_notifications).and_return(false) } it "does nothing if the feature flag is disabled" do - expect { described_class.call(params) } + expect { described_class.call(**params) } .not_to change { Rpush::Client::Redis::Notification.all.count } end end @@ -37,7 +37,7 @@ RSpec.describe PushNotifications::Send, type: :service do it "does nothing", :aggregate_failures do expect(user.devices.count).to eq(0) - expect { described_class.call(params) } + expect { described_class.call(**params) } .not_to change { Rpush::Client::Redis::Notification.all.count } end end @@ -51,7 +51,7 @@ RSpec.describe PushNotifications::Send, type: :service do end it "creates a notification and enqueues it" do - expect { described_class.call(params) } + expect { described_class.call(**params) } .to change { Rpush::Client::Redis::Notification.all.count }.by(1) .and change(PushNotifications::DeliverWorker.jobs, :size).by(1) end @@ -59,7 +59,7 @@ RSpec.describe PushNotifications::Send, type: :service do it "creates a single notification for each of the user's devices when they have multiple" do create(:device, user: user) - expect { described_class.call(params) } + expect { described_class.call(**params) } .to change { Rpush::Client::Redis::Notification.all.count }.by(2) .and change(PushNotifications::DeliverWorker.jobs, :size).by(1) end @@ -75,7 +75,7 @@ RSpec.describe PushNotifications::Send, type: :service do end it "creates a notification and enqueues it" do - expect { described_class.call(many_targets_params) } + expect { described_class.call(**many_targets_params) } .to change { Rpush::Client::Redis::Notification.all.count }.by(2) .and change { PushNotifications::DeliverWorker.jobs.size }.by(1) end @@ -83,7 +83,7 @@ RSpec.describe PushNotifications::Send, type: :service do it "creates a single notification for each of the user's devices when they have multiple" do create(:device, user: user) - expect { described_class.call(many_targets_params) } + expect { described_class.call(**many_targets_params) } .to change { Rpush::Client::Redis::Notification.all.count }.by(3) .and change { PushNotifications::DeliverWorker.jobs.size }.by(1) end diff --git a/spec/services/slack/announcer_spec.rb b/spec/services/slack/announcer_spec.rb index 7bd36b597..66e790f18 100644 --- a/spec/services/slack/announcer_spec.rb +++ b/spec/services/slack/announcer_spec.rb @@ -10,7 +10,7 @@ RSpec.describe Slack::Announcer, type: :service do username: "", icon_emoji: ":o:" } - expect(described_class.call(params)).to be_nil + expect(described_class.call(**params)).to be_nil expect(SlackClient).not_to have_received(:ping) end @@ -25,7 +25,7 @@ RSpec.describe Slack::Announcer, type: :service do icon_emoji: ":o:" } - described_class.call(params) + described_class.call(**params) expect(SlackClient).to have_received(:ping) .with(message, params.reject { |k| k == :message }) diff --git a/spec/services/slack/messengers/article_fetched_feed_spec.rb b/spec/services/slack/messengers/article_fetched_feed_spec.rb index 1d5947ca7..db5b66443 100644 --- a/spec/services/slack/messengers/article_fetched_feed_spec.rb +++ b/spec/services/slack/messengers/article_fetched_feed_spec.rb @@ -20,7 +20,7 @@ RSpec.describe Slack::Messengers::ArticleFetchedFeed, type: :service do it "contains the correct info", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last @@ -32,7 +32,7 @@ RSpec.describe Slack::Messengers::ArticleFetchedFeed, type: :service do it "messages the proper channel with the proper username and emoji", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last diff --git a/spec/services/slack/messengers/article_published_spec.rb b/spec/services/slack/messengers/article_published_spec.rb index cf5fe652d..0e2216dbd 100644 --- a/spec/services/slack/messengers/article_published_spec.rb +++ b/spec/services/slack/messengers/article_published_spec.rb @@ -30,7 +30,7 @@ RSpec.describe Slack::Messengers::ArticlePublished, type: :service do it "contains the correct info", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last @@ -46,7 +46,7 @@ RSpec.describe Slack::Messengers::ArticlePublished, type: :service do allow(SiteConfig).to receive(:article_published_slack_channel).and_return(channel) sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last diff --git a/spec/services/slack/messengers/comment_user_warned_spec.rb b/spec/services/slack/messengers/comment_user_warned_spec.rb index 86bbc3b20..b675d8042 100644 --- a/spec/services/slack/messengers/comment_user_warned_spec.rb +++ b/spec/services/slack/messengers/comment_user_warned_spec.rb @@ -19,7 +19,7 @@ RSpec.describe Slack::Messengers::CommentUserWarned, type: :service do it "contains the correct info", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last @@ -37,7 +37,7 @@ RSpec.describe Slack::Messengers::CommentUserWarned, type: :service do it "messages the proper channel with the proper username and emoji", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last diff --git a/spec/services/slack/messengers/feedback_spec.rb b/spec/services/slack/messengers/feedback_spec.rb index ba43d1727..3ff9f1bed 100644 --- a/spec/services/slack/messengers/feedback_spec.rb +++ b/spec/services/slack/messengers/feedback_spec.rb @@ -18,13 +18,13 @@ RSpec.describe Slack::Messengers::Feedback, type: :service do it "supports an anonymous report" do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end end it "contains user's details", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params.merge(user: user)) + described_class.call(**default_params.merge(user: user)) end message = get_argument_from_last_job("message") @@ -36,7 +36,7 @@ RSpec.describe Slack::Messengers::Feedback, type: :service do it "contains report information", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params.merge(user: user)) + described_class.call(**default_params.merge(user: user)) end message = get_argument_from_last_job("message") @@ -53,7 +53,7 @@ RSpec.describe Slack::Messengers::Feedback, type: :service do it "messages the proper channel with the proper username" do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end channel = get_argument_from_last_job("channel") @@ -65,7 +65,7 @@ RSpec.describe Slack::Messengers::Feedback, type: :service do it "uses the cry emoji for abuse reports" do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params.merge(type: "abuse-reports")) + described_class.call(**default_params.merge(type: "abuse-reports")) end icon_emoji = get_argument_from_last_job("icon_emoji") @@ -74,7 +74,7 @@ RSpec.describe Slack::Messengers::Feedback, type: :service do it "uses the robot face emoji for other reports" do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params.merge(type: "other")) + described_class.call(**default_params.merge(type: "other")) end icon_emoji = get_argument_from_last_job("icon_emoji") diff --git a/spec/services/slack/messengers/note_spec.rb b/spec/services/slack/messengers/note_spec.rb index 6ac1c00fa..fbf8dd0e0 100644 --- a/spec/services/slack/messengers/note_spec.rb +++ b/spec/services/slack/messengers/note_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Slack::Messengers::Note, type: :service do it "contains the correct info", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last @@ -32,7 +32,7 @@ RSpec.describe Slack::Messengers::Note, type: :service do it "messages the proper channel with the proper username and emoji", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last diff --git a/spec/services/slack/messengers/potential_spammer_spec.rb b/spec/services/slack/messengers/potential_spammer_spec.rb index 3eba28490..25073379f 100644 --- a/spec/services/slack/messengers/potential_spammer_spec.rb +++ b/spec/services/slack/messengers/potential_spammer_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Slack::Messengers::PotentialSpammer, type: :service do it "contains the correct info", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last @@ -18,7 +18,7 @@ RSpec.describe Slack::Messengers::PotentialSpammer, type: :service do it "messages the proper channel with the proper username and emoji", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last diff --git a/spec/services/slack/messengers/reaction_vomit_spec.rb b/spec/services/slack/messengers/reaction_vomit_spec.rb index e5e858b66..68c691127 100644 --- a/spec/services/slack/messengers/reaction_vomit_spec.rb +++ b/spec/services/slack/messengers/reaction_vomit_spec.rb @@ -15,7 +15,7 @@ RSpec.describe Slack::Messengers::ReactionVomit, type: :service do it "contains the correct info", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last @@ -29,7 +29,7 @@ RSpec.describe Slack::Messengers::ReactionVomit, type: :service do it "messages the proper channel with the proper username and emoji", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last diff --git a/spec/services/slack/messengers/sponsorship_spec.rb b/spec/services/slack/messengers/sponsorship_spec.rb index e560e443d..795350dba 100644 --- a/spec/services/slack/messengers/sponsorship_spec.rb +++ b/spec/services/slack/messengers/sponsorship_spec.rb @@ -20,7 +20,7 @@ RSpec.describe Slack::Messengers::Sponsorship, type: :service do it "contains the correct info for a regular sponsorship", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end message = get_argument_from_last_job("message") @@ -32,7 +32,7 @@ RSpec.describe Slack::Messengers::Sponsorship, type: :service do it "contains the correct info for a tag sponsorship", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params.merge(level: "tag", tag: tag)) + described_class.call(**default_params.merge(level: "tag", tag: tag)) end message = get_argument_from_last_job("message") @@ -45,7 +45,7 @@ RSpec.describe Slack::Messengers::Sponsorship, type: :service do it "messages the proper channel with the proper username and emoji", :aggregate_failures do sidekiq_assert_enqueued_jobs(1, only: Slack::Messengers::Worker) do - described_class.call(default_params) + described_class.call(**default_params) end job = sidekiq_enqueued_jobs(worker: Slack::Messengers::Worker).last diff --git a/spec/services/users/delete_spec.rb b/spec/services/users/delete_spec.rb index cd1d87e6f..cc8edb61d 100644 --- a/spec/services/users/delete_spec.rb +++ b/spec/services/users/delete_spec.rb @@ -151,7 +151,7 @@ RSpec.describe Users::Delete, type: :service do described_class.call(user) aggregate_failures "associations should exist" do kept_associations.each do |kept_association| - expect { kept_association.reload }.not_to raise_error, kept_association + expect { kept_association.reload }.not_to raise_error end end end @@ -163,7 +163,7 @@ RSpec.describe Users::Delete, type: :service do described_class.call(user) aggregate_failures "associations should not exist" do user_associations.each do |user_association| - expect { user_association.reload }.to raise_error(ActiveRecord::RecordNotFound), user_association + expect { user_association.reload }.to raise_error(ActiveRecord::RecordNotFound) end end end diff --git a/spec/services/users/remove_role_spec.rb b/spec/services/users/remove_role_spec.rb index f4bbdcc90..71a95206e 100644 --- a/spec/services/users/remove_role_spec.rb +++ b/spec/services/users/remove_role_spec.rb @@ -9,7 +9,7 @@ RSpec.describe Users::RemoveRole, type: :service do role = super_admin.roles.first.name.to_sym resource_type = nil args = { user: super_admin, role: role, resource_type: resource_type, admin: current_user } - role_removal = described_class.call(args) + role_removal = described_class.call(**args) expect(role_removal.success).to be false expect(role_removal.error_message).to eq "Super Admin roles cannot be removed." @@ -21,7 +21,7 @@ RSpec.describe Users::RemoveRole, type: :service do role = current_user.roles.first resource_type = nil args = { user: current_user, role: role, resource_type: resource_type, admin: current_user } - role_removal = described_class.call(args) + role_removal = described_class.call(**args) expect(role_removal.success).to be false expect(role_removal.error_message).to eq "Admins cannot remove roles from themselves." @@ -33,7 +33,7 @@ RSpec.describe Users::RemoveRole, type: :service do role = user.roles.first resource_type = nil args = { user: user, role: role, resource_type: resource_type, admin: current_user } - role_removal = described_class.call(args) + role_removal = described_class.call(**args) expect(role_removal.success).to be true expect(role_removal.error_message).to be_nil @@ -45,7 +45,7 @@ RSpec.describe Users::RemoveRole, type: :service do role = user.roles.first resource_type = "Comment" args = { user: user, role: role, resource_type: resource_type, admin: current_user } - role_removal = described_class.call(args) + role_removal = described_class.call(**args) expect(role_removal.success).to be true expect(role_removal.error_message).to be_nil @@ -56,7 +56,7 @@ RSpec.describe Users::RemoveRole, type: :service do user = create(:user) allow(user).to receive(:remove_role).and_raise(StandardError) args = { user: user, role: nil, resource_type: nil, admin: current_user } - role_removal = described_class.call(args) + role_removal = described_class.call(**args) expect(role_removal.success).to be false end