Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

9 files changed, 34 insertions, 25 deletions

diff --git a/spec/features/groups/import_export/connect_instance_spec.rb b/spec/features/groups/import_export/connect_instance_spec.rb
index 11cc4bb9b37..8aea18a268b 100644
--- a/spec/features/groups/import_export/connect_instance_spec.rb
+++ b/spec/features/groups/import_export/connect_instance_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe 'Import/Export - Connect to another instance', :js, feature_categ
       it 'successfully connects to remote instance' do
         pat = 'demo-pat'
 
-        expect(page).to have_content 'Import groups from another instance of GitLab'
+        expect(page).to have_content 'Import groups by direct transfer'
         expect(page).to have_content 'Not all related objects are migrated'
 
         fill_in :bulk_import_gitlab_url, with: source_url
@@ -64,7 +64,7 @@ RSpec.describe 'Import/Export - Connect to another instance', :js, feature_categ
 
         click_on 'Connect instance'
 
-        expect(page).to have_content 'Please fill in GitLab source URL'
+        expect(page).to have_content 'Enter the URL for the source instance'
       end
     end
 
@@ -89,7 +89,7 @@ RSpec.describe 'Import/Export - Connect to another instance', :js, feature_categ
     end
 
     it 'renders fields and button disabled' do
-      expect(page).to have_field('GitLab source URL', disabled: true)
+      expect(page).to have_field('GitLab source instance URL', disabled: true)
       expect(page).to have_field('Personal access token', disabled: true)
       expect(page).to have_button('Connect instance', disabled: true)
     end
diff --git a/spec/features/groups/import_export/migration_history_spec.rb b/spec/features/groups/import_export/migration_history_spec.rb
index f851c5e2ec5..9fc9c7898d1 100644
--- a/spec/features/groups/import_export/migration_history_spec.rb
+++ b/spec/features/groups/import_export/migration_history_spec.rb
@@ -12,6 +12,8 @@ RSpec.describe 'Import/Export - GitLab migration history', :js, feature_category
   let_it_be(:failed_entity_2) { create(:bulk_import_entity, :failed, bulk_import: user_import_2) }
 
   before do
+    stub_application_setting(bulk_import_enabled: true)
+
     gitlab_sign_in(user)
 
     visit new_group_path
@@ -24,7 +26,7 @@ RSpec.describe 'Import/Export - GitLab migration history', :js, feature_category
 
     wait_for_requests
 
-    expect(page).to have_content 'Group import history'
+    expect(page).to have_content 'GitLab Migration history'
     expect(page.find('tbody')).to have_css('tr', count: 2)
   end
 end
diff --git a/spec/features/groups/labels/sort_labels_spec.rb b/spec/features/groups/labels/sort_labels_spec.rb
index c2410246fe1..e177461701e 100644
--- a/spec/features/groups/labels/sort_labels_spec.rb
+++ b/spec/features/groups/labels/sort_labels_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe 'Sort labels', :js, feature_category: :team_planning do
+  include ListboxHelpers
+
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let!(:label1) { create(:group_label, title: 'Foo', description: 'Lorem ipsum', group: group) }
@@ -28,16 +30,16 @@ RSpec.describe 'Sort labels', :js, feature_category: :team_planning do
   it 'sorts by date' do
     click_button 'Name'
 
-    sort_options = find('ul[role="listbox"]').all('li').collect(&:text)
-
-    expect(sort_options[0]).to eq('Name')
-    expect(sort_options[1]).to eq('Name, descending')
-    expect(sort_options[2]).to eq('Last created')
-    expect(sort_options[3]).to eq('Oldest created')
-    expect(sort_options[4]).to eq('Updated date')
-    expect(sort_options[5]).to eq('Oldest updated')
+    expect_listbox_items([
+      'Name',
+      'Name, descending',
+      'Last created',
+      'Oldest created',
+      'Updated date',
+      'Oldest updated'
+    ])
 
-    find('li', text: 'Name, descending').click
+    select_listbox_item('Name, descending')
 
     # assert default sorting
     within '.other-labels' do
diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb
index 4211f2b6265..5cd5908b359 100644
--- a/spec/features/groups/members/manage_members_spec.rb
+++ b/spec/features/groups/members/manage_members_spec.rb
@@ -50,12 +50,13 @@ RSpec.describe 'Groups > Members > Manage members', feature_category: :subgroups
 
     # Open modal
     page.within(second_row) do
-      click_button 'Remove member'
+      show_actions
+      click_button _('Remove member')
     end
 
     within_modal do
       expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests'
-      click_button('Remove member')
+      click_button _('Remove member')
     end
 
     wait_for_requests
diff --git a/spec/features/groups/members/sort_members_spec.rb b/spec/features/groups/members/sort_members_spec.rb
index 4e9adda5f2b..5634122ec16 100644
--- a/spec/features/groups/members/sort_members_spec.rb
+++ b/spec/features/groups/members/sort_members_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe 'Groups > Members > Sort members', :js, feature_category: :subgro
     expect(first_row.text).to include(owner.name)
     expect(second_row.text).to include(developer.name)
 
-    expect_sort_by('Created on', :asc)
+    expect_sort_by('User created', :asc)
   end
 
   it 'sorts by user created on descending' do
@@ -65,7 +65,7 @@ RSpec.describe 'Groups > Members > Sort members', :js, feature_category: :subgro
     expect(first_row.text).to include(developer.name)
     expect(second_row.text).to include(owner.name)
 
-    expect_sort_by('Created on', :desc)
+    expect_sort_by('User created', :desc)
   end
 
   it 'sorts by last activity ascending' do
diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb
index 87f1f422e90..8a3401d0572 100644
--- a/spec/features/groups/merge_requests_spec.rb
+++ b/spec/features/groups/merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Group merge requests page', feature_category: :code_review do
+RSpec.describe 'Group merge requests page', feature_category: :code_review_workflow do
   include FilteredSearchHelpers
 
   let(:path) { merge_requests_group_path(group) }
diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb
index 5543938957a..0f0ecb8f5f3 100644
--- a/spec/features/groups/milestones_sorting_spec.rb
+++ b/spec/features/groups/milestones_sorting_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe 'Milestones sorting', :js, feature_category: :team_planning do
+  include ListboxHelpers
+
   let(:group) { create(:group) }
   let!(:project) { create(:project_empty_repo, group: group) }
   let!(:other_project) { create(:project_empty_repo, group: group) }
@@ -27,13 +29,13 @@ RSpec.describe 'Milestones sorting', :js, feature_category: :team_planning do
       expect(page.all('ul.content-list > li strong > a').map(&:text)).to eq(['v2.0', 'v2.0', 'v3.0', 'v1.0', 'v1.0'])
     end
 
-    within '[data-testid=milestone_sort_by_dropdown]' do
-      click_button 'Due soon'
-      expect(find('ul[role="listbox"]').all('li').map(&:text)).to eq(['Due soon', 'Due later', 'Start soon', 'Start later', 'Name, ascending', 'Name, descending'])
+    click_button 'Due soon'
 
-      find('li', text: 'Due later').click
-      expect(page).to have_button('Due later')
-    end
+    expect_listbox_items(['Due soon', 'Due later', 'Start soon', 'Start later', 'Name, ascending', 'Name, descending'])
+
+    select_listbox_item('Due later')
+
+    expect(page).to have_button('Due later')
 
     # assert descending sorting
     within '.milestones' do
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index 180ccab78bc..a52e2d95fed 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Group navbar', feature_category: :navigation do
+RSpec.describe 'Group navbar', :with_license, feature_category: :navigation do
   include NavbarStructureHelper
   include WikiHelpers
 
diff --git a/spec/features/groups/new_group_page_spec.rb b/spec/features/groups/new_group_page_spec.rb
index 662ef734299..a07c27331d9 100644
--- a/spec/features/groups/new_group_page_spec.rb
+++ b/spec/features/groups/new_group_page_spec.rb
@@ -10,6 +10,8 @@ RSpec.describe 'New group page', :js, feature_category: :subgroups do
     sign_in(user)
   end
 
+  it_behaves_like 'a dashboard page with sidebar', :new_group_path, :groups
+
   describe 'new top level group alert' do
     context 'when a user visits the new group page' do
       it 'shows the new top level group alert' do