Skip to content
代码片段 群组 项目
未验证 提交 4fc7c4b4 编辑于 作者: Angelo Gulina's avatar Angelo Gulina 提交者: GitLab
浏览文件

No BSO e-mail if current user is Owner

上级 625cafce
No related branches found
No related tags found
无相关合并请求
......@@ -70,6 +70,9 @@ def check_seats!
def notify_owners(invites)
root_namespace = source.root_ancestor
return if root_namespace.owners.include?(current_user)
invited_user_ids = invites.select { |i| i.to_i.to_s == i }
return if invited_user_ids.empty?
......
......@@ -301,11 +301,9 @@
end
context 'with block seat overages enabled', :saas do
let_it_be(:owner) { create(:user) }
let_it_be(:user) { create(:user) }
let_it_be(:group) do
create(:group_with_plan, plan: :premium_plan).tap { |g| g.add_owner(owner) }
end
let_it_be(:owner) { create(:user) }
let_it_be(:group) { create(:group_with_plan, plan: :premium_plan) }
let_it_be(:project) { create(:project, group: group) }
......@@ -315,7 +313,7 @@
before do
stub_saas_features(gitlab_com_subscriptions: true)
stub_feature_flags(block_seat_overages: true)
group.add_owner(owner)
group.gitlab_subscription.update!(seats: 1)
end
......@@ -326,6 +324,20 @@
execute_service
end
context 'when current user is the owner' do
let_it_be(:owner) { user }
let_it_be(:group) { create(:group_with_plan, plan: :premium_plan) }
let_it_be(:project) { create(:project, group: group) }
let(:invites) { create(:user).id.to_s }
it 'does not notify the admin about the requested membership' do
expect(::Notify).not_to receive(:no_more_seats)
execute_service
end
end
context 'with invited emails' do
let(:invites) { ['email@example.com'] }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册