Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

8 files changed, 322 insertions, 819 deletions

diff --git a/spec/features/projects/members/anonymous_user_sees_members_spec.rb b/spec/features/projects/members/anonymous_user_sees_members_spec.rb
index d710ecf6c88..6b92581d704 100644
--- a/spec/features/projects/members/anonymous_user_sees_members_spec.rb
+++ b/spec/features/projects/members/anonymous_user_sees_members_spec.rb
@@ -14,25 +14,9 @@ RSpec.describe 'Projects > Members > Anonymous user sees members' do
     create(:project_group_link, project: project, group: group)
   end
 
-  context 'when `vue_project_members_list` feature flag is enabled', :js do
-    it "anonymous user visits the project's members page and sees the list of members" do
-      visit project_project_members_path(project)
+  it "anonymous user visits the project's members page and sees the list of members", :js do
+    visit project_project_members_path(project)
 
-      expect(find_member_row(user)).to have_content(user.name)
-    end
-  end
-
-  context 'when `vue_project_members_list` feature flag is disabled' do
-    before do
-      stub_feature_flags(vue_project_members_list: false)
-    end
-
-    it "anonymous user visits the project's members page and sees the list of members" do
-      visit project_project_members_path(project)
-
-      expect(current_path).to eq(
-        project_project_members_path(project))
-      expect(page).to have_content(user.name)
-    end
+    expect(find_member_row(user)).to have_content(user.name)
   end
 end
diff --git a/spec/features/projects/members/group_members_spec.rb b/spec/features/projects/members/group_members_spec.rb
index 1abd00421ec..94ce18fef93 100644
--- a/spec/features/projects/members/group_members_spec.rb
+++ b/spec/features/projects/members/group_members_spec.rb
@@ -20,218 +20,96 @@ RSpec.describe 'Projects members', :js do
     sign_in(user)
   end
 
-  context 'when `vue_project_members_list` feature flag is enabled' do
-    context 'with a group invitee' do
-      before do
-        group_invitee
-        visit project_project_members_path(project)
-      end
-
-      it 'does not appear in the project members page' do
-        expect(members_table).not_to have_content('test2@abc.com')
-      end
+  context 'with a group invitee' do
+    before do
+      group_invitee
+      visit project_project_members_path(project)
     end
 
-    context 'with a group' do
-      it 'shows group and project members by default' do
-        visit project_project_members_path(project)
-
-        expect(members_table).to have_content(developer.name)
-        expect(members_table).to have_content(user.name)
-        expect(members_table).to have_content(group.name)
-      end
-
-      it 'shows project members only if requested' do
-        visit project_project_members_path(project, with_inherited_permissions: 'exclude')
-
-        expect(members_table).to have_content(developer.name)
-        expect(members_table).not_to have_content(user.name)
-        expect(members_table).not_to have_content(group.name)
-      end
+    it 'does not appear in the project members page' do
+      expect(members_table).not_to have_content('test2@abc.com')
+    end
+  end
 
-      it 'shows group members only if requested' do
-        visit project_project_members_path(project, with_inherited_permissions: 'only')
+  context 'with a group' do
+    it 'shows group and project members by default' do
+      visit project_project_members_path(project)
 
-        expect(members_table).not_to have_content(developer.name)
-        expect(members_table).to have_content(user.name)
-        expect(members_table).to have_content(group.name)
-      end
+      expect(members_table).to have_content(developer.name)
+      expect(members_table).to have_content(user.name)
+      expect(members_table).to have_content(group.name)
     end
 
-    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 group owner' do
-        expect(members_table).to have_content(user.name)
-        expect(members_table).to have_content(group.name)
-      end
-
-      it 'shows the project developer' do
-        expect(members_table).to have_content(developer.name)
-      end
-
-      it 'shows the project invitee' do
-        click_link 'Invited'
-
-        expect(members_table).to have_content('test1@abc.com')
-        expect(members_table).not_to have_content('test2@abc.com')
-      end
-
-      it 'shows the project requester' do
-        click_link 'Access requests'
-
-        expect(members_table).to have_content(project_requester.name)
-        expect(members_table).not_to have_content(group_requester.name)
-      end
-    end
+    it 'shows project members only if requested' do
+      visit project_project_members_path(project, with_inherited_permissions: 'exclude')
 
-    context 'with a group requester' do
-      before do
-        stub_feature_flags(invite_members_group_modal: false)
-        group.request_access(group_requester)
-        visit project_project_members_path(project)
-      end
-
-      it 'does not appear in the project members page' do
-        expect(page).not_to have_link('Access requests')
-        expect(members_table).not_to have_content(group_requester.name)
-      end
+      expect(members_table).to have_content(developer.name)
+      expect(members_table).not_to have_content(user.name)
+      expect(members_table).not_to have_content(group.name)
     end
 
-    context 'showing status of members' do
-      it 'shows the status' do
-        create(:user_status, user: user, emoji: 'smirk', message: 'Authoring this object')
+    it 'shows group members only if requested' do
+      visit project_project_members_path(project, with_inherited_permissions: 'only')
 
-        visit project_project_members_path(project)
-
-        expect(first_row).to have_selector('gl-emoji[data-name="smirk"]')
-      end
+      expect(members_table).not_to have_content(developer.name)
+      expect(members_table).to have_content(user.name)
+      expect(members_table).to have_content(group.name)
     end
   end
 
-  context 'when `vue_project_members_list` feature flag is disabled' do
+  context 'with a group, a project invitee, and a project requester' do
     before do
-      stub_feature_flags(vue_project_members_list: false)
+      group.request_access(group_requester)
+      project.request_access(project_requester)
+      group_invitee
+      project_invitee
+      visit project_project_members_path(project)
     end
 
