Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42

1 files changed, 31 insertions, 3 deletions

diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
index 57270e8f7c7..0a06a052bc2 100644
--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -92,7 +92,7 @@ RSpec.describe 'Dropdown assignee', :js, feature_category: :team_planning do
       sign_in(subgroup_user)
     end
 
-    it 'shows inherited, direct, and invited group members but not descendent members', :aggregate_failures do
+    it 'shows inherited, direct, and invited group members including descendent members', :aggregate_failures do
       visit issues_group_path(subgroup)
 
       select_tokens 'Assignee', '='
@@ -100,8 +100,8 @@ RSpec.describe 'Dropdown assignee', :js, feature_category: :team_planning do
       expect(page).to have_text group_user.name
       expect(page).to have_text subgroup_user.name
       expect(page).to have_text invited_to_group_group_user.name
-      expect(page).not_to have_text subsubgroup_user.name
-      expect(page).not_to have_text invited_to_project_group_user.name
+      expect(page).to have_text subsubgroup_user.name
+      expect(page).to have_text invited_to_project_group_user.name
 
       visit project_issues_path(subgroup_project)
 
@@ -113,5 +113,33 @@ RSpec.describe 'Dropdown assignee', :js, feature_category: :team_planning do
       expect(page).to have_text invited_to_group_group_user.name
       expect(page).not_to have_text subsubgroup_user.name
     end
+
+    context 'when new_graphql_users_autocomplete is disabled' do
+      before do
+        stub_feature_flags(new_graphql_users_autocomplete: false)
+      end
+
+      it 'shows inherited, direct, and invited group members but not descendent members', :aggregate_failures do
+        visit issues_group_path(subgroup)
+
+        select_tokens 'Assignee', '='
+
+        expect(page).to have_text group_user.name
+        expect(page).to have_text subgroup_user.name
+        expect(page).to have_text invited_to_group_group_user.name
+        expect(page).not_to have_text subsubgroup_user.name
+        expect(page).not_to have_text invited_to_project_group_user.name
+
+        visit project_issues_path(subgroup_project)
+
+        select_tokens 'Assignee', '='
+
+        expect(page).to have_text group_user.name
+        expect(page).to have_text subgroup_user.name
+        expect(page).to have_text invited_to_project_group_user.name
+        expect(page).to have_text invited_to_group_group_user.name
+        expect(page).not_to have_text subsubgroup_user.name
+      end
+    end
   end
 end