Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope

And create new Project#requesters, Group#requesters scopes.

Signed-off-by: Rémy Coutable <remy@rymai.me>

2 files changed, 6 insertions, 6 deletions

diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb
index ddc54108a7b..c34475976c6 100644
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
@@ -133,7 +133,7 @@ describe Groups::GroupMembersController do
 
           expect(response).to set_flash.to 'Your access request to the group has been withdrawn.'
           expect(response).to redirect_to(group_path(group))
-          expect(group.members.request).to be_empty
+          expect(group.requesters).to be_empty
           expect(group.users).not_to include user
         end
       end
@@ -153,7 +153,7 @@ describe Groups::GroupMembersController do
 
       expect(response).to set_flash.to 'Your request for access has been queued for review.'
       expect(response).to redirect_to(group_path(group))
-      expect(group.members.request.exists?(user_id: user)).to be_truthy
+      expect(group.requesters.exists?(user_id: user)).to be_truthy
       expect(group.users).not_to include user
     end
   end
@@ -175,7 +175,7 @@ describe Groups::GroupMembersController do
       let(:group_requester) { create(:user) }
       let(:member) do
         group.request_access(group_requester)
-        group.members.request.find_by(user_id: group_requester)
+        group.requesters.find_by(user_id: group_requester)
       end
 
       context 'when user does not have enough rights' do
diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb
index 29aaceb2302..5e2a8cf3849 100644
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
@@ -187,7 +187,7 @@ describe Projects::ProjectMembersController do
 
           expect(response).to set_flash.to 'Your access request to the project has been withdrawn.'
           expect(response).to redirect_to(namespace_project_path(project.namespace, project))
-          expect(project.members.request).to be_empty
+          expect(project.requesters).to be_empty
           expect(project.users).not_to include user
         end
       end
@@ -210,7 +210,7 @@ describe Projects::ProjectMembersController do
       expect(response).to redirect_to(
         namespace_project_path(project.namespace, project)
       )
-      expect(project.members.request.exists?(user_id: user)).to be_truthy
+      expect(project.requesters.exists?(user_id: user)).to be_truthy
       expect(project.users).not_to include user
     end
   end
@@ -233,7 +233,7 @@ describe Projects::ProjectMembersController do
       let(:team_requester) { create(:user) }
       let(:member) do
         project.request_access(team_requester)
-        project.members.request.find_by(user_id: team_requester.id)
+        project.requesters.find_by(user_id: team_requester.id)
       end
 
       context 'when user does not have enough rights' do