-    context 'with a group invitee' do
-      before do
-        group_invitee
-        visit project_project_members_path(project)
-      end
-
-      it 'does not appear in the project members page' do
-        page.within first('.content-list') do
-          expect(page).not_to have_content('test2@abc.com')
-        end
-      end
+    it 'shows the group owner' do
+      expect(members_table).to have_content(user.name)
+      expect(members_table).to have_content(group.name)
     end
 
-    context 'with a group' do
-      it 'shows group and project members by default' do
-        visit project_project_members_path(project)
-
-        page.within first('.content-list') do
-          expect(page).to have_content(developer.name)
-
-          expect(page).to have_content(user.name)
-          expect(page).to have_content(group.name)
-        end
-      end
-
-      it 'shows project members only if requested' do
-        visit project_project_members_path(project, with_inherited_permissions: 'exclude')
-
-        page.within first('.content-list') do
-          expect(page).to have_content(developer.name)
+    it 'shows the project developer' do
+      expect(members_table).to have_content(developer.name)
+    end
 
-          expect(page).not_to have_content(user.name)
-          expect(page).not_to have_content(group.name)
-        end
-      end
+    it 'shows the project invitee' do
+      click_link 'Invited'
 
-      it 'shows group members only if requested' do
-        visit project_project_members_path(project, with_inherited_permissions: 'only')
+      expect(members_table).to have_content('test1@abc.com')
+      expect(members_table).not_to have_content('test2@abc.com')
+    end
 
-        page.within first('.content-list') do
-          expect(page).not_to have_content(developer.name)
+    it 'shows the project requester' do
+      click_link 'Access requests'
 
-          expect(page).to have_content(user.name)
-          expect(page).to have_content(group.name)
-        end
-      end
+      expect(members_table).to have_content(project_requester.name)
+      expect(members_table).not_to have_content(group_requester.name)
     end
+  end
 
-    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 group owner' do
-        page.within first('.content-list') do
-          # Group owner
-          expect(page).to have_content(user.name)
-          expect(page).to have_content(group.name)
-        end
-      end
-
-      it 'shows the project developer' do
-        page.within first('.content-list') do
-          # Project developer
-          expect(page).to have_content(developer.name)
-        end
-      end
-
-      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
+  context 'with a group requester' do
+    before do
+      stub_feature_flags(invite_members_group_modal: false)
+      group.request_access(group_requester)
+      visit project_project_members_path(project)
     end
 
-    context 'with a group requester' do
-      before do
-        stub_feature_flags(invite_members_group_modal: false)
-        group.request_access(group_requester)
-        visit project_project_members_path(project)
-      end
-
-      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).not_to have_content(group_requester.name)
-        end
-      end
+    it 'does not appear in the project members page' do
+      expect(page).not_to have_link('Access requests')
+      expect(members_table).not_to have_content(group_requester.name)
     end
+  end
+
+  context 'showing status of members' do
+    it 'shows the status' do
+      create(:user_status, user: user, emoji: 'smirk', message: 'Authoring this object')
 
-    context 'showing status of members' do
-      it_behaves_like 'showing user status' do
-        let(:user_with_status) { developer }
+      visit project_project_members_path(project)
 
-        subject { visit project_project_members_path(project) }
-      end
+      expect(first_row).to have_selector('gl-emoji[data-name="smirk"]')
     end
   end
 end
diff --git a/spec/features/projects/members/groups_with_access_list_spec.rb b/spec/features/projects/members/groups_with_access_list_spec.rb
index 9d087dfd5f6..6a1d26983b5 100644
--- a/spec/features/projects/members/groups_with_access_list_spec.rb
+++ b/spec/features/projects/members/groups_with_access_list_spec.rb
@@ -17,172 +17,80 @@ RSpec.describe 'Projects > Members > Groups with access list', :js do
 
     project.add_maintainer(user)
     sign_in(user)
-  end
-
-  context 'when `vue_project_members_list` feature flag is enabled' do
-    before do
-      visit project_project_members_path(project)
-      click_groups_tab
-    end
-
-    it 'updates group access level' do
-      click_button group_link.human_access
-      click_button 'Guest'
-
-      wait_for_requests
-
-      visit project_project_members_path(project)
 
-      click_groups_tab
-
-      expect(find_group_row(group)).to have_content('Guest')
-    end
+    visit project_project_members_path(project)
+    click_groups_tab
+  end
 
-    it 'updates expiry date' do
-      page.within find_group_row(group) do
-        fill_in 'Expiration date', with: 5.days.from_now.to_date
-        find_field('Expiration date').native.send_keys :enter
+  it 'updates group access level' do
+    click_button group_link.human_access
+    click_button 'Guest'
 
-        wait_for_requests
+    wait_for_requests
 
-        expect(page).to have_content(/in \d days/)
-      end
-    end
+    visit project_project_members_path(project)
 
-    context 'when link has expiry date set' do
-      let(:additional_link_attrs) { { expires_at: 5.days.from_now.to_date } }
+    click_groups_tab
 
-      it 'clears expiry date' do
-        page.within find_group_row(group) do
-          expect(page).to have_content(/in \d days/)
+    expect(find_group_row(group)).to have_content('Guest')
+  end
 
-          find('[data-testid="clear-button"]').click
+  it 'updates expiry date' do
+    page.within find_group_row(group) do
+      fill_in 'Expiration date', with: 5.days.from_now.to_date
+      find_field('Expiration date').native.send_keys :enter
 
-          wait_for_requests
+      wait_for_requests
 
-          expect(page).to have_content('No expiration set')
-        end
-      end
+      expect(page).to have_content(/in \d days/)
     end
