Merge branch 'move-filter-mr-clear-search-spec-to-js' into 'master'

Move clear search test to JS to reduce overkill

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

2 files changed, 19 insertions, 16 deletions

diff --git a/spec/features/merge_requests/filter_by_labels_spec.rb b/spec/features/merge_requests/filter_by_labels_spec.rb
index 9912e8165e6..7adae08e499 100644
--- a/spec/features/merge_requests/filter_by_labels_spec.rb
+++ b/spec/features/merge_requests/filter_by_labels_spec.rb
@@ -79,22 +79,6 @@ feature 'Merge Request filtering by Labels', :js do
     end
   end
 
-  context 'clear button' do
-    before do
-      input_filtered_search('label:~bug')
-    end
-
-    it 'allows user to remove filtered labels' do
-      first('.clear-search').click
-      filtered_search.send_keys(:enter)
-
-      expect(page).to have_issuable_counts(open: 3, closed: 0, all: 3)
-      expect(page).to have_content "Bugfix2"
-      expect(page).to have_content "Feature1"
-      expect(page).to have_content "Bugfix1"
-    end
-  end
-
   context 'filter dropdown' do
     it 'filters by label name' do
       init_label_search
diff --git a/spec/javascripts/filtered_search/filtered_search_manager_spec.js b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
index f209328dee1..230c15e5de6 100644
--- a/spec/javascripts/filtered_search/filtered_search_manager_spec.js
+++ b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
@@ -396,6 +396,25 @@ describe('Filtered Search Manager', () => {
     });
   });
 
+  describe('Clearing search', () => {
+    beforeEach(() => {
+      initializeManager();
+    });
+
+    it('Clicking the "x" clear button, clears the input', () => {
+      const inputValue = 'label:~bug ';
+      manager.filteredSearchInput.value = inputValue;
+      manager.filteredSearchInput.dispatchEvent(new Event('input'));
+
+      expect(gl.DropdownUtils.getSearchQuery()).toEqual(inputValue);
+
+      manager.clearSearchButton.click();
+
+      expect(manager.filteredSearchInput.value).toEqual('');
+      expect(gl.DropdownUtils.getSearchQuery()).toEqual('');
+    });
+  });
+
   describe('toggleInputContainerFocus', () => {
     beforeEach(() => {
       initializeManager();