Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 14 deletions

diff --git a/spec/frontend/namespace_select_spec.js b/spec/frontend/namespace_select_spec.js
index 399fa950769..d6f3eb75cd9 100644
--- a/spec/frontend/namespace_select_spec.js
+++ b/spec/frontend/namespace_select_spec.js
@@ -1,56 +1,55 @@
-import $ from 'jquery';
 import NamespaceSelect from '~/namespace_select';
+import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 
-describe('NamespaceSelect', () => {
-  beforeEach(() => {
-    jest.spyOn($.fn, 'glDropdown').mockImplementation(() => {});
-  });
+jest.mock('~/deprecated_jquery_dropdown');
 
-  it('initializes glDropdown', () => {
+describe('NamespaceSelect', () => {
+  it('initializes deprecatedJQueryDropdown', () => {
     const dropdown = document.createElement('div');
 
     // eslint-disable-next-line no-new
     new NamespaceSelect({ dropdown });
 
-    expect($.fn.glDropdown).toHaveBeenCalled();
+    expect(initDeprecatedJQueryDropdown).toHaveBeenCalled();
   });
 
   describe('as input', () => {
-    let glDropdownOptions;
+    let deprecatedJQueryDropdownOptions;
 
     beforeEach(() => {
       const dropdown = document.createElement('div');
       // eslint-disable-next-line no-new
       new NamespaceSelect({ dropdown });
-      [[glDropdownOptions]] = $.fn.glDropdown.mock.calls;
+      [[, deprecatedJQueryDropdownOptions]] = initDeprecatedJQueryDropdown.mock.calls;
     });
 
     it('prevents click events', () => {
       const dummyEvent = new Event('dummy');
       jest.spyOn(dummyEvent, 'preventDefault').mockImplementation(() => {});
 
-      glDropdownOptions.clicked({ e: dummyEvent });
+      // expect(foo).toContain('test');
+      deprecatedJQueryDropdownOptions.clicked({ e: dummyEvent });
 
       expect(dummyEvent.preventDefault).toHaveBeenCalled();
     });
   });
 
   describe('as filter', () => {
-    let glDropdownOptions;
+    let deprecatedJQueryDropdownOptions;
 
     beforeEach(() => {
       const dropdown = document.createElement('div');
       dropdown.dataset.isFilter = 'true';
       // eslint-disable-next-line no-new
       new NamespaceSelect({ dropdown });
-      [[glDropdownOptions]] = $.fn.glDropdown.mock.calls;
+      [[, deprecatedJQueryDropdownOptions]] = initDeprecatedJQueryDropdown.mock.calls;
     });
 
     it('does not prevent click events', () => {
       const dummyEvent = new Event('dummy');
       jest.spyOn(dummyEvent, 'preventDefault').mockImplementation(() => {});
 
-      glDropdownOptions.clicked({ e: dummyEvent });
+      deprecatedJQueryDropdownOptions.clicked({ e: dummyEvent });
 
       expect(dummyEvent.preventDefault).not.toHaveBeenCalled();
     });
@@ -58,7 +57,7 @@ describe('NamespaceSelect', () => {
     it('sets URL of dropdown items', () => {
       const dummyNamespace = { id: 'eal' };
 
-      const itemUrl = glDropdownOptions.url(dummyNamespace);
+      const itemUrl = deprecatedJQueryDropdownOptions.url(dummyNamespace);
 
       expect(itemUrl).toContain(`namespace_id=${dummyNamespace.id}`);
     });