+  end
 
-    it 'deletes group link' do
-      expect(page).to have_content(group.full_name)
+  context 'when link has expiry date set' do
+    let(:additional_link_attrs) { { expires_at: 5.days.from_now.to_date } }
 
+    it 'clears expiry date' do
       page.within find_group_row(group) do
-        click_button 'Remove group'
-      end
-
-      page.within('[role="dialog"]') do
-        click_button('Remove group')
-      end
-
-      expect(page).not_to have_content(group.full_name)
-    end
-
-    context 'search in existing members' do
-      it 'finds no results' do
-        fill_in_filtered_search 'Search groups', with: 'testing 123'
-
-        click_groups_tab
-
-        expect(page).not_to have_content(group.full_name)
-      end
+        expect(page).to have_content(/in \d days/)
 
-      it 'finds results' do
-        fill_in_filtered_search 'Search groups', with: group.full_name
+        find('[data-testid="clear-button"]').click
 
-        click_groups_tab
+        wait_for_requests
 
-        expect(members_table).to have_content(group.full_name)
+        expect(page).to have_content('No expiration set')
       end
     end
   end
 
-  context 'when `vue_project_members_list` feature flag is disabled' do
-    before do
-      stub_feature_flags(vue_project_members_list: false)
-
-      visit project_project_members_path(project)
-      click_groups_tab
-    end
-
-    it 'updates group access level' do
-      click_button group_link.human_access
-
-      page.within '.dropdown-menu' do
-        click_link 'Guest'
-      end
-
-      wait_for_requests
-
-      visit project_project_members_path(project)
-
-      click_groups_tab
+  it 'deletes group link' do
+    expect(page).to have_content(group.full_name)
 
-      expect(first('.group_member')).to have_content('Guest')
+    page.within find_group_row(group) do
+      click_button 'Remove group'
     end
 
-    it 'updates expiry date' do
-      expires_at_field = "member_expires_at_#{group.id}"
-      fill_in expires_at_field, with: 3.days.from_now.to_date
-
-      find_field(expires_at_field).native.send_keys :enter
-      wait_for_requests
-
-      page.within(find('li.group_member')) do
-        expect(page).to have_content('Expires in 3 days')
-      end
+    page.within('[role="dialog"]') do
+      click_button('Remove group')
     end
 
-    context 'when link has expiry date set' do
-      let(:additional_link_attrs) { { expires_at: 3.days.from_now.to_date } }
-
-      it 'clears expiry date' do
-        page.within(find('li.group_member')) do
-          expect(page).to have_content('Expires in 3 days')
-
-          page.within(find('.js-edit-member-form')) do
-            find('.js-clear-input').click
-          end
-
-          wait_for_requests
+    expect(page).not_to have_content(group.full_name)
+  end
 
-          expect(page).not_to have_content('Expires in')
-        end
-      end
-    end
+  context 'search in existing members' do
+    it 'finds no results' do
+      fill_in_filtered_search 'Search groups', with: 'testing 123'
 
-    it 'deletes group link' do
-      page.within(first('.group_member')) do
-        accept_confirm { find('.btn-danger').click }
-      end
-      wait_for_requests
+      click_groups_tab
 
-      expect(page).not_to have_selector('.group_member')
+      expect(page).not_to have_content(group.full_name)
     end
 
-    context 'search in existing members' do
-      it 'finds no results' do
-        page.within '.user-search-form' do
-          fill_in 'search_groups', with: 'testing 123'
-          find('.user-search-btn').click
-        end
-
-        click_groups_tab
-
-        expect(page).not_to have_selector('.group_member')
-      end
-
-      it 'finds results' do
-        page.within '.user-search-form' do
-          fill_in 'search_groups', with: group.name
-          find('.user-search-btn').click
-        end
+    it 'finds results' do
+      fill_in_filtered_search 'Search groups', with: group.full_name
 
-        click_groups_tab
+      click_groups_tab
 
-        expect(page).to have_selector('.group_member', count: 1)
-      end
+      expect(members_table).to have_content(group.full_name)
     end
   end
 
diff --git a/spec/features/projects/members/invite_group_spec.rb b/spec/features/projects/members/invite_group_spec.rb
index f0d115fef1d..83ba2533a73 100644
--- a/spec/features/projects/members/invite_group_spec.rb
+++ b/spec/features/projects/members/invite_group_spec.rb
@@ -41,46 +41,20 @@ RSpec.describe 'Project > Members > Invite group', :js do
       context 'when the group has "Share with group lock" disabled' do
         it_behaves_like 'the project can be shared with groups'
 
-        context 'when `vue_project_members_list` feature flag is enabled' do
-          it 'the project can be shared with another group' do
-            visit project_project_members_path(project)
+        it 'the project can be shared with another group' do
+          visit project_project_members_path(project)
 
-            expect(page).not_to have_link 'Groups'
+          expect(page).not_to have_link 'Groups'
 
-            click_on 'invite-group-tab'
+          click_on 'invite-group-tab'
 
-            select2 group_to_share_with.id, from: '#link_group_id'
-            page.find('body').click
-            find('.btn-success').click
+          select2 group_to_share_with.id, from: '#link_group_id'
+          page.find('body').click
+          find('.btn-confirm').click
 
-            click_link 'Groups'
+          click_link 'Groups'
 
