1 files changed, 30 insertions, 99 deletions
diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb
index 0d22da34b91..b237e7e8ce7 100644
--- a/spec/features/projects/settings/user_manages_project_members_spec.rb
+++ b/spec/features/projects/settings/user_manages_project_members_spec.rb
@@ -19,123 +19,54 @@ RSpec.describe 'Projects > Settings > User manages project members' do
     sign_in(user)
   end
 
-  context 'when `vue_project_members_list` feature flag is enabled' do
-    it 'cancels a team member', :js do
-      visit(project_project_members_path(project))
+  it 'cancels a team member', :js do
+    visit(project_project_members_path(project))
 
-      page.within find_member_row(user_dmitriy) do
-        click_button 'Remove member'
-      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
-
-      visit(project_project_members_path(project))
-
-      expect(members_table).not_to have_content(user_dmitriy.name)
-      expect(members_table).not_to have_content(user_dmitriy.username)
+    page.within find_member_row(user_dmitriy) do
+      click_button 'Remove member'
     end
 
-    it 'imports a team from another project', :js do
-      stub_feature_flags(invite_members_group_modal: false)
-
-      project2.add_maintainer(user)
-      project2.add_reporter(user_mike)
-
-      visit(project_project_members_path(project))
-
-      page.within('.invite-users-form') do
-        click_link('Import')
-      end
-
-      select2(project2.id, from: '#source_project_id')
-      click_button('Import project members')
-
-      expect(find_member_row(user_mike)).to have_content('Reporter')
+    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
 
-    it 'shows all members of project shared group', :js do
-      group.add_owner(user)
-      group.add_developer(user_dmitriy)
-
-      share_link = project.project_group_links.new(group_access: Gitlab::Access::MAINTAINER)
-      share_link.group_id = group.id
-      share_link.save!
-
-      visit(project_project_members_path(project))
+    visit(project_project_members_path(project))
 
-      click_link 'Groups'
-
-      expect(find_group_row(group)).to have_content('Maintainer')
-    end
+    expect(members_table).not_to have_content(user_dmitriy.name)
+    expect(members_table).not_to have_content(user_dmitriy.username)
   end
 
-  context 'when `vue_project_members_list` feature flag is disabled' do
-    before do
-      stub_feature_flags(vue_project_members_list: false)
-    end
+  it 'imports a team from another project', :js do
+    stub_feature_flags(invite_members_group_modal: false)
 
-    it 'cancels a team member', :js do
-      visit(project_project_members_path(project))
+    project2.add_maintainer(user)
+    project2.add_reporter(user_mike)
 
-      project_member = project.project_members.find_by(user_id: user_dmitriy.id)
+    visit(project_project_members_path(project))
 
-      page.within("#project_member_#{project_member.id}") do
-        # Open modal
-        click_on('Remove user from project')
-      end
-
-      expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests'
-
-      click_on('Remove member')
-
-      visit(project_project_members_path(project))
-
-      expect(page).not_to have_content(user_dmitriy.name)
-      expect(page).not_to have_content(user_dmitriy.username)
+    page.within('.invite-users-form') do
+      click_link('Import')
     end
 
-    it 'imports a team from another project' do
-      stub_feature_flags(invite_members_group_modal: false)
-
-      project2.add_maintainer(user)
-      project2.add_reporter(user_mike)
-
-      visit(project_project_members_path(project))
+    select2(project2.id, from: '#source_project_id')
+    click_button('Import project members')
 
-      page.within('.invite-users-form') do
-        click_link('Import')
-      end
-
-      select(project2.full_name, from: 'source_project_id')
-      click_button('Import')
-
-      project_member = project.project_members.find_by(user_id: user_mike.id)
-
-      page.within("#project_member_#{project_member.id}") do
-        expect(page).to have_content('Mike')
-        expect(page).to have_content('Reporter')
-      end
-    end
+    expect(find_member_row(user_mike)).to have_content('Reporter')
+  end
 
-    it 'shows all members of project shared group', :js do
-      group.add_owner(user)
-      group.add_developer(user_dmitriy)
+  it 'shows all members of project shared group', :js do
+    group.add_owner(user)
+    group.add_developer(user_dmitriy)
 
-      share_link = project.project_group_links.new(group_access: Gitlab::Access::MAINTAINER)
-      share_link.group_id = group.id
-      share_link.save!
+    share_link = project.project_group_links.new(group_access: Gitlab::Access::MAINTAINER)
+    share_link.group_id = group.id
+    share_link.save!
 
-      visit(project_project_members_path(project))
+    visit(project_project_members_path(project))
 
-      click_link 'Groups'
+    click_link 'Groups'
 
-      page.within('[data-testid="project-member-groups"]') do
-        expect(page).to have_content('OpenSource')
-        expect(first('.group_member')).to have_content('Maintainer')
-      end
-    end
+    expect(find_group_row(group)).to have_content('Maintainer')
   end
 end