mirror of
https://github.com/discourse/discourse.git
synced 2025-02-20 11:48:26 -06:00
DEV: Don’t provide an array to site settings group lists in specs
This is extracted from https://github.com/discourse/discourse/pull/29129. In some chat specs, we provide an array as a value for group lists like `chat_allowed_groups`, which is wrong. This results in a value like `"1|2|[3]"` instead of `"1|2|3"`.
This commit is contained in:
parent
5d657c8c41
commit
93e02069b0
@ -20,7 +20,7 @@ describe Chat::ChannelFetcher do
|
|||||||
Chat::UserChatChannelMembership.where(user: user1)
|
Chat::UserChatChannelMembership.where(user: user1)
|
||||||
end
|
end
|
||||||
|
|
||||||
before { SiteSetting.chat_allowed_groups = [chatters] }
|
before { SiteSetting.chat_allowed_groups = chatters }
|
||||||
|
|
||||||
describe ".structured" do
|
describe ".structured" do
|
||||||
it "returns open channel only" do
|
it "returns open channel only" do
|
||||||
|
@ -10,7 +10,7 @@ RSpec.describe Chat::GuardianExtensions do
|
|||||||
let(:guardian) { Guardian.new(user) }
|
let(:guardian) { Guardian.new(user) }
|
||||||
let(:staff_guardian) { Guardian.new(staff) }
|
let(:staff_guardian) { Guardian.new(staff) }
|
||||||
|
|
||||||
before { SiteSetting.chat_allowed_groups = [chatters] }
|
before { SiteSetting.chat_allowed_groups = chatters }
|
||||||
|
|
||||||
describe "#can_chat?" do
|
describe "#can_chat?" do
|
||||||
context "when the user is not in allowed to chat" do
|
context "when the user is not in allowed to chat" do
|
||||||
|
@ -14,7 +14,7 @@ describe Chat::MessageBookmarkable do
|
|||||||
before do
|
before do
|
||||||
register_test_bookmarkable(described_class)
|
register_test_bookmarkable(described_class)
|
||||||
Chat::UserChatChannelMembership.create(chat_channel: channel, user: user, following: true)
|
Chat::UserChatChannelMembership.create(chat_channel: channel, user: user, following: true)
|
||||||
SiteSetting.chat_allowed_groups = [chatters]
|
SiteSetting.chat_allowed_groups = chatters
|
||||||
end
|
end
|
||||||
|
|
||||||
after { DiscoursePluginRegistry.reset_register!(:bookmarkables) }
|
after { DiscoursePluginRegistry.reset_register!(:bookmarkables) }
|
||||||
|
@ -60,7 +60,7 @@ describe ChatSDK::Message do
|
|||||||
|
|
||||||
context "when membership is enforced" do
|
context "when membership is enforced" do
|
||||||
it "works" do
|
it "works" do
|
||||||
SiteSetting.chat_allowed_groups = [Group::AUTO_GROUPS[:everyone]]
|
SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
|
||||||
params[:enforce_membership] = true
|
params[:enforce_membership] = true
|
||||||
params[:guardian] = Fabricate(:user).guardian
|
params[:guardian] = Fabricate(:user).guardian
|
||||||
|
|
||||||
@ -115,7 +115,7 @@ describe ChatSDK::Message do
|
|||||||
fab!(:message_1) { Fabricate(:chat_message, message: "first") }
|
fab!(:message_1) { Fabricate(:chat_message, message: "first") }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
SiteSetting.chat_allowed_groups = [Group::AUTO_GROUPS[:everyone]]
|
SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
|
||||||
message_1.chat_channel.add(message_1.user)
|
message_1.chat_channel.add(message_1.user)
|
||||||
message_1.update!(streaming: true)
|
message_1.update!(streaming: true)
|
||||||
end
|
end
|
||||||
|
@ -9,7 +9,7 @@ RSpec.describe Chat::Api::ChannelsMessagesFlagsController do
|
|||||||
before do
|
before do
|
||||||
SiteSetting.chat_enabled = true
|
SiteSetting.chat_enabled = true
|
||||||
SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
|
SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
|
||||||
SiteSetting.chat_message_flag_allowed_groups = [Group::AUTO_GROUPS[:everyone]]
|
SiteSetting.chat_message_flag_allowed_groups = Group::AUTO_GROUPS[:everyone]
|
||||||
sign_in(current_user)
|
sign_in(current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ RSpec.describe BookmarksController do
|
|||||||
|
|
||||||
before do
|
before do
|
||||||
register_test_bookmarkable(Chat::MessageBookmarkable)
|
register_test_bookmarkable(Chat::MessageBookmarkable)
|
||||||
SiteSetting.chat_allowed_groups = [chatters]
|
SiteSetting.chat_allowed_groups = chatters
|
||||||
sign_in(current_user)
|
sign_in(current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ RSpec.describe NotificationsController do
|
|||||||
before do
|
before do
|
||||||
Jobs.run_immediately!
|
Jobs.run_immediately!
|
||||||
SiteSetting.chat_enabled = true
|
SiteSetting.chat_enabled = true
|
||||||
SiteSetting.chat_allowed_groups = [chatters.id]
|
SiteSetting.chat_allowed_groups = chatters.id
|
||||||
sign_in(user)
|
sign_in(user)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ describe UsersController do
|
|||||||
|
|
||||||
before do
|
before do
|
||||||
register_test_bookmarkable(Chat::MessageBookmarkable)
|
register_test_bookmarkable(Chat::MessageBookmarkable)
|
||||||
SiteSetting.chat_allowed_groups = [chatters]
|
SiteSetting.chat_allowed_groups = chatters
|
||||||
sign_in(current_user)
|
sign_in(current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ RSpec.describe Chat::AutoRemove::HandleUserRemovedFromGroup do
|
|||||||
before do
|
before do
|
||||||
group_1.add(removed_user)
|
group_1.add(removed_user)
|
||||||
group_2.add(removed_user)
|
group_2.add(removed_user)
|
||||||
SiteSetting.chat_allowed_groups = group_1.id.to_s + "|" + group_2.id.to_s
|
SiteSetting.chat_allowed_groups = [group_1.id, group_2.id].join("|")
|
||||||
CategoryGroup.create(
|
CategoryGroup.create(
|
||||||
category: private_category,
|
category: private_category,
|
||||||
group: group_2,
|
group: group_2,
|
||||||
|
@ -244,7 +244,7 @@ RSpec.describe Chat::CreateMessage do
|
|||||||
fab!(:user) { Fabricate(:user) }
|
fab!(:user) { Fabricate(:user) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
SiteSetting.chat_allowed_groups = [Group::AUTO_GROUPS[:everyone]]
|
SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
|
||||||
params[:enforce_membership] = true
|
params[:enforce_membership] = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ RSpec.describe Chat::InviteUsersToChannel do
|
|||||||
|
|
||||||
before do
|
before do
|
||||||
group_1.add(user_1)
|
group_1.add(user_1)
|
||||||
SiteSetting.chat_allowed_groups = [group_1].map(&:id).join("|")
|
SiteSetting.chat_allowed_groups = group_1.id
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when all steps pass" do
|
context "when all steps pass" do
|
||||||
|
@ -13,7 +13,7 @@ RSpec.describe Chat::StopMessageStreaming do
|
|||||||
|
|
||||||
before do
|
before do
|
||||||
channel_1.add(current_user)
|
channel_1.add(current_user)
|
||||||
SiteSetting.chat_allowed_groups = [Group::AUTO_GROUPS[:everyone]]
|
SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
|
||||||
end
|
end
|
||||||
|
|
||||||
context "with valid params" do
|
context "with valid params" do
|
||||||
|
@ -20,7 +20,7 @@ RSpec.describe Chat::UpdateUserChannelLastRead do
|
|||||||
let(:guardian) { Guardian.new(current_user) }
|
let(:guardian) { Guardian.new(current_user) }
|
||||||
let(:params) { { guardian: guardian, channel_id: channel.id, message_id: message_1.id } }
|
let(:params) { { guardian: guardian, channel_id: channel.id, message_id: message_1.id } }
|
||||||
|
|
||||||
before { SiteSetting.chat_allowed_groups = [chatters] }
|
before { SiteSetting.chat_allowed_groups = chatters }
|
||||||
|
|
||||||
context "when params are not valid" do
|
context "when params are not valid" do
|
||||||
before { params.delete(:message_id) }
|
before { params.delete(:message_id) }
|
||||||
|
@ -26,7 +26,7 @@ RSpec.describe Chat::UpdateUserThreadLastRead do
|
|||||||
|
|
||||||
before do
|
before do
|
||||||
thread.add(current_user)
|
thread.add(current_user)
|
||||||
SiteSetting.chat_allowed_groups = [chatters]
|
SiteSetting.chat_allowed_groups = chatters
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when params are not valid" do
|
context "when params are not valid" do
|
||||||
|
Loading…
Reference in New Issue
Block a user