-            expect(members_table).to have_content(group_to_share_with.name)
-          end
-        end
-
-        context 'when `vue_project_members_list` feature flag is disabled' do
-          before do
-            stub_feature_flags(vue_project_members_list: false)
-          end
-
-          it 'the project can be shared with another group' do
-            visit project_project_members_path(project)
-
-            expect(page).not_to have_link 'Groups'
-
-            click_on 'invite-group-tab'
-
-            select2 group_to_share_with.id, from: '#link_group_id'
-            page.find('body').click
-            find('.btn-success').click
-
-            click_link 'Groups'
-
-            page.within('[data-testid="project-member-groups"]') do
-              expect(page).to have_content(group_to_share_with.name)
-            end
-          end
+          expect(members_table).to have_content(group_to_share_with.name)
         end
       end
 
@@ -159,36 +133,15 @@ RSpec.describe 'Project > Members > Invite group', :js do
 
       fill_in 'expires_at_groups', with: 5.days.from_now.strftime('%Y-%m-%d')
       click_on 'invite-group-tab'
-      find('.btn-success').click
-    end
-
-    context 'when `vue_project_members_list` feature flag is enabled' do
-      it 'the group link shows the expiration time with a warning class' do
-        setup
-        click_link 'Groups'
-
-        expect(find_group_row(group)).to have_content(/in \d days/)
-        expect(find_group_row(group)).to have_selector('.gl-text-orange-500')
-      end
+      find('.btn-confirm').click
     end
 
-    context 'when `vue_project_members_list` feature flag is disabled' do
-      before do
-        stub_feature_flags(vue_project_members_list: false)
-      end
-
-      it 'the group link shows the expiration time with a warning class' do
-        setup
-        click_link 'Groups'
+    it 'the group link shows the expiration time with a warning class' do
+      setup
+      click_link 'Groups'
 
-        page.within('[data-testid="project-member-groups"]') do
-          # Using distance_of_time_in_words_to_now because it is not the same as
-          # subtraction, and this way avoids time zone issues as well
-          expires_in_text = distance_of_time_in_words_to_now(project.project_group_links.first.expires_at)
-          expect(page).to have_content(expires_in_text)
-          expect(page).to have_selector('.text-warning')
-        end
-      end
+      expect(find_group_row(group)).to have_content(/in \d days/)
+      expect(find_group_row(group)).to have_selector('.gl-text-orange-500')
     end
   end
 
diff --git a/spec/features/projects/members/list_spec.rb b/spec/features/projects/members/list_spec.rb
index b0fe5b9c48a..0830585da9b 100644
--- a/spec/features/projects/members/list_spec.rb
+++ b/spec/features/projects/members/list_spec.rb
@@ -2,232 +2,192 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Project members list' do
+RSpec.describe 'Project members list', :js do
   include Select2Helper
+  include Spec::Support::Helpers::Features::MembersHelpers
 
   let(:user1) { create(:user, name: 'John Doe') }
   let(:user2) { create(:user, name: 'Mary Jane') }
   let(:group) { create(:group) }
-  let(:project) { create(:project, namespace: group) }
+  let(:project) { create(:project, :internal, namespace: group) }
 
   before do
-    stub_feature_flags(invite_members_group_modal: false)
+    stub_feature_flags(invite_members_group_modal: true)
 
     sign_in(user1)
     group.add_owner(user1)
   end
 
-  context 'when `vue_project_members_list` feature flag is enabled', :js do
-    include Spec::Support::Helpers::Features::MembersHelpers
+  it 'show members from project and group' do
+    project.add_developer(user2)
 
-    it 'pushes `vue_project_members_list` feature flag to the frontend' do
-      visit_members_page
-
-      expect(page).to have_pushed_frontend_feature_flags(vueProjectMembersList: true)
-    end
+    visit_members_page
 
-    it 'show members from project and group' do
-      project.add_developer(user2)
-
-      visit_members_page
-
-      expect(first_row).to have_content(user1.name)
-      expect(second_row).to have_content(user2.name)
-    end
+    expect(first_row).to have_content(user1.name)
+    expect(second_row).to have_content(user2.name)
+  end
 
-    it 'show user once if member of both group and project' do
-      project.add_developer(user1)
+  it 'show user once if member of both group and project' do
+    project.add_developer(user1)
 
-      visit_members_page
+    visit_members_page
 
-      expect(first_row).to have_content(user1.name)
-      expect(second_row).to be_blank
-    end
+    expect(first_row).to have_content(user1.name)
+    expect(second_row).to be_blank
+  end
 
-    it 'update user access level', :js do
-      project.add_developer(user2)
+  it 'update user access level' do
+    project.add_developer(user2)
 
-      visit_members_page
+    visit_members_page
 
-      page.within find_member_row(user2) do
-        click_button('Developer')
-        click_button('Reporter')
+    page.within find_member_row(user2) do
+      click_button('Developer')
+      click_button('Reporter')
 
-        expect(page).to have_button('Reporter')
-      end
+      expect(page).to have_button('Reporter')
     end
+  end
 
-    it 'add user to project', :js do
-      visit_members_page
+  it 'add user to project' do
+    visit_members_page
 
-      add_user(user2.id, 'Reporter')
+    add_user(user2.name, 'Reporter')
 
-      page.within find_member_row(user2) do
-        expect(page).to have_button('Reporter')
-      end
+    page.within find_member_row(user2) do
+      expect(page).to have_button('Reporter')
     end
+  end
 
-    it 'remove user from project', :js do
-      other_user = create(:user)
-      project.add_developer(other_user)
-
-      visit_members_page
-
-      # Open modal
-      page.within find_member_row(other_user) do
-        click_button 'Remove member'
-      end
+  it 'uses ProjectMember access_level_roles for the invite members modal access option' do
+    visit_members_page
 
-      page.within('[role="dialog"]') do
-        expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests'
-        click_button('Remove member')
-      end
+    click_on 'Invite members'
 
