mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-05 17:40:33 +08:00
595c5b3be3
#38125 attempted to do the entire performance update to group add users in one go, this is Pt 1 for splitting it into multiple, easier to digest PRs. The main goal for this PR is to change any additions to group members through one place. GroupUser callbacks intentionally left in place for this PR to not break the paths that create GroupUser directly. ### Details - Add new `GroupManager` class that will be the single source of truth for adding members to a group. - Modify the `bulk_add` and `bulk_remove` methods to handle all side-effects from the original callbacks. - Add other bulk methods in needed places (group_user, category_user, tag_user, group_action_logger) - Add tests for all the new paths - Fix tests that relied on group being saved before a member could be added (were using `Fabricate.build` and manually saving later) --------- Co-authored-by: Alan Guo Xiang Tan <gxtan1990@gmail.com>
86 lines
2.6 KiB
Ruby
86 lines
2.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
describe Guardian do
|
|
before { SiteSetting.data_explorer_enabled = true }
|
|
|
|
def make_query(group_ids = [])
|
|
query =
|
|
DiscourseDataExplorer::Query.create!(
|
|
name: "Query number #{Fabrication::Sequencer.sequence("query-id", 1)}",
|
|
sql: "SELECT 1",
|
|
)
|
|
|
|
group_ids.each { |group_id| query.query_groups.create!(group_id: group_id) }
|
|
|
|
query
|
|
end
|
|
|
|
fab!(:user)
|
|
fab!(:admin)
|
|
fab!(:group)
|
|
|
|
describe "#user_is_a_member_of_group?" do
|
|
it "is true when the user is an admin" do
|
|
expect(Guardian.new(admin).user_is_a_member_of_group?(group)).to eq(true)
|
|
end
|
|
|
|
it "is true when the user is not an admin, but is a member of the group" do
|
|
group.add(user)
|
|
|
|
expect(Guardian.new(user).user_is_a_member_of_group?(group)).to eq(true)
|
|
end
|
|
|
|
it "is false when the user is not an admin, and is not a member of the group" do
|
|
expect(Guardian.new(user).user_is_a_member_of_group?(group)).to eq(false)
|
|
end
|
|
end
|
|
|
|
describe "#user_can_access_query?" do
|
|
it "is true when the user is an admin" do
|
|
expect(Guardian.new(admin).user_can_access_query?(make_query)).to eq(true)
|
|
end
|
|
|
|
it "is false when the query has no group assignments" do
|
|
expect(Guardian.new(user).user_can_access_query?(make_query)).to eq(false)
|
|
end
|
|
|
|
it "is true when the user is a member of a group assigned to the query" do
|
|
query = make_query(["#{group.id}"])
|
|
group.add(user)
|
|
|
|
expect(Guardian.new(user).user_can_access_query?(query)).to eq(true)
|
|
end
|
|
|
|
it "is false when the user is not a member of any group assigned to the query" do
|
|
other_group = Fabricate(:group)
|
|
query = make_query(["#{other_group.id}"])
|
|
|
|
expect(Guardian.new(user).user_can_access_query?(query)).to eq(false)
|
|
end
|
|
end
|
|
|
|
describe "#group_and_user_can_access_query?" do
|
|
it "is true if the user is an admin" do
|
|
expect(Guardian.new(admin).group_and_user_can_access_query?(group, make_query)).to eq(true)
|
|
end
|
|
|
|
it "is true if the user is a member of the group, and query contains the group id" do
|
|
query = make_query(["#{group.id}"])
|
|
group.add(user)
|
|
|
|
expect(Guardian.new(user).group_and_user_can_access_query?(group, query)).to eq(true)
|
|
end
|
|
|
|
it "is false if the query does not contain the group id" do
|
|
group.add(user)
|
|
|
|
expect(Guardian.new(user).group_and_user_can_access_query?(group, make_query)).to eq(false)
|
|
end
|
|
|
|
it "is false if the user is not member of the group" do
|
|
query = make_query(["#{group.id}"])
|
|
|
|
expect(Guardian.new(user).group_and_user_can_access_query?(group, query)).to eq(false)
|
|
end
|
|
end
|
|
end
|
