Commit 51f890d0 authored by Mark Chao's avatar Mark Chao

Merge branch '327120-add-invite-source-tracking-5' into 'master'

Add backend sources for inviting members to be recorded

See merge request gitlab-org/gitlab!62732
parents 2fee02e3 fc063540
...@@ -62,7 +62,7 @@ class Admin::GroupsController < Admin::ApplicationController ...@@ -62,7 +62,7 @@ class Admin::GroupsController < Admin::ApplicationController
def members_update def members_update
member_params = params.permit(:user_ids, :access_level, :expires_at) member_params = params.permit(:user_ids, :access_level, :expires_at)
result = Members::CreateService.new(current_user, member_params.merge(limit: -1, source: @group)).execute result = Members::CreateService.new(current_user, member_params.merge(limit: -1, source: @group, invite_source: 'admin-group-page')).execute
if result[:status] == :success if result[:status] == :success
redirect_to [:admin, @group], notice: _('Users were successfully added.') redirect_to [:admin, @group], notice: _('Users were successfully added.')
......
...@@ -6,7 +6,7 @@ module MembershipActions ...@@ -6,7 +6,7 @@ module MembershipActions
def create def create
create_params = params.permit(:user_ids, :access_level, :expires_at) create_params = params.permit(:user_ids, :access_level, :expires_at)
result = Members::CreateService.new(current_user, create_params.merge({ source: membershipable })).execute result = Members::CreateService.new(current_user, create_params.merge({ source: membershipable, invite_source: "#{source_type}-members-page" })).execute
if result[:status] == :success if result[:status] == :success
redirect_to members_page_url, notice: _('Users were successfully added.') redirect_to members_page_url, notice: _('Users were successfully added.')
......
...@@ -16,6 +16,7 @@ module Members ...@@ -16,6 +16,7 @@ module Members
end end
def execute def execute
validate_invite_source!
validate_invites! validate_invites!
add_members add_members
...@@ -33,6 +34,10 @@ module Members ...@@ -33,6 +34,10 @@ module Members
params[:user_ids] params[:user_ids]
end end
def validate_invite_source!
raise ArgumentError, s_('AddMember|No invite source provided.') unless invite_source.present?
end
def validate_invites! def validate_invites!
raise BlankInvitesError, blank_invites_message if invites.blank? raise BlankInvitesError, blank_invites_message if invites.blank?
...@@ -79,7 +84,7 @@ module Members ...@@ -79,7 +84,7 @@ module Members
end end
def invite_source def invite_source
params[:invite_source] || 'unknown' params[:invite_source]
end end
def tracking_property(member) def tracking_property(member)
......
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
module GroupInviteMembers module GroupInviteMembers
private private
def invite_members(group) def invite_members(group, invite_source:)
invite_params = { invite_params = {
source: group, source: group,
user_ids: emails_param[:emails]&.reject(&:blank?)&.join(','), user_ids: emails_param[:emails]&.reject(&:blank?)&.join(','),
access_level: Gitlab::Access::DEVELOPER access_level: Gitlab::Access::DEVELOPER,
invite_source: invite_source
} }
result = Members::CreateService.new(current_user, invite_params).execute result = Members::CreateService.new(current_user, invite_params).execute
......
...@@ -115,7 +115,7 @@ module EE ...@@ -115,7 +115,7 @@ module EE
def successful_creation_hooks def successful_creation_hooks
super super
invite_members(group) invite_members(group, invite_source: 'group-creation-page')
end end
end end
end end
...@@ -39,7 +39,8 @@ module Registrations ...@@ -39,7 +39,8 @@ module Registrations
{ {
source: group, source: group,
user_ids: emails_param[:emails]&.reject(&:blank?)&.join(','), user_ids: emails_param[:emails]&.reject(&:blank?)&.join(','),
access_level: Gitlab::Access::DEVELOPER access_level: Gitlab::Access::DEVELOPER,
invite_source: 'registrations-group-invite'
} }
end end
......
...@@ -71,12 +71,19 @@ RSpec.describe 'view group invites' do ...@@ -71,12 +71,19 @@ RSpec.describe 'view group invites' do
let(:valid_emails) { %w[a@a.a b@b.b] } let(:valid_emails) { %w[a@a.a b@b.b] }
let(:group_params) { { group_id: group.id, emails: valid_emails + ['', '', 'x', 'y'] } } let(:group_params) { { group_id: group.id, emails: valid_emails + ['', '', 'x', 'y'] } }
it 'adds users with developer access and ignores blank and invalid emails', :aggregate_failures do it 'adds users with developer access and ignores blank and invalid emails', :aggregate_failures, :snowplow do
post_request post_request
invited_members = group.members.invite invited_members = group.members.invite
expect(invited_members.pluck(:invite_email)).to match_array(valid_emails) expect(invited_members.pluck(:invite_email)).to match_array(valid_emails)
expect(invited_members.pluck(:access_level).uniq).to match([Gitlab::Access::DEVELOPER]) expect(invited_members.pluck(:access_level).uniq).to match([Gitlab::Access::DEVELOPER])
expect_snowplow_event(
category: 'Members::CreateService',
action: 'create_member',
label: 'registrations-group-invite',
property: 'net_new_user',
user: user
)
end end
it 'tracks experiment as expected', :experiment do it 'tracks experiment as expected', :experiment do
......
...@@ -10,7 +10,13 @@ RSpec.describe Members::CreateService do ...@@ -10,7 +10,13 @@ RSpec.describe Members::CreateService do
let_it_be(:subgroup_project) { create(:project, group: subgroup) } let_it_be(:subgroup_project) { create(:project, group: subgroup) }
let_it_be(:project_users) { create_list(:user, 2) } let_it_be(:project_users) { create_list(:user, 2) }
let(:params) { { user_ids: project_users.map(&:id).join(','), access_level: Gitlab::Access::GUEST } } let(:params) do
{
user_ids: project_users.map(&:id).join(','),
access_level: Gitlab::Access::GUEST,
invite_source: '_invite_source_'
}
end
subject { described_class.new(user, params.merge({ source: project })).execute } subject { described_class.new(user, params.merge({ source: project })).execute }
......
...@@ -9,7 +9,7 @@ RSpec.describe Members::InviteService, :aggregate_failures do ...@@ -9,7 +9,7 @@ RSpec.describe Members::InviteService, :aggregate_failures do
let_it_be(:subgroup) { create(:group, parent: root_ancestor) } let_it_be(:subgroup) { create(:group, parent: root_ancestor) }
let_it_be(:subgroup_project) { create(:project, group: subgroup) } let_it_be(:subgroup_project) { create(:project, group: subgroup) }
let(:base_params) { { access_level: Gitlab::Access::GUEST, source: project } } let(:base_params) { { access_level: Gitlab::Access::GUEST, source: project, invite_source: '_invite_source_' } }
let(:params) { { email: %w[email@example.org email2@example.org] } } let(:params) { { email: %w[email@example.org email2@example.org] } }
subject(:result) { described_class.new(user, base_params.merge(params)).execute } subject(:result) { described_class.new(user, base_params.merge(params)).execute }
......
...@@ -33,6 +33,13 @@ RSpec.shared_examples GroupInviteMembers do ...@@ -33,6 +33,13 @@ RSpec.shared_examples GroupInviteMembers do
subject subject
expect_snowplow_event(category: anything, action: 'invite_members', label: 'new_group_form', user: user) expect_snowplow_event(category: anything, action: 'invite_members', label: 'new_group_form', user: user)
expect_snowplow_event(
category: 'Members::CreateService',
action: 'create_member',
label: 'group-creation-page',
property: 'net_new_user',
user: user
)
end end
end end
end end
......
...@@ -2095,6 +2095,9 @@ msgstr "" ...@@ -2095,6 +2095,9 @@ msgstr ""
msgid "AddMember|Invite limit of %{daily_invites} per day exceeded" msgid "AddMember|Invite limit of %{daily_invites} per day exceeded"
msgstr "" msgstr ""
msgid "AddMember|No invite source provided."
msgstr ""
msgid "AddMember|No users specified." msgid "AddMember|No users specified."
msgstr "" msgstr ""
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
require 'spec_helper' require 'spec_helper'
RSpec.describe Admin::GroupsController do RSpec.describe Admin::GroupsController do
let(:group) { create(:group) } let_it_be(:group) { create(:group) }
let(:project) { create(:project, namespace: group) } let_it_be(:project) { create(:project, namespace: group) }
let(:admin) { create(:admin) } let_it_be(:admin) { create(:admin) }
before do before do
sign_in(admin) sign_in(admin)
...@@ -46,9 +46,9 @@ RSpec.describe Admin::GroupsController do ...@@ -46,9 +46,9 @@ RSpec.describe Admin::GroupsController do
end end
describe 'PUT #members_update' do describe 'PUT #members_update' do
let(:group_user) { create(:user) } let_it_be(:group_user) { create(:user) }
it 'adds user to members' do it 'adds user to members', :aggregate_failures, :snowplow do
put :members_update, params: { put :members_update, params: {
id: group, id: group,
user_ids: group_user.id, user_ids: group_user.id,
...@@ -58,9 +58,16 @@ RSpec.describe Admin::GroupsController do ...@@ -58,9 +58,16 @@ RSpec.describe Admin::GroupsController do
expect(controller).to set_flash.to 'Users were successfully added.' expect(controller).to set_flash.to 'Users were successfully added.'
expect(response).to redirect_to(admin_group_path(group)) expect(response).to redirect_to(admin_group_path(group))
expect(group.users).to include group_user expect(group.users).to include group_user
expect_snowplow_event(
category: 'Members::CreateService',
action: 'create_member',
label: 'admin-group-page',
property: 'existing_user',
user: admin
)
end end
it 'can add unlimited members' do it 'can add unlimited members', :aggregate_failures do
put :members_update, params: { put :members_update, params: {
id: group, id: group,
user_ids: 1.upto(1000).to_a.join(','), user_ids: 1.upto(1000).to_a.join(','),
...@@ -71,7 +78,7 @@ RSpec.describe Admin::GroupsController do ...@@ -71,7 +78,7 @@ RSpec.describe Admin::GroupsController do
expect(response).to redirect_to(admin_group_path(group)) expect(response).to redirect_to(admin_group_path(group))
end end
it 'adds no user to members' do it 'adds no user to members', :aggregate_failures do
put :members_update, params: { put :members_update, params: {
id: group, id: group,
user_ids: '', user_ids: '',
......
...@@ -17,7 +17,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -17,7 +17,7 @@ RSpec.describe Groups::GroupMembersController do
end end
describe 'GET index' do describe 'GET index' do
it 'renders index with 200 status code' do it 'renders index with 200 status code', :aggregate_failures do
get :index, params: { group_id: group } get :index, params: { group_id: group }
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
...@@ -118,7 +118,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -118,7 +118,7 @@ RSpec.describe Groups::GroupMembersController do
group.add_developer(user) group.add_developer(user)
end end
it 'returns 403' do it 'returns 403', :aggregate_failures do
post :create, params: { post :create, params: {
group_id: group, group_id: group,
user_ids: group_user.id, user_ids: group_user.id,
...@@ -135,7 +135,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -135,7 +135,7 @@ RSpec.describe Groups::GroupMembersController do
group.add_owner(user) group.add_owner(user)
end end
it 'adds user to members' do it 'adds user to members', :aggregate_failures, :snowplow do
post :create, params: { post :create, params: {
group_id: group, group_id: group,
user_ids: group_user.id, user_ids: group_user.id,
...@@ -145,9 +145,16 @@ RSpec.describe Groups::GroupMembersController do ...@@ -145,9 +145,16 @@ RSpec.describe Groups::GroupMembersController do
expect(controller).to set_flash.to 'Users were successfully added.' expect(controller).to set_flash.to 'Users were successfully added.'
expect(response).to redirect_to(group_group_members_path(group)) expect(response).to redirect_to(group_group_members_path(group))
expect(group.users).to include group_user expect(group.users).to include group_user
expect_snowplow_event(
category: 'Members::CreateService',
action: 'create_member',
label: 'group-members-page',
property: 'existing_user',
user: user
)
end end
it 'adds no user to members' do it 'adds no user to members', :aggregate_failures do
post :create, params: { post :create, params: {
group_id: group, group_id: group,
user_ids: '', user_ids: '',
...@@ -177,7 +184,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -177,7 +184,7 @@ RSpec.describe Groups::GroupMembersController do
context 'when set to a date in the past' do context 'when set to a date in the past' do
let(:expires_at) { 2.days.ago } let(:expires_at) { 2.days.ago }
it 'does not add user to members' do it 'does not add user to members', :aggregate_failures do
subject subject
expect(flash[:alert]).to include('Expires at cannot be a date in the past') expect(flash[:alert]).to include('Expires at cannot be a date in the past')
...@@ -189,7 +196,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -189,7 +196,7 @@ RSpec.describe Groups::GroupMembersController do
context 'when set to a date in the future' do context 'when set to a date in the future' do
let(:expires_at) { 5.days.from_now } let(:expires_at) { 5.days.from_now }
it 'adds user to members' do it 'adds user to members', :aggregate_failures do
subject subject
expect(controller).to set_flash.to 'Users were successfully added.' expect(controller).to set_flash.to 'Users were successfully added.'
...@@ -326,7 +333,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -326,7 +333,7 @@ RSpec.describe Groups::GroupMembersController do
group.add_developer(user) group.add_developer(user)
end end
it 'returns 403' do it 'returns 403', :aggregate_failures do
delete :destroy, params: { group_id: group, id: member } delete :destroy, params: { group_id: group, id: member }
expect(response).to have_gitlab_http_status(:forbidden) expect(response).to have_gitlab_http_status(:forbidden)
...@@ -339,7 +346,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -339,7 +346,7 @@ RSpec.describe Groups::GroupMembersController do
group.add_owner(user) group.add_owner(user)
end end
it '[HTML] removes user from members' do it '[HTML] removes user from members', :aggregate_failures do
delete :destroy, params: { group_id: group, id: member } delete :destroy, params: { group_id: group, id: member }
expect(controller).to set_flash.to 'User was successfully removed from group.' expect(controller).to set_flash.to 'User was successfully removed from group.'
...@@ -348,7 +355,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -348,7 +355,7 @@ RSpec.describe Groups::GroupMembersController do
expect(sub_group.members).to include sub_member expect(sub_group.members).to include sub_member
end end
it '[HTML] removes user from members including subgroups and projects' do it '[HTML] removes user from members including subgroups and projects', :aggregate_failures do
delete :destroy, params: { group_id: group, id: member, remove_sub_memberships: true } delete :destroy, params: { group_id: group, id: member, remove_sub_memberships: true }
expect(controller).to set_flash.to 'User was successfully removed from group and any subgroups and projects.' expect(controller).to set_flash.to 'User was successfully removed from group and any subgroups and projects.'
...@@ -357,7 +364,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -357,7 +364,7 @@ RSpec.describe Groups::GroupMembersController do
expect(sub_group.members).not_to include sub_member expect(sub_group.members).not_to include sub_member
end end
it '[JS] removes user from members' do it '[JS] removes user from members', :aggregate_failures do
delete :destroy, params: { group_id: group, id: member }, xhr: true delete :destroy, params: { group_id: group, id: member }, xhr: true
expect(response).to be_successful expect(response).to be_successful
...@@ -386,7 +393,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -386,7 +393,7 @@ RSpec.describe Groups::GroupMembersController do
group.add_developer(user) group.add_developer(user)
end end
it 'removes user from members' do it 'removes user from members', :aggregate_failures do
delete :leave, params: { group_id: group } delete :leave, params: { group_id: group }
expect(controller).to set_flash.to "You left the \"#{group.name}\" group." expect(controller).to set_flash.to "You left the \"#{group.name}\" group."
...@@ -394,7 +401,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -394,7 +401,7 @@ RSpec.describe Groups::GroupMembersController do
expect(group.users).not_to include user expect(group.users).not_to include user
end end
it 'supports json request' do it 'supports json request', :aggregate_failures do
delete :leave, params: { group_id: group }, format: :json delete :leave, params: { group_id: group }, format: :json
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
...@@ -421,7 +428,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -421,7 +428,7 @@ RSpec.describe Groups::GroupMembersController do
group.request_access(user) group.request_access(user)
end end
it 'removes user from members' do it 'removes user from members', :aggregate_failures do
delete :leave, params: { group_id: group } delete :leave, params: { group_id: group }
expect(controller).to set_flash.to 'Your access request to the group has been withdrawn.' expect(controller).to set_flash.to 'Your access request to the group has been withdrawn.'
...@@ -438,7 +445,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -438,7 +445,7 @@ RSpec.describe Groups::GroupMembersController do
sign_in(user) sign_in(user)
end end
it 'creates a new GroupMember that is not a team member' do it 'creates a new GroupMember that is not a team member', :aggregate_failures do
post :request_access, params: { group_id: group } post :request_access, params: { group_id: group }
expect(controller).to set_flash.to 'Your request for access has been queued for review.' expect(controller).to set_flash.to 'Your request for access has been queued for review.'
...@@ -469,7 +476,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -469,7 +476,7 @@ RSpec.describe Groups::GroupMembersController do
group.add_developer(user) group.add_developer(user)
end end
it 'returns 403' do it 'returns 403', :aggregate_failures do
post :approve_access_request, params: { group_id: group, id: member } post :approve_access_request, params: { group_id: group, id: member }
expect(response).to have_gitlab_http_status(:forbidden) expect(response).to have_gitlab_http_status(:forbidden)
...@@ -482,7 +489,7 @@ RSpec.describe Groups::GroupMembersController do ...@@ -482,7 +489,7 @@ RSpec.describe Groups::GroupMembersController do
group.add_owner(user) group.add_owner(user)
end end
it 'adds user to members' do it 'adds user to members', :aggregate_failures do
post :approve_access_request, params: { group_id: group, id: member } post :approve_access_request, params: { group_id: group, id: member }
expect(response).to redirect_to(group_group_members_path(group)) expect(response).to redirect_to(group_group_members_path(group))
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
require('spec_helper') require('spec_helper')
RSpec.describe Projects::ProjectMembersController do RSpec.describe Projects::ProjectMembersController do
let(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:group) { create(:group, :public) } let_it_be(:group) { create(:group, :public) }
let(:project) { create(:project, :public) } let_it_be(:project, reload: true) { create(:project, :public) }
before do before do
travel_to DateTime.new(2019, 4, 1) travel_to DateTime.new(2019, 4, 1)
...@@ -24,8 +24,8 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -24,8 +24,8 @@ RSpec.describe Projects::ProjectMembersController do
context 'project members' do context 'project members' do
context 'when project belongs to group' do context 'when project belongs to group' do
let(:user_in_group) { create(:user) } let_it_be(:user_in_group) { create(:user) }
let(:project_in_group) { create(:project, :public, group: group) } let_it_be(:project_in_group) { create(:project, :public, group: group) }
before do before do
group.add_owner(user_in_group) group.add_owner(user_in_group)
...@@ -69,7 +69,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -69,7 +69,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
context 'group links' do context 'group links' do
let!(:project_group_link) { create(:project_group_link, project: project, group: group) } let_it_be(:project_group_link) { create(:project_group_link, project: project, group: group) }
it 'lists group links' do it 'lists group links' do
get :index, params: { namespace_id: project.namespace, project_id: project } get :index, params: { namespace_id: project.namespace, project_id: project }
...@@ -90,7 +90,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -90,7 +90,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
context 'invited members' do context 'invited members' do
let!(:invited_member) { create(:project_member, :invited, project: project) } let_it_be(:invited_member) { create(:project_member, :invited, project: project) }
before do before do
project.add_maintainer(user) project.add_maintainer(user)
...@@ -123,7 +123,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -123,7 +123,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
context 'access requests' do context 'access requests' do
let(:access_requester_user) { create(:user) } let_it_be(:access_requester_user) { create(:user) }
before do before do
project.request_access(access_requester_user) project.request_access(access_requester_user)
...@@ -158,7 +158,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -158,7 +158,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
describe 'POST create' do describe 'POST create' do
let(:project_user) { create(:user) } let_it_be(:project_user) { create(:user) }
before do before do
sign_in(user) sign_in(user)
...@@ -169,7 +169,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -169,7 +169,7 @@ RSpec.describe Projects::ProjectMembersController do
project.add_developer(user) project.add_developer(user)
end end
it 'returns 404' do it 'returns 404', :aggregate_failures do
post :create, params: { post :create, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
...@@ -187,11 +187,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -187,11 +187,7 @@ RSpec.describe Projects::ProjectMembersController do
project.add_maintainer(user) project.add_maintainer(user)
end end
it 'adds user to members' do it 'adds user to members', :aggregate_failures, :snowplow do
expect_next_instance_of(Members::CreateService) do |instance|
expect(instance).to receive(:execute).and_return(status: :success)
end
post :create, params: { post :create, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
...@@ -201,9 +197,17 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -201,9 +197,17 @@ RSpec.describe Projects::ProjectMembersController do
expect(controller).to set_flash.to 'Users were successfully added.' expect(controller).to set_flash.to 'Users were successfully added.'
expect(response).to redirect_to(project_project_members_path(project)) expect(response).to redirect_to(project_project_members_path(project))
expect(project.users).to include project_user
expect_snowplow_event(
category: 'Members::CreateService',
action: 'create_member',
label: 'project-members-page',
property: 'existing_user',
user: user
)
end end
it 'adds no user to members' do it 'adds no user to members', :aggregate_failures do
expect_next_instance_of(Members::CreateService) do |instance| expect_next_instance_of(Members::CreateService) do |instance|
expect(instance).to receive(:execute).and_return(status: :failure, message: 'Message') expect(instance).to receive(:execute).and_return(status: :failure, message: 'Message')
end end
...@@ -230,7 +234,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -230,7 +234,7 @@ RSpec.describe Projects::ProjectMembersController do
unrelated_project.add_maintainer(project_bot) unrelated_project.add_maintainer(project_bot)
end end
it 'returns error' do it 'returns error', :aggregate_failures do
post :create, params: { post :create, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
...@@ -261,7 +265,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -261,7 +265,7 @@ RSpec.describe Projects::ProjectMembersController do
context 'when set to a date in the past' do context 'when set to a date in the past' do
let(:expires_at) { 2.days.ago } let(:expires_at) { 2.days.ago }
it 'does not add user to members' do it 'does not add user to members', :aggregate_failures do
subject subject
expect(flash[:alert]).to include('Expires at cannot be a date in the past') expect(flash[:alert]).to include('Expires at cannot be a date in the past')
...@@ -273,7 +277,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -273,7 +277,7 @@ RSpec.describe Projects::ProjectMembersController do
context 'when set to a date in the future' do context 'when set to a date in the future' do
let(:expires_at) { 5.days.from_now } let(:expires_at) { 5.days.from_now }
it 'adds user to members' do it 'adds user to members', :aggregate_failures do
subject subject
expect(controller).to set_flash.to 'Users were successfully added.' expect(controller).to set_flash.to 'Users were successfully added.'
...@@ -285,7 +289,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -285,7 +289,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
describe 'PUT update' do describe 'PUT update' do
let(:requester) { create(:project_member, :access_request, project: project) } let_it_be(:requester) { create(:project_member, :access_request, project: project) }
before do before do
project.add_maintainer(user) project.add_maintainer(user)
...@@ -393,7 +397,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -393,7 +397,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
describe 'DELETE destroy' do describe 'DELETE destroy' do
let(:member) { create(:project_member, :developer, project: project) } let_it_be(:member) { create(:project_member, :developer, project: project) }
before do before do
sign_in(user) sign_in(user)
...@@ -417,7 +421,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -417,7 +421,7 @@ RSpec.describe Projects::ProjectMembersController do
project.add_developer(user) project.add_developer(user)
end end
it 'returns 404' do it 'returns 404', :aggregate_failures do
delete :destroy, params: { delete :destroy, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
...@@ -434,7 +438,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -434,7 +438,7 @@ RSpec.describe Projects::ProjectMembersController do
project.add_maintainer(user) project.add_maintainer(user)
end end
it '[HTML] removes user from members' do it '[HTML] removes user from members', :aggregate_failures do
delete :destroy, params: { delete :destroy, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
...@@ -447,7 +451,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -447,7 +451,7 @@ RSpec.describe Projects::ProjectMembersController do
expect(project.members).not_to include member expect(project.members).not_to include member
end end
it '[JS] removes user from members' do it '[JS] removes user from members', :aggregate_failures do
delete :destroy, params: { delete :destroy, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
...@@ -483,7 +487,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -483,7 +487,7 @@ RSpec.describe Projects::ProjectMembersController do
project.add_developer(user) project.add_developer(user)
end end
it 'removes user from members' do it 'removes user from members', :aggregate_failures do
delete :leave, params: { delete :leave, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project project_id: project
...@@ -517,7 +521,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -517,7 +521,7 @@ RSpec.describe Projects::ProjectMembersController do
project.request_access(user) project.request_access(user)
end end
it 'removes user from members' do it 'removes user from members', :aggregate_failures do
delete :leave, params: { delete :leave, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project project_id: project
...@@ -537,7 +541,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -537,7 +541,7 @@ RSpec.describe Projects::ProjectMembersController do
sign_in(user) sign_in(user)
end end
it 'creates a new ProjectMember that is not a team member' do it 'creates a new ProjectMember that is not a team member', :aggregate_failures do
post :request_access, params: { post :request_access, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project project_id: project
...@@ -553,7 +557,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -553,7 +557,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
describe 'POST approve' do describe 'POST approve' do
let(:member) { create(:project_member, :access_request, project: project) } let_it_be(:member) { create(:project_member, :access_request, project: project) }
before do before do
sign_in(user) sign_in(user)
...@@ -577,7 +581,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -577,7 +581,7 @@ RSpec.describe Projects::ProjectMembersController do
project.add_developer(user) project.add_developer(user)
end end
it 'returns 404' do it 'returns 404', :aggregate_failures do
post :approve_access_request, params: { post :approve_access_request, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
...@@ -594,7 +598,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -594,7 +598,7 @@ RSpec.describe Projects::ProjectMembersController do
project.add_maintainer(user) project.add_maintainer(user)
end end
it 'adds user to members' do it 'adds user to members', :aggregate_failures do
post :approve_access_request, params: { post :approve_access_request, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
...@@ -611,8 +615,8 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -611,8 +615,8 @@ RSpec.describe Projects::ProjectMembersController do
end end
describe 'POST apply_import' do describe 'POST apply_import' do
let(:another_project) { create(:project, :private) } let_it_be(:another_project) { create(:project, :private) }
let(:member) { create(:user) } let_it_be(:member) { create(:user) }
before do before do
project.add_maintainer(user) project.add_maintainer(user)
...@@ -637,7 +641,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -637,7 +641,7 @@ RSpec.describe Projects::ProjectMembersController do
include_context 'import applied' include_context 'import applied'
it 'imports source project members' do it 'imports source project members', :aggregate_failures do
expect(project.team_members).to include member expect(project.team_members).to include member
expect(controller).to set_flash.to 'Successfully imported' expect(controller).to set_flash.to 'Successfully imported'
expect(response).to redirect_to( expect(response).to redirect_to(
...@@ -660,7 +664,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -660,7 +664,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
describe 'POST create' do describe 'POST create' do
let(:stranger) { create(:user) } let_it_be(:stranger) { create(:user) }
context 'when creating owner' do context 'when creating owner' do
before do before do
...@@ -700,7 +704,7 @@ RSpec.describe Projects::ProjectMembersController do ...@@ -700,7 +704,7 @@ RSpec.describe Projects::ProjectMembersController do
end end
describe 'POST resend_invite' do describe 'POST resend_invite' do
let(:member) { create(:project_member, project: project) } let_it_be(:member) { create(:project_member, project: project) }
before do before do
project.add_maintainer(user) project.add_maintainer(user)
......
...@@ -8,7 +8,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ ...@@ -8,7 +8,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_
let_it_be(:member) { create(:user) } let_it_be(:member) { create(:user) }
let_it_be(:user_ids) { member.id.to_s } let_it_be(:user_ids) { member.id.to_s }
let_it_be(:access_level) { Gitlab::Access::GUEST } let_it_be(:access_level) { Gitlab::Access::GUEST }
let(:additional_params) { {} } let(:additional_params) { { invite_source: '_invite_source_' } }
let(:params) { { user_ids: user_ids, access_level: access_level }.merge(additional_params) } let(:params) { { user_ids: user_ids, access_level: access_level }.merge(additional_params) }
subject(:execute_service) { described_class.new(user, params.merge({ source: source })).execute } subject(:execute_service) { described_class.new(user, params.merge({ source: source })).execute }
...@@ -86,22 +86,16 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ ...@@ -86,22 +86,16 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_
context 'when tracking the invite source', :snowplow do context 'when tracking the invite source', :snowplow do
context 'when invite_source is not passed' do context 'when invite_source is not passed' do
let(:additional_params) { {} }
it 'tracks the invite source as unknown' do it 'tracks the invite source as unknown' do
execute_service expect { execute_service }.to raise_error(ArgumentError, 'No invite source provided.')
expect_snowplow_event( expect_no_snowplow_event
category: described_class.name,
action: 'create_member',
label: 'unknown',
property: 'existing_user',
user: user
)
end end
end end
context 'when invite_source is not passed' do context 'when invite_source is passed' do
let(:additional_params) { { invite_source: '_invite_source_' } }
it 'tracks the invite source from params' do it 'tracks the invite source from params' do
execute_service execute_service
...@@ -116,7 +110,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ ...@@ -116,7 +110,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_
end end
context 'when it is a net_new_user' do context 'when it is a net_new_user' do
let(:additional_params) { { user_ids: 'email@example.org' } } let(:additional_params) { { invite_source: '_invite_source_', user_ids: 'email@example.org' } }
it 'tracks the invite source from params' do it 'tracks the invite source from params' do
execute_service execute_service
...@@ -124,7 +118,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_ ...@@ -124,7 +118,7 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_
expect_snowplow_event( expect_snowplow_event(
category: described_class.name, category: described_class.name,
action: 'create_member', action: 'create_member',
label: 'unknown', label: '_invite_source_',
property: 'net_new_user', property: 'net_new_user',
user: user user: user
) )
......
...@@ -8,7 +8,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_ ...@@ -8,7 +8,7 @@ RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_
let_it_be(:project_user) { create(:user) } let_it_be(:project_user) { create(:user) }
let_it_be(:namespace) { project.namespace } let_it_be(:namespace) { project.namespace }
let(:params) { {} } let(:params) { {} }
let(:base_params) { { access_level: Gitlab::Access::GUEST, source: project } } let(:base_params) { { access_level: Gitlab::Access::GUEST, source: project, invite_source: '_invite_source_' } }
subject(:result) { described_class.new(user, base_params.merge(params) ).execute } subject(:result) { described_class.new(user, base_params.merge(params) ).execute }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment