osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remaining conflicts

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2023-03-18 19:05:42 +01:00
parent 5417dc7ab9
commit 08fbcfc386
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/chat/app/controllers/chat/api/tracking_controller.rb
View File

@ -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)

6
plugins/chat/spec/services/mark_all_user_channels_read_spec.rb → plugins/chat/spec/services/chat/mark_all_user_channels_read_spec.rb
View File

@ -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,