1 files changed, 72 insertions, 40 deletions

diff --git a/spec/javascripts/ide/components/merge_requests/list_spec.js b/spec/javascripts/ide/components/merge_requests/list_spec.js
index f4b393778dc..c761315444c 100644
--- a/spec/javascripts/ide/components/merge_requests/list_spec.js
+++ b/spec/javascripts/ide/components/merge_requests/list_spec.js
@@ -10,10 +10,7 @@ describe('IDE merge requests list', () => {
   let vm;
 
   beforeEach(() => {
-    vm = createComponentWithStore(Component, store, {
-      type: 'created',
-      emptyText: 'empty text',
-    });
+    vm = createComponentWithStore(Component, store, {});
 
     spyOn(vm, 'fetchMergeRequests');
 
@@ -28,13 +25,13 @@ describe('IDE merge requests list', () => {
 
   it('calls fetch on mounted', () => {
     expect(vm.fetchMergeRequests).toHaveBeenCalledWith({
-      type: 'created',
       search: '',
+      type: '',
     });
   });
 
   it('renders loading icon', done => {
-    vm.$store.state.mergeRequests.created.isLoading = true;
+    vm.$store.state.mergeRequests.isLoading = true;
 
     vm.$nextTick(() => {
       expect(vm.$el.querySelector('.loading-container')).not.toBe(null);
@@ -43,10 +40,6 @@ describe('IDE merge requests list', () => {
     });
   });
 
-  it('renders empty text when no merge requests exist', () => {
-    expect(vm.$el.textContent).toContain('empty text');
-  });
-
   it('renders no search results text when search is not empty', done => {
     vm.search = 'testing';
 
@@ -57,9 +50,29 @@ describe('IDE merge requests list', () => {
     });
   });
 
+  it('clicking on search type, sets currentSearchType and loads merge requests', done => {
+    vm.onSearchFocus();
+
+    vm.$nextTick()
+      .then(() => {
+        vm.$el.querySelector('li button').click();
+
+        return vm.$nextTick();
+      })
+      .then(() => {
+        expect(vm.currentSearchType).toEqual(vm.$options.searchTypes[0]);
+        expect(vm.fetchMergeRequests).toHaveBeenCalledWith({
+          type: vm.currentSearchType.type,
+          search: '',
+        });
+      })
+      .then(done)
+      .catch(done.fail);
+  });
+
   describe('with merge requests', () => {
     beforeEach(done => {
-      vm.$store.state.mergeRequests.created.mergeRequests.push({
+      vm.$store.state.mergeRequests.mergeRequests.push({
         ...mergeRequests[0],
         projectPathWithNamespace: 'gitlab-org/gitlab-ce',
       });
@@ -71,35 +84,6 @@ describe('IDE merge requests list', () => {
       expect(vm.$el.querySelectorAll('li').length).toBe(1);
       expect(vm.$el.querySelector('li').textContent).toContain(mergeRequests[0].title);
     });
-
-    it('calls openMergeRequest when clicking merge request', done => {
-      spyOn(vm, 'openMergeRequest');
-      vm.$el.querySelector('li button').click();
-
-      vm.$nextTick(() => {
-        expect(vm.openMergeRequest).toHaveBeenCalledWith({
-          projectPath: 'gitlab-org/gitlab-ce',
-          id: 1,
-        });
-
-        done();
-      });
-    });
-  });
-
-  describe('focusSearch', () => {
-    it('focuses search input when loading is false', done => {
-      spyOn(vm.$refs.searchInput, 'focus');
-
-      vm.$store.state.mergeRequests.created.isLoading = false;
-      vm.focusSearch();
-
-      vm.$nextTick(() => {
-        expect(vm.$refs.searchInput.focus).toHaveBeenCalled();
-
-        done();
-      });
-    });
   });
 
   describe('searchMergeRequests', () => {
@@ -123,4 +107,52 @@ describe('IDE merge requests list', () => {
       expect(vm.loadMergeRequests).toHaveBeenCalled();
     });
   });
+
+  describe('onSearchFocus', () => {
+    it('shows search types', done => {
+      vm.$el.querySelector('input').dispatchEvent(new Event('focus'));
+
+      expect(vm.hasSearchFocus).toBe(true);
+      expect(vm.showSearchTypes).toBe(true);
+
+      vm.$nextTick()
+        .then(() => {
+          const expectedSearchTypes = vm.$options.searchTypes.map(x => x.label);
+          const renderedSearchTypes = Array.from(vm.$el.querySelectorAll('li'))
+            .map(x => x.textContent.trim());
+
+          expect(renderedSearchTypes).toEqual(expectedSearchTypes);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('does not show search types, if already has search value', () => {
+      vm.search = 'lorem ipsum';
+      vm.$el.querySelector('input').dispatchEvent(new Event('focus'));
+
+      expect(vm.hasSearchFocus).toBe(true);
+      expect(vm.showSearchTypes).toBe(false);
+    });
+
+    it('does not show search types, if already has a search type', () => {
+      vm.currentSearchType = {};
+      vm.$el.querySelector('input').dispatchEvent(new Event('focus'));
+
+      expect(vm.hasSearchFocus).toBe(true);
+      expect(vm.showSearchTypes).toBe(false);
+    });
+
+    it('resets hasSearchFocus when search changes', done => {
+      vm.hasSearchFocus = true;
+      vm.search = 'something else';
+
+      vm.$nextTick()
+        .then(() => {
+          expect(vm.hasSearchFocus).toBe(false);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
 });