1 files changed, 27 insertions, 28 deletions

diff --git a/spec/features/projects/members/group_members_spec.rb b/spec/features/projects/members/group_members_spec.rb
index 3060d2c6a43..aa15f04bf24 100644
--- a/spec/features/projects/members/group_members_spec.rb
+++ b/spec/features/projects/members/group_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Projects members' do
+RSpec.describe 'Projects members', :js do
   let(:user) { create(:user) }
   let(:developer) { create(:user) }
   let(:group) { create(:group, :public) }
@@ -66,62 +66,61 @@ RSpec.describe 'Projects members' do
     end
   end
 
-  context 'with a group and a project invitee' do
+  context 'with a group, a project invitee, and a project requester' do
     before do
+      group.request_access(group_requester)
+      project.request_access(project_requester)
       group_invitee
       project_invitee
       visit project_project_members_path(project)
     end
 
-    it 'shows the project invitee, the project developer, and the group owner' do
+    it 'shows the group owner' do
       page.within first('.content-list') do
-        expect(page).to have_content('test1@abc.com')
-        expect(page).not_to have_content('test2@abc.com')
-
-        # Project developer
-        expect(page).to have_content(developer.name)
-
         # Group owner
         expect(page).to have_content(user.name)
         expect(page).to have_content(group.name)
       end
     end
-  end
 
-  context 'with a group requester' do
-    before do
-      group.request_access(group_requester)
-      visit project_project_members_path(project)
+    it 'shows the project developer' do
+      page.within first('.content-list') do
+        # Project developer
+        expect(page).to have_content(developer.name)
+      end
     end
 
-    it 'does not appear in the project members page' do
+    it 'shows the project invitee' do
+      click_link 'Invited'
+
       page.within first('.content-list') do
+        expect(page).to have_content('test1@abc.com')
+        expect(page).not_to have_content('test2@abc.com')
+      end
+    end
+
+    it 'shows the project requester' do
+      click_link 'Access requests'
+
+      page.within first('.content-list') do
+        expect(page).to have_content(project_requester.name)
         expect(page).not_to have_content(group_requester.name)
       end
     end
   end
 
-  context 'with a group and a project requesters' do
+  context 'with a group requester' do
     before do
+      stub_feature_flags(invite_members_group_modal: false)
       group.request_access(group_requester)
-      project.request_access(project_requester)
       visit project_project_members_path(project)
     end
 
-    it 'shows the project requester, the project developer, and the group owner' do
+    it 'does not appear in the project members page' do
+      expect(page).not_to have_link('Access requests')
       page.within first('.content-list') do
-        expect(page).to have_content(project_requester.name)
         expect(page).not_to have_content(group_requester.name)
       end
-
-      page.within all('.content-list').last do
-        # Project developer
-        expect(page).to have_content(developer.name)
-
-        # Group owner
-        expect(page).to have_content(user.name)
-        expect(page).to have_content(group.name)
-      end
     end
   end