diff --git a/ee/app/services/gitlab_subscriptions/member_management/process_user_billable_promotion_service.rb b/ee/app/services/gitlab_subscriptions/member_management/process_user_billable_promotion_service.rb
index 3457facdc02d903e36b41599aefc67e00cd59dac..423f5bcac8ff13be37aad31347d3b0a26ce32fb1 100644
--- a/ee/app/services/gitlab_subscriptions/member_management/process_user_billable_promotion_service.rb
+++ b/ee/app/services/gitlab_subscriptions/member_management/process_user_billable_promotion_service.rb
@@ -68,11 +68,11 @@ def process_member_approval(member_approval)
source = get_source_from_member_namespace(member_approval.member_namespace)
params = member_approval_params(member_approval, source)
- Members::CreateService.new(current_user, params).execute
+ ::Members::CreateService.new(current_user, params).execute
end
def pending_approvals
- Members::MemberApproval.pending_member_approvals_for_user(user.id)
+ ::Members::MemberApproval.pending_member_approvals_for_user(user.id)
end
def all_promotions_failed?
diff --git a/ee/app/services/gitlab_subscriptions/member_management/queue_members_approval_service.rb b/ee/app/services/gitlab_subscriptions/member_management/queue_members_approval_service.rb
index 4fb060b4852c20f929d668e117bdc68085795d5b..00a10a4f2bef3a640e822f413f793881e4c623af 100644
--- a/ee/app/services/gitlab_subscriptions/member_management/queue_members_approval_service.rb
+++ b/ee/app/services/gitlab_subscriptions/member_management/queue_members_approval_service.rb
@@ -52,7 +52,7 @@ def queue_users_for_approval
metadata: params.slice(:access_level, :expires_at, :member_role_id)
}
- Members::MemberApproval.create_or_update_pending_approval(
+ ::Members::MemberApproval.create_or_update_pending_approval(
user, source_namespace, attributes
)
end
diff --git a/ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/member_management/process_user_billable_promotion_request_spec.rb b/ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/member_management/process_user_billable_promotion_request_spec.rb
index 7be1c7a1f00ce21bc94a995d4541754d5126db11..2ee95be2a6ef22a98273d8efb79c14080d335fbd 100644
--- a/ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/member_management/process_user_billable_promotion_request_spec.rb
+++ b/ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/member_management/process_user_billable_promotion_request_spec.rb
@@ -204,7 +204,7 @@
context 'when update! fails' do
before do
- allow(Members::MemberApproval).to receive_message_chain(:pending_member_approvals_for_user, :find_each)
+ allow(::Members::MemberApproval).to receive_message_chain(:pending_member_approvals_for_user, :find_each)
.and_yield(member_approval)
allow(member_approval).to receive(:update!).and_raise(ActiveRecord::RecordInvalid)
end
diff --git a/ee/spec/serializers/gitlab_subscriptions/member_management/member_approval_entity_spec.rb b/ee/spec/serializers/gitlab_subscriptions/member_management/member_approval_entity_spec.rb
index 50fae6749ad8c90156c79907362f1e7d77492b37..f4a1884f9207d3d6fb91d5aac7db1456f27b4b6e 100644
--- a/ee/spec/serializers/gitlab_subscriptions/member_management/member_approval_entity_spec.rb
+++ b/ee/spec/serializers/gitlab_subscriptions/member_management/member_approval_entity_spec.rb
@@ -25,7 +25,7 @@
describe 'when assigning the member presenter' do
it 'is only set once' do
- expect(Members::MemberApprovalPresenter).to receive(:new)
+ expect(::Members::MemberApprovalPresenter).to receive(:new)
.with(pending_member_approval)
.and_call_original
.once
diff --git a/ee/spec/services/ee/members/update_service_spec.rb b/ee/spec/services/ee/members/update_service_spec.rb
index 03afa7b39abef5c671f1dfc8a7bc8889ed6339aa..7a0af11119f21058bbbed6c22ebf74d742442a05 100644
--- a/ee/spec/services/ee/members/update_service_spec.rb
+++ b/ee/spec/services/ee/members/update_service_spec.rb
@@ -87,10 +87,10 @@
context 'when ActiveRecord::RecordInvalid is raised' do
it 'returns an error' do
- allow(Members::MemberApproval).to receive(:create_or_update_pending_approval)
+ allow(::Members::MemberApproval).to receive(:create_or_update_pending_approval)
.and_raise(ActiveRecord::RecordInvalid)
- expect { update_members }.not_to change { Members::MemberApproval.count }
+ expect { update_members }.not_to change { ::Members::MemberApproval.count }
expect(update_members[:status]).to eq(:error)
expect(update_members[:members].first.errors[:base].first).to eq(
"Unable to send approval request to administrator."
@@ -101,12 +101,12 @@
context 'when current_user can update the given members' do
it 'queues members requiring promotion management for approval and updates others' do
- expect { update_members }.to change { Members::MemberApproval.count }.by(1)
+ expect { update_members }.to change { ::Members::MemberApproval.count }.by(1)
expect(update_members[:status]).to eq(:success)
expect(update_members[:members]).to contain_exactly(members.second)
members.first.reload
- member_approval = Members::MemberApproval.last
+ member_approval = ::Members::MemberApproval.last
expect(member_approval.member).to eq(members.first)
expect(member_approval.member_namespace).to eq(members.first.member_namespace)
expect(member_approval.old_access_level).to eq(members.first.access_level)
diff --git a/ee/spec/services/gitlab_subscriptions/member_management/process_user_billable_promotion_service_spec.rb b/ee/spec/services/gitlab_subscriptions/member_management/process_user_billable_promotion_service_spec.rb
index 686b92526e740e36e002cb4c3b3aa5883c59a338..d10889ce5add01f840598c77ecdc2e411a23e34d 100644
--- a/ee/spec/services/gitlab_subscriptions/member_management/process_user_billable_promotion_service_spec.rb
+++ b/ee/spec/services/gitlab_subscriptions/member_management/process_user_billable_promotion_service_spec.rb
@@ -232,7 +232,7 @@
context 'when there is failure during update!' do
before do
- allow(Members::MemberApproval).to receive_message_chain(:pending_member_approvals_for_user, :find_each)
+ allow(::Members::MemberApproval).to receive_message_chain(:pending_member_approvals_for_user, :find_each)
.and_yield(member_approval).and_yield(another_member_approval)
allow(member_approval).to receive(:update!).and_raise(ActiveRecord::RecordInvalid)
end
diff --git a/ee/spec/services/gitlab_subscriptions/member_management/queue_members_approval_service_spec.rb b/ee/spec/services/gitlab_subscriptions/member_management/queue_members_approval_service_spec.rb
index 194ac9fe6e7c2f05933d84472b80f2bcb05fd1c2..3b653a035bbd090bfe75f0c155bd2787e4c67f8e 100644
--- a/ee/spec/services/gitlab_subscriptions/member_management/queue_members_approval_service_spec.rb
+++ b/ee/spec/services/gitlab_subscriptions/member_management/queue_members_approval_service_spec.rb
@@ -101,7 +101,7 @@
context 'when RecordInvalid is raised' do
before do
- allow(Members::MemberApproval).to receive(:create_or_update_pending_approval)
+ allow(::Members::MemberApproval).to receive(:create_or_update_pending_approval)
.and_raise(ActiveRecord::RecordInvalid)
end
@@ -110,7 +110,7 @@
context 'when RecordNotUnique is raised' do
before do
- allow(Members::MemberApproval).to receive(:create_or_update_pending_approval)
+ allow(::Members::MemberApproval).to receive(:create_or_update_pending_approval)
.and_raise(ActiveRecord::RecordNotUnique)
end
diff --git a/ee/spec/services/gitlab_subscriptions/member_management/queue_non_billable_to_billable_service_spec.rb b/ee/spec/services/gitlab_subscriptions/member_management/queue_non_billable_to_billable_service_spec.rb
index 87254a0238e358901ddedc5ba0e0b8618e9b8e74..13033860e95d9804d13cb1771988851427396e60 100644
--- a/ee/spec/services/gitlab_subscriptions/member_management/queue_non_billable_to_billable_service_spec.rb
+++ b/ee/spec/services/gitlab_subscriptions/member_management/queue_non_billable_to_billable_service_spec.rb
@@ -269,7 +269,7 @@
context 'when MemberApproval raises ActiveRecord::RecordInvalid' do
before do
add_non_billable_members(users_with_membership, source)
- allow(Members::MemberApproval).to receive(:create_or_update_pending_approval).and_raise(
+ allow(::Members::MemberApproval).to receive(:create_or_update_pending_approval).and_raise(
ActiveRecord::RecordInvalid
)
end
diff --git a/ee/spec/support/shared_examples/services/members/creator_service_billable_promotion_management_shared_examples.rb b/ee/spec/support/shared_examples/services/members/creator_service_billable_promotion_management_shared_examples.rb
index 2775e4f21ba81345b414a4b2fb5175468ca1c4ed..a3b1d89b878c5313e29d9d72b4446a54a88b69b2 100644
--- a/ee/spec/support/shared_examples/services/members/creator_service_billable_promotion_management_shared_examples.rb
+++ b/ee/spec/support/shared_examples/services/members/creator_service_billable_promotion_management_shared_examples.rb
@@ -55,7 +55,7 @@
member = nil
expect do
member = add_member
- end.to change { Members::MemberApproval.count }.by(1)
+ end.to change { ::Members::MemberApproval.count }.by(1)
expect(member.errors[:base].first).to eq("Request queued for administrator approval.")
end
@@ -63,7 +63,7 @@
shared_examples 'returns errored member when queuing fails' do
before do
- allow(Members::MemberApproval).to receive(:create_or_update_pending_approval)
+ allow(::Members::MemberApproval).to receive(:create_or_update_pending_approval)
.and_raise(ActiveRecord::RecordInvalid)
end
@@ -71,7 +71,7 @@
member = nil
expect do
member = add_member
- end.not_to change { Members::MemberApproval.count }
+ end.not_to change { ::Members::MemberApproval.count }
expect(member.errors[:base].first).to eq("Unable to send approval request to administrator.")
end
@@ -96,7 +96,7 @@
context 'with existing member' do
shared_examples "updates the members" do
it 'updates the member' do
- expect { add_member }.not_to change { Members::MemberApproval.count }
+ expect { add_member }.not_to change { ::Members::MemberApproval.count }
expect(existing_member.reload.access_level).to eq(Gitlab::Access.sym_options_with_owner[access_level])
end
end
@@ -172,7 +172,7 @@
expect do
members = add_members
- end.to change { Members::MemberApproval.count }.by(1)
+ end.to change { ::Members::MemberApproval.count }.by(1)
expect(members.first.errors[:base].first).to eq("Request queued for administrator approval.")
expect(members.second.access_level).to eq(Gitlab::Access.sym_options_with_owner[access_level])
@@ -193,7 +193,7 @@
expect do
members = add_members
- end.not_to change { Members::MemberApproval.count }
+ end.not_to change { ::Members::MemberApproval.count }
expect(members.first.access_level).to eq(Gitlab::Access.sym_options_with_owner[access_level])
expect(members.first.errors[:base]).to be_empty
@@ -215,7 +215,7 @@
expect do
members = add_members
- end.to change { Members::MemberApproval.count }.by(2)
+ end.to change { ::Members::MemberApproval.count }.by(2)
expect(members.first.errors[:base].first).to eq("Request queued for administrator approval.")
expect(members.second.errors[:base].first).to eq("Request queued for administrator approval.")