-      wait_for_requests
+    click_on 'Guest'
+    wait_for_requests
 
-      expect(members_table).not_to have_content(other_user.name)
+    page.within '.dropdown-menu' do
+      expect(page).to have_button('Guest')
+      expect(page).to have_button('Reporter')
+      expect(page).to have_button('Developer')
+      expect(page).to have_button('Maintainer')
+      expect(page).not_to have_button('Owner')
     end
+  end
 
-    it 'invite user to project', :js do
-      visit_members_page
+  it 'remove user from project' do
+    other_user = create(:user)
+    project.add_developer(other_user)
 
-      add_user('test@example.com', 'Reporter')
+    visit_members_page
 
-      click_link 'Invited'
+    # Open modal
+    page.within find_member_row(other_user) do
+      click_button 'Remove member'
+    end
 
-      page.within find_invited_member_row('test@example.com') do
-        expect(page).to have_button('Reporter')
-      end
+    page.within('[role="dialog"]') do
+      expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests'
+      click_button('Remove member')
     end
 
-    context 'project bots' do
-      let(:project_bot) { create(:user, :project_bot, name: 'project_bot') }
+    wait_for_requests
 
-      before do
-        project.add_maintainer(project_bot)
-      end
+    expect(members_table).not_to have_content(other_user.name)
+  end
 
-      it 'does not show form used to change roles and "Expiration date" or the remove user button' do
-        visit_members_page
+  it 'invite user to project' do
+    visit_members_page
 
-        page.within find_member_row(project_bot) do
-          expect(page).not_to have_button('Maintainer')
-          expect(page).to have_field('Expiration date', disabled: true)
-          expect(page).not_to have_button('Remove member')
-        end
-      end
+    add_user('test@example.com', 'Reporter')
+
+    click_link 'Invited'
+
+    page.within find_invited_member_row('test@example.com') do
+      expect(page).to have_button('Reporter')
     end
   end
 
-  context 'when `vue_project_members_list` feature flag is disabled' do
-    include Spec::Support::Helpers::Features::ListRowsHelpers
+  context 'project bots' do
+    let(:project_bot) { create(:user, :project_bot, name: 'project_bot') }
 
     before do
-      stub_feature_flags(vue_project_members_list: false)
+      project.add_maintainer(project_bot)
     end
 
-    it 'show members from project and group' do
-      project.add_developer(user2)
-
+    it 'does not show form used to change roles and "Expiration date" or the remove user button' do
       visit_members_page
 
-      expect(first_row.text).to include(user1.name)
-      expect(second_row.text).to include(user2.name)
+      page.within find_member_row(project_bot) do
+        expect(page).not_to have_button('Maintainer')
+        expect(page).to have_field('Expiration date', disabled: true)
+        expect(page).not_to have_button('Remove member')
+      end
     end
+  end
 
-    it 'show user once if member of both group and project' do
-      project.add_developer(user1)
-
-      visit_members_page
+  describe 'when user has 2FA enabled' do
+    let_it_be(:admin) { create(:admin) }
+    let_it_be(:user_with_2fa) { create(:user, :two_factor_via_otp) }
 
-      expect(first_row.text).to include(user1.name)
-      expect(second_row).to be_blank
+    before do
+      project.add_guest(user_with_2fa)
     end
 
-    it 'update user access level', :js do
-      project.add_developer(user2)
+    it 'shows 2FA badge to user with "Maintainer" access level' do
+      project.add_maintainer(user1)
 
       visit_members_page
 
-      page.within(second_row) do
-        click_button('Developer')
-        click_link('Reporter')
-
-        expect(page).to have_button('Reporter')
-      end
+      expect(find_member_row(user_with_2fa)).to have_content('2FA')
     end
 
-    it 'add user to project', :js do
-      visit_members_page
+    it 'shows 2FA badge to admins' do
+      sign_in(admin)
+      gitlab_enable_admin_mode_sign_in(admin)
 
-      add_user(user2.id, 'Reporter')
+      visit_members_page
 
-      page.within(second_row) do
-        expect(page).to have_content(user2.name)
-        expect(page).to have_button('Reporter')
-      end
+      expect(find_member_row(user_with_2fa)).to have_content('2FA')
     end
 
-    it 'remove user from project', :js do
-      other_user = create(:user)
-      project.add_developer(other_user)
+    it 'does not show 2FA badge to users with access level below "Maintainer"' do
+      group.add_developer(user1)
 
       visit_members_page
 
-      # Open modal
-      find(:css, 'li.project_member', text: other_user.name).find(:css, 'button.btn-danger').click
-
-      expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests'
-
-      click_on('Remove member')
-
-      wait_for_requests
-
-      expect(page).not_to have_content(other_user.name)
-      expect(project.users).not_to include(other_user)
+      expect(find_member_row(user_with_2fa)).not_to have_content('2FA')
     end
 
-    it 'invite user to project', :js do
-      visit_members_page
-
-      add_user('test@example.com', 'Reporter')
+    it 'shows 2FA badge to themselves' do
+      sign_in(user_with_2fa)
 
-      click_link 'Invited'
+      visit_members_page
 
-      page.within(first_row) do
-        expect(page).to have_content('test@example.com')
-        expect(page).to have_content('Invited')
-        expect(page).to have_button('Reporter')
-      end
+      expect(find_member_row(user_with_2fa)).to have_content('2FA')
     end
+  end
 
-    context 'project bots' do
-      let(:project_bot) { create(:user, :project_bot, name: 'project_bot') }
-
-      before do
-        project.add_maintainer(project_bot)
-      end
+  private
 
