Merge branch 'master' into 28433-internationalise-cycle-analytics-page

1 files changed, 59 insertions, 4 deletions

diff --git a/spec/javascripts/filtered_search/filtered_search_manager_spec.js b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
index 6683489f63c..e747aa497c2 100644
--- a/spec/javascripts/filtered_search/filtered_search_manager_spec.js
+++ b/spec/javascripts/filtered_search/filtered_search_manager_spec.js
@@ -26,6 +26,10 @@ describe('Filtered Search Manager', () => {
     element.dispatchEvent(event);
   }
 
+  function getVisualTokens() {
+    return tokensContainer.querySelectorAll('.js-visual-token');
+  }
+
   beforeEach(() => {
     setFixtures(`
       <div class="filtered-search-box">
@@ -170,11 +174,37 @@ describe('Filtered Search Manager', () => {
     });
   });
 
-  describe('removeSelectedToken', () => {
-    function getVisualTokens() {
-      return tokensContainer.querySelectorAll('.js-visual-token');
-    }
+  describe('removeToken', () => {
+    it('removes token even when it is already selected', () => {
+      tokensContainer.innerHTML = FilteredSearchSpecHelper.createTokensContainerHTML(
+        FilteredSearchSpecHelper.createFilterVisualTokenHTML('milestone', 'none', true),
+      );
+
+      tokensContainer.querySelector('.js-visual-token .remove-token').click();
+      expect(tokensContainer.querySelector('.js-visual-token')).toEqual(null);
+    });
 
+    describe('unselected token', () => {
+      beforeEach(() => {
+        spyOn(gl.FilteredSearchManager.prototype, 'removeSelectedToken').and.callThrough();
+
+        tokensContainer.innerHTML = FilteredSearchSpecHelper.createTokensContainerHTML(
+          FilteredSearchSpecHelper.createFilterVisualTokenHTML('milestone', 'none'),
+        );
+        tokensContainer.querySelector('.js-visual-token .remove-token').click();
+      });
+
+      it('removes token when remove button is selected', () => {
+        expect(tokensContainer.querySelector('.js-visual-token')).toEqual(null);
+      });
+
+      it('calls removeSelectedToken', () => {
+        expect(manager.removeSelectedToken).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('removeSelectedTokenKeydown', () => {
     beforeEach(() => {
       tokensContainer.innerHTML = FilteredSearchSpecHelper.createTokensContainerHTML(
         FilteredSearchSpecHelper.createFilterVisualTokenHTML('milestone', 'none', true),
@@ -224,6 +254,31 @@ describe('Filtered Search Manager', () => {
     });
   });
 
+  describe('removeSelectedToken', () => {
+    beforeEach(() => {
+      spyOn(gl.FilteredSearchVisualTokens, 'removeSelectedToken').and.callThrough();
+      spyOn(gl.FilteredSearchManager.prototype, 'handleInputPlaceholder').and.callThrough();
+      spyOn(gl.FilteredSearchManager.prototype, 'toggleClearSearchButton').and.callThrough();
+      manager.removeSelectedToken();
+    });
+
+    it('calls FilteredSearchVisualTokens.removeSelectedToken', () => {
+      expect(gl.FilteredSearchVisualTokens.removeSelectedToken).toHaveBeenCalled();
+    });
+
+    it('calls handleInputPlaceholder', () => {
+      expect(manager.handleInputPlaceholder).toHaveBeenCalled();
+    });
+
+    it('calls toggleClearSearchButton', () => {
+      expect(manager.toggleClearSearchButton).toHaveBeenCalled();
+    });
+
+    it('calls update dropdown offset', () => {
+      expect(manager.dropdownManager.updateDropdownOffset).toHaveBeenCalled();
+    });
+  });
+
   describe('unselects token', () => {
     beforeEach(() => {
       tokensContainer.innerHTML = FilteredSearchSpecHelper.createTokensContainerHTML(`