Merge branch '52383-ui-filter-assignee-none-any' into 'master'

Add None/Any options for assignee in search bar

Closes #52383

See merge request gitlab-org/gitlab-ce!22599

3 files changed, 12 insertions, 4 deletions

diff --git a/spec/features/boards/modal_filter_spec.rb b/spec/features/boards/modal_filter_spec.rb
index 615223a2a88..2cdd3f55b50 100644
--- a/spec/features/boards/modal_filter_spec.rb
+++ b/spec/features/boards/modal_filter_spec.rb
@@ -106,7 +106,7 @@ describe 'Issue Boards add issue modal filtering', :js do
 
     it 'filters by unassigned' do
       set_filter('assignee')
-      click_filter_link('No Assignee')
+      click_filter_link('None')
       submit_filter
 
       page.within('.add-issues-modal') do
diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
index d011d2545bb..e910fb54d23 100644
--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -156,13 +156,21 @@ describe 'Dropdown assignee', :js do
       expect_filtered_search_input_empty
     end
 
-    it 'selects `no assignee`' do
-      find('#js-dropdown-assignee .filter-dropdown-item', text: 'No Assignee').click
+    it 'selects `None`' do
+      find('#js-dropdown-assignee .filter-dropdown-item', text: 'None').click
 
       expect(page).to have_css(js_dropdown_assignee, visible: false)
       expect_tokens([assignee_token('none')])
       expect_filtered_search_input_empty
     end
+
+    it 'selects `Any`' do
+      find('#js-dropdown-assignee .filter-dropdown-item', text: 'Any').click
+
+      expect(page).to have_css(js_dropdown_assignee, visible: false)
+      expect_tokens([assignee_token('any')])
+      expect_filtered_search_input_empty
+    end
   end
 
   describe 'selecting from dropdown without Ajax call' do
diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb
index 6ac7ccd00f7..1e1dd5691ab 100644
--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -118,7 +118,7 @@ describe 'Visual tokens', :js do
 
     describe 'selecting static option from dropdown' do
       before do
-        find("#js-dropdown-assignee").find('.filter-dropdown-item', text: 'No Assignee').click
+        find("#js-dropdown-assignee").find('.filter-dropdown-item', text: 'None').click
       end
 
       it 'changes value in visual token' do