-      it 'does not show form used to change roles and "Expiration date" or the remove user button' do
-        project_member = project.project_members.find_by(user_id: project_bot.id)
+  def add_user(id, role)
+    click_on 'Invite members'
 
-        visit_members_page
+    page.within '#invite-members-modal' do
+      fill_in 'Search for members to invite', with: id
 
-        expect(page).not_to have_selector("#edit_project_member_#{project_member.id}")
-        expect(page).to have_no_selector("#project_member_#{project_member.id} .btn-danger")
-      end
-    end
-  end
+      wait_for_requests
+      click_button id
 
-  private
+      click_button 'Guest'
+      wait_for_requests
+      click_button role
 
-  def add_user(id, role)
-    page.within ".invite-users-form" do
-      select2(id, from: "#user_ids", multiple: true)
-      select(role, from: "access_level")
+      click_button 'Invite'
     end
 
-    click_button "Invite"
+    page.refresh
   end
 
   def visit_members_page
diff --git a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
index 1127c64e0c7..d22097a2f6f 100644
--- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
+++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
@@ -18,107 +18,51 @@ RSpec.describe 'Projects > Members > Maintainer adds member with expiration date
     sign_in(maintainer)
   end
 
-  context 'when `vue_project_members_list` feature flag is enabled' do
-    it 'expiration date is displayed in the members list' do
-      stub_feature_flags(invite_members_group_modal: false)
+  it 'expiration date is displayed in the members list' do
+    stub_feature_flags(invite_members_group_modal: false)
 
-      visit project_project_members_path(project)
+    visit project_project_members_path(project)
 
-      page.within '.invite-users-form' do
-        select2(new_member.id, from: '#user_ids', multiple: true)
+    page.within '.invite-users-form' do
+      select2(new_member.id, from: '#user_ids', multiple: true)
 
-        fill_in 'expires_at', with: 5.days.from_now.to_date
-        find_field('expires_at').native.send_keys :enter
+      fill_in 'expires_at', with: 5.days.from_now.to_date
+      find_field('expires_at').native.send_keys :enter
 
-        click_on 'Invite'
-      end
-
-      page.within find_member_row(new_member) do
-        expect(page).to have_content(/in \d days/)
-      end
-    end
-
-    it 'changes expiration date' do
-      project.team.add_users([new_member.id], :developer, expires_at: 3.days.from_now.to_date)
-      visit project_project_members_path(project)
-
-      page.within find_member_row(new_member) do
-        fill_in 'Expiration date', with: 5.days.from_now.to_date
-        find_field('Expiration date').native.send_keys :enter
-
-        wait_for_requests
-
-        expect(page).to have_content(/in \d days/)
-      end
+      click_on 'Invite'
     end
 
-    it 'clears expiration date' do
-      project.team.add_users([new_member.id], :developer, expires_at: 5.days.from_now.to_date)
-      visit project_project_members_path(project)
-
-      page.within find_member_row(new_member) do
-        expect(page).to have_content(/in \d days/)
-
-        find('[data-testid="clear-button"]').click
-
-        wait_for_requests
-
-        expect(page).to have_content('No expiration set')
-      end
+    page.within find_member_row(new_member) do
+      expect(page).to have_content(/in \d days/)
     end
   end
 
-  context 'when `vue_project_members_list` feature flag is disabled' do
-    before do
-      stub_feature_flags(vue_project_members_list: false)
-    end
-
-    it 'expiration date is displayed in the members list' do
-      stub_feature_flags(invite_members_group_modal: false)
-
-      visit project_project_members_path(project)
-
-      page.within '.invite-users-form' do
-        select2(new_member.id, from: '#user_ids', multiple: true)
-
-        fill_in 'expires_at', with: 3.days.from_now.to_date
-        find_field('expires_at').native.send_keys :enter
+  it 'changes expiration date' do
+    project.team.add_users([new_member.id], :developer, expires_at: 3.days.from_now.to_date)
+    visit project_project_members_path(project)
 
-        click_on 'Invite'
-      end
+    page.within find_member_row(new_member) do
+      fill_in 'Expiration date', with: 5.days.from_now.to_date
+      find_field('Expiration date').native.send_keys :enter
 
-      page.within "#project_member_#{project_member_id}" do
-        expect(page).to have_content('Expires in 3 days')
-      end
-    end
-
-    it 'changes expiration date' do
-      project.team.add_users([new_member.id], :developer, expires_at: 1.day.from_now.to_date)
-      visit project_project_members_path(project)
-
-      page.within "#project_member_#{project_member_id}" do
-        fill_in 'Expiration date', with: 3.days.from_now.to_date
-        find_field('Expiration date').native.send_keys :enter
+      wait_for_requests
 
-        wait_for_requests
-
-        expect(page).to have_content('Expires in 3 days')
-      end
+      expect(page).to have_content(/in \d days/)
     end
+  end
 
-    it 'clears expiration date' do
-      project.team.add_users([new_member.id], :developer, expires_at: 3.days.from_now.to_date)
-      visit project_project_members_path(project)
+  it 'clears expiration date' do
+    project.team.add_users([new_member.id], :developer, expires_at: 5.days.from_now.to_date)
+    visit project_project_members_path(project)
 
-      page.within "#project_member_#{project_member_id}" do
-        expect(page).to have_content('Expires in 3 days')
+    page.within find_member_row(new_member) do
+      expect(page).to have_content(/in \d days/)
 
-        find('.js-clear-input').click
+      find('[data-testid="clear-button"]').click
 
-        wait_for_requests
+      wait_for_requests
 
-        expect(page).not_to have_content('Expires in')
-      end
+      expect(page).to have_content('No expiration set')
     end
   end
 
