Merge remote-tracking branch 'upstream/master' into 42572-release-controller

* upstream/master: (889 commits)
  SlackService - respect `notify_only_default_branch` for push events
  Clarify usage ping wording in admin area
  Update incoming emails documents
  Allow to include also descendant group labels
  Update docs on grouping CI jobs
  Support additional LabelsFinder parameters for group labels
  Extend Cluster Applications to install GitLab Runner to Kubernetes cluster
  Remove registry list webpack entry point
  Remove trailing newline that was causing an EE conflict
  Small fixes in Vuex docs
  Remove u2f webpack bundle
  Update documentation WRT to request parameters
  remove common_vue CommonsChunk config
  Fetch commit signatures from Gitaly in batches
  migrate stl_viewer to dynamic import
  migrate sketch_viewer to dynamic import
  migrate pdf_viewer to dynamic import
  migrate notebook_viewer to dynamic import
  migrate balsamiq_viewer to dynamic import
  Add some strings that were missing in gitlab.pot
  ...

1 files changed, 19 insertions, 19 deletions

diff --git a/spec/javascripts/filtered_search/dropdown_user_spec.js b/spec/javascripts/filtered_search/dropdown_user_spec.js
index 02415485d19..c37a964975d 100644
--- a/spec/javascripts/filtered_search/dropdown_user_spec.js
+++ b/spec/javascripts/filtered_search/dropdown_user_spec.js
@@ -1,25 +1,25 @@
-import '~/filtered_search/dropdown_utils';
-import '~/filtered_search/filtered_search_tokenizer';
-import '~/filtered_search/filtered_search_dropdown';
-import '~/filtered_search/dropdown_user';
+import DropdownUtils from '~/filtered_search/dropdown_utils';
+import DropdownUser from '~/filtered_search/dropdown_user';
+import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer';
+import FilteredSearchTokenKeys from '~/filtered_search/filtered_search_token_keys';
 
 describe('Dropdown User', () => {
   describe('getSearchInput', () => {
     let dropdownUser;
 
     beforeEach(() => {
-      spyOn(gl.DropdownUser.prototype, 'bindEvents').and.callFake(() => {});
-      spyOn(gl.DropdownUser.prototype, 'getProjectId').and.callFake(() => {});
-      spyOn(gl.DropdownUser.prototype, 'getGroupId').and.callFake(() => {});
-      spyOn(gl.DropdownUtils, 'getSearchInput').and.callFake(() => {});
+      spyOn(DropdownUser.prototype, 'bindEvents').and.callFake(() => {});
+      spyOn(DropdownUser.prototype, 'getProjectId').and.callFake(() => {});
+      spyOn(DropdownUser.prototype, 'getGroupId').and.callFake(() => {});
+      spyOn(DropdownUtils, 'getSearchInput').and.callFake(() => {});
 
-      dropdownUser = new gl.DropdownUser({
-        tokenKeys: gl.FilteredSearchTokenKeys,
+      dropdownUser = new DropdownUser({
+        tokenKeys: FilteredSearchTokenKeys,
       });
     });
 
     it('should not return the double quote found in value', () => {
-      spyOn(gl.FilteredSearchTokenizer, 'processTokens').and.returnValue({
+      spyOn(FilteredSearchTokenizer, 'processTokens').and.returnValue({
         lastToken: '"johnny appleseed',
       });
 
@@ -27,7 +27,7 @@ describe('Dropdown User', () => {
     });
 
     it('should not return the single quote found in value', () => {
-      spyOn(gl.FilteredSearchTokenizer, 'processTokens').and.returnValue({
+      spyOn(FilteredSearchTokenizer, 'processTokens').and.returnValue({
         lastToken: '\'larry boy',
       });
 
@@ -37,22 +37,22 @@ describe('Dropdown User', () => {
 
   describe('config AjaxFilter\'s endpoint', () => {
     beforeEach(() => {
-      spyOn(gl.DropdownUser.prototype, 'bindEvents').and.callFake(() => {});
-      spyOn(gl.DropdownUser.prototype, 'getProjectId').and.callFake(() => {});
-      spyOn(gl.DropdownUser.prototype, 'getGroupId').and.callFake(() => {});
+      spyOn(DropdownUser.prototype, 'bindEvents').and.callFake(() => {});
+      spyOn(DropdownUser.prototype, 'getProjectId').and.callFake(() => {});
+      spyOn(DropdownUser.prototype, 'getGroupId').and.callFake(() => {});
     });
 
     it('should return endpoint', () => {
       window.gon = {
         relative_url_root: '',
       };
-      const dropdown = new gl.DropdownUser();
+      const dropdown = new DropdownUser();
 
       expect(dropdown.config.AjaxFilter.endpoint).toBe('/autocomplete/users.json');
     });
 
     it('should return endpoint when relative_url_root is undefined', () => {
-      const dropdown = new gl.DropdownUser();
+      const dropdown = new DropdownUser();
 
       expect(dropdown.config.AjaxFilter.endpoint).toBe('/autocomplete/users.json');
     });
@@ -61,7 +61,7 @@ describe('Dropdown User', () => {
       window.gon = {
         relative_url_root: '/gitlab_directory',
       };
-      const dropdown = new gl.DropdownUser();
+      const dropdown = new DropdownUser();
 
       expect(dropdown.config.AjaxFilter.endpoint).toBe('/gitlab_directory/autocomplete/users.json');
     });
@@ -82,7 +82,7 @@ describe('Dropdown User', () => {
       loadFixtures(fixtureTemplate);
       authorFilterDropdownElement = document.querySelector('#js-dropdown-author');
       const dummyInput = document.createElement('div');
-      dropdown = new gl.DropdownUser({
+      dropdown = new DropdownUser({
         dropdown: authorFilterDropdownElement,
         input: dummyInput,
       });