From 08fbcfc386cc4b540f34d9f04c4c5cbcda8d2a31 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Sat, 18 Mar 2023 19:05:42 +0100 Subject: [PATCH] remaining conflicts --- .../chat/app/controllers/chat/api/tracking_controller.rb | 2 +- .../services/{ => chat}/mark_all_user_channels_read_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename plugins/chat/spec/services/{ => chat}/mark_all_user_channels_read_spec.rb (97%) diff --git a/plugins/chat/app/controllers/chat/api/tracking_controller.rb b/plugins/chat/app/controllers/chat/api/tracking_controller.rb index c3b631dc78..1ae06665fe 100644 --- a/plugins/chat/app/controllers/chat/api/tracking_controller.rb +++ b/plugins/chat/app/controllers/chat/api/tracking_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Chat::Api::TrackingController < Chat::Api +class Chat::Api::TrackingController < Chat::ApiController def read params.permit(:channel_id, :message_id) diff --git a/plugins/chat/spec/services/mark_all_user_channels_read_spec.rb b/plugins/chat/spec/services/chat/mark_all_user_channels_read_spec.rb similarity index 97% rename from plugins/chat/spec/services/mark_all_user_channels_read_spec.rb rename to plugins/chat/spec/services/chat/mark_all_user_channels_read_spec.rb index 80b9e05c60..31adc20f29 100644 --- a/plugins/chat/spec/services/mark_all_user_channels_read_spec.rb +++ b/plugins/chat/spec/services/chat/mark_all_user_channels_read_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.describe Chat::Service::MarkAllUserChannelsRead do +RSpec.describe Chat::MarkAllUserChannelsRead do describe ".call" do subject(:result) { described_class.call(params) } @@ -78,12 +78,12 @@ RSpec.describe Chat::Service::MarkAllUserChannelsRead do let(:messages) { MessageBus.track_publish { result } } before do - ChatMention.create!( + Chat::Mention.create!( notification: notification_1, user: current_user, chat_message: message_1, ) - ChatMention.create!( + Chat::Mention.create!( notification: notification_2, user: current_user, chat_message: message_3,