diff --git a/spec/features/projects/members/sorting_spec.rb b/spec/features/projects/members/sorting_spec.rb
index 3c132747bc4..653564d1566 100644
--- a/spec/features/projects/members/sorting_spec.rb
+++ b/spec/features/projects/members/sorting_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Projects > Members > Sorting' do
+RSpec.describe 'Projects > Members > Sorting', :js do
   include Spec::Support::Helpers::Features::MembersHelpers
 
   let(:maintainer) { create(:user, name: 'John Doe') }
@@ -15,165 +15,85 @@ RSpec.describe 'Projects > Members > Sorting' do
     sign_in(maintainer)
   end
 
-  context 'when `vue_project_members_list` feature flag is enabled', :js do
-    it 'sorts by account by default' do
-      visit_members_list(sort: nil)
+  it 'sorts by account by default' do
+    visit_members_list(sort: nil)
 
-      expect(first_row).to have_content(maintainer.name)
-      expect(second_row).to have_content(developer.name)
+    expect(first_row).to have_content(maintainer.name)
+    expect(second_row).to have_content(developer.name)
 
-      expect_sort_by('Account', :asc)
-    end
-
-    it 'sorts by max role ascending' do
-      visit_members_list(sort: :access_level_asc)
-
-      expect(first_row).to have_content(developer.name)
-      expect(second_row).to have_content(maintainer.name)
-
-      expect_sort_by('Max role', :asc)
-    end
-
-    it 'sorts by max role descending' do
-      visit_members_list(sort: :access_level_desc)
-
-      expect(first_row).to have_content(maintainer.name)
-      expect(second_row).to have_content(developer.name)
-
-      expect_sort_by('Max role', :desc)
-    end
-
-    it 'sorts by access granted ascending' do
-      visit_members_list(sort: :last_joined)
-
-      expect(first_row).to have_content(maintainer.name)
-      expect(second_row).to have_content(developer.name)
-
-      expect_sort_by('Access granted', :asc)
-    end
-
-    it 'sorts by access granted descending' do
-      visit_members_list(sort: :oldest_joined)
-
-      expect(first_row).to have_content(developer.name)
-      expect(second_row).to have_content(maintainer.name)
-
-      expect_sort_by('Access granted', :desc)
-    end
-
-    it 'sorts by account ascending' do
-      visit_members_list(sort: :name_asc)
-
-      expect(first_row).to have_content(maintainer.name)
-      expect(second_row).to have_content(developer.name)
-
-      expect_sort_by('Account', :asc)
-    end
-
-    it 'sorts by account descending' do
-      visit_members_list(sort: :name_desc)
-
-      expect(first_row).to have_content(developer.name)
-      expect(second_row).to have_content(maintainer.name)
-
-      expect_sort_by('Account', :desc)
-    end
+    expect_sort_by('Account', :asc)
+  end
 
-    it 'sorts by last sign-in ascending', :clean_gitlab_redis_shared_state do
-      visit_members_list(sort: :recent_sign_in)
+  it 'sorts by max role ascending' do
+    visit_members_list(sort: :access_level_asc)
 
-      expect(first_row).to have_content(maintainer.name)
-      expect(second_row).to have_content(developer.name)
+    expect(first_row).to have_content(developer.name)
+    expect(second_row).to have_content(maintainer.name)
 
-      expect_sort_by('Last sign-in', :asc)
-    end
+    expect_sort_by('Max role', :asc)
+  end
 
-    it 'sorts by last sign-in descending', :clean_gitlab_redis_shared_state do
-      visit_members_list(sort: :oldest_sign_in)
+  it 'sorts by max role descending' do
+    visit_members_list(sort: :access_level_desc)
 
-      expect(first_row).to have_content(developer.name)
-      expect(second_row).to have_content(maintainer.name)
+    expect(first_row).to have_content(maintainer.name)
+    expect(second_row).to have_content(developer.name)
 
-      expect_sort_by('Last sign-in', :desc)
-    end
+    expect_sort_by('Max role', :desc)
   end
 
-  context 'when `vue_project_members_list` feature flag is disabled' do
-    before do
-      stub_feature_flags(vue_project_members_list: false)
-    end
-
-    it 'sorts alphabetically by default' do
-      visit_members_list(sort: nil)
+  it 'sorts by access granted ascending' do
+    visit_members_list(sort: :last_joined)
 
-      expect(first_member).to include(maintainer.name)
-      expect(second_member).to include(developer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Name, ascending')
-    end
+    expect(first_row).to have_content(maintainer.name)
+    expect(second_row).to have_content(developer.name)
 
-    it 'sorts by access level ascending' do
-      visit_members_list(sort: :access_level_asc)
+    expect_sort_by('Access granted', :asc)
+  end
 
-      expect(first_member).to include(developer.name)
-      expect(second_member).to include(maintainer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Access level, ascending')
-    end
+  it 'sorts by access granted descending' do
+    visit_members_list(sort: :oldest_joined)
 
-    it 'sorts by access level descending' do
-      visit_members_list(sort: :access_level_desc)
+    expect(first_row).to have_content(developer.name)
+    expect(second_row).to have_content(maintainer.name)
 
-      expect(first_member).to include(maintainer.name)
-      expect(second_member).to include(developer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Access level, descending')
-    end
+    expect_sort_by('Access granted', :desc)
+  end
 
-    it 'sorts by last joined' do
-      visit_members_list(sort: :last_joined)
+  it 'sorts by account ascending' do
+    visit_members_list(sort: :name_asc)
 
-      expect(first_member).to include(maintainer.name)
-      expect(second_member).to include(developer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Last joined')
-    end
+    expect(first_row).to have_content(maintainer.name)
+    expect(second_row).to have_content(developer.name)
 
-    it 'sorts by oldest joined' do
-      visit_members_list(sort: :oldest_joined)
+    expect_sort_by('Account', :asc)
+  end
 
-      expect(first_member).to include(developer.name)
-      expect(second_member).to include(maintainer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Oldest joined')
-    end
+  it 'sorts by account descending' do
+    visit_members_list(sort: :name_desc)
 
-    it 'sorts by name ascending' do
-      visit_members_list(sort: :name_asc)
+    expect(first_row).to have_content(developer.name)
+    expect(second_row).to have_content(maintainer.name)
 
-      expect(first_member).to include(maintainer.name)
-      expect(second_member).to include(developer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Name, ascending')
-    end
+    expect_sort_by('Account', :desc)
+  end
 
-    it 'sorts by name descending' do
-      visit_members_list(sort: :name_desc)
+  it 'sorts by last sign-in ascending', :clean_gitlab_redis_shared_state do
+    visit_members_list(sort: :recent_sign_in)
 
-      expect(first_member).to include(developer.name)
-      expect(second_member).to include(maintainer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Name, descending')
-    end
+    expect(first_row).to have_content(maintainer.name)
+    expect(second_row).to have_content(developer.name)
 
-    it 'sorts by recent sign in', :clean_gitlab_redis_shared_state do
-      visit_members_list(sort: :recent_sign_in)
+    expect_sort_by('Last sign-in', :asc)
+  end
 
-      expect(first_member).to include(maintainer.name)
-      expect(second_member).to include(developer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Recent sign in')
-    end
+  it 'sorts by last sign-in descending', :clean_gitlab_redis_shared_state do
+    visit_members_list(sort: :oldest_sign_in)
 
-    it 'sorts by oldest sign in', :clean_gitlab_redis_shared_state do
-      visit_members_list(sort: :oldest_sign_in)
+    expect(first_row).to have_content(developer.name)
+    expect(second_row).to have_content(maintainer.name)
 
-      expect(first_member).to include(developer.name)
-      expect(second_member).to include(maintainer.name)
-      expect(page).to have_css('.qa-user-sort-dropdown .dropdown-toggle-text', text: 'Oldest sign in')
-    end
+    expect_sort_by('Last sign-in', :desc)
   end
 
   private
diff --git a/spec/features/projects/members/tabs_spec.rb b/spec/features/projects/members/tabs_spec.rb
index eef3395de91..471be26e126 100644
--- a/spec/features/projects/members/tabs_spec.rb
+++ b/spec/features/projects/members/tabs_spec.rb
@@ -14,6 +14,11 @@ RSpec.describe 'Projects > Members > Tabs' do
   let_it_be(:invites) { create_list(:project_member, 2, :invited, project: project) }
   let_it_be(:project_group_links) { create_list(:project_group_link, 2, project: project) }
 
+  before do
+    sign_in(user)
+    visit project_project_members_path(project)
+  end
+
   shared_examples 'active "Members" tab' do
     it 'displays "Members" tab' do
       expect(page).to have_selector('.nav-link.active', text: 'Members')
@@ -21,11 +26,6 @@ RSpec.describe 'Projects > Members > Tabs' do
   end
 
   context 'tabs' do
-    before do
-      sign_in(user)
-      visit project_project_members_path(project)
-    end
-
     where(:tab, :count) do
       'Members'         | 3
       'Invited'         | 2
@@ -44,69 +44,25 @@ RSpec.describe 'Projects > Members > Tabs' do
     end
   end
 
-  context 'when `vue_project_members_list` feature flag is enabled' do
+  context 'when searching "Groups"', :js do
     before do
-      sign_in(user)
-      visit project_project_members_path(project)
-    end
-
-    context 'when searching "Groups"', :js do
-      before do
-        click_link 'Groups'
-
-        fill_in_filtered_search 'Search groups', with: 'group'
-      end
-
-      it 'displays "Groups" tab' do
-        expect(page).to have_selector('.nav-link.active', text: 'Groups')
-      end
+      click_link 'Groups'
 
-      context 'and then searching "Members"' do
-        before do
-          click_link 'Members 3'
-
-          fill_in_filtered_search 'Filter members', with: 'user'
-        end
-
-        it_behaves_like 'active "Members" tab'
-      end
+      fill_in_filtered_search 'Search groups', with: 'group'
     end
-  end
-
-  context 'when `vue_project_members_list` feature flag is disabled' do
-    before do
-      stub_feature_flags(vue_project_members_list: false)
 
-      sign_in(user)
-      visit project_project_members_path(project)
+    it 'displays "Groups" tab' do
+      expect(page).to have_selector('.nav-link.active', text: 'Groups')
     end
 
-    context 'when searching "Groups"', :js do
+    context 'and then searching "Members"' do
       before do
-        click_link 'Groups'
+        click_link 'Members 3'
 
-        page.within '[data-testid="group-link-search-form"]' do
-          fill_in 'search_groups', with: 'group'
-          find('button[type="submit"]').click
-        end
+        fill_in_filtered_search 'Filter members', with: 'user'
       end
 
-      it 'displays "Groups" tab' do
-        expect(page).to have_selector('.nav-link.active', text: 'Groups')
-      end
-
-      context 'and then searching "Members"' do
-        before do
-          click_link 'Members 3'
-
-          page.within '[data-testid="user-search-form"]' do
-            fill_in 'search', with: 'user'
-            find('button[type="submit"]').click
-          end
-        end
-
-        it_behaves_like 'active "Members" tab'
-      end
+      it_behaves_like 'active "Members" tab'
     end
   end
 end