diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-03-09 14:18:59 -0600 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-03-09 15:18:09 -0600 |
commit | f248be7257e82d15fa6441c551e4314bd36343d4 (patch) | |
tree | 773b6eefd1ae186432ec1c5fa469d80dbcec4349 /spec/javascripts/merge_request_spec.js | |
parent | c591cf539072f8ef25ed5afc162bc7e87348cc15 (diff) | |
download | gitlab-ce-f248be7257e82d15fa6441c551e4314bd36343d4.tar.gz |
require jQuery to be explicitly importedremove-jquery-globals
Diffstat (limited to 'spec/javascripts/merge_request_spec.js')
-rw-r--r-- | spec/javascripts/merge_request_spec.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js index bdfd16ac995..74ceff76d37 100644 --- a/spec/javascripts/merge_request_spec.js +++ b/spec/javascripts/merge_request_spec.js @@ -1,4 +1,6 @@ /* eslint-disable space-before-function-paren, no-return-assign */ + +import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; import MergeRequest from '~/merge_request'; @@ -27,7 +29,7 @@ import IssuablesHelper from '~/helpers/issuables_helper'; }); it('modifies the Markdown field', function() { - spyOn(jQuery, 'ajax').and.stub(); + spyOn($, 'ajax').and.stub(); const changeEvent = document.createEvent('HTMLEvents'); changeEvent.initEvent('change', true, true); $('input[type=checkbox]').attr('checked', true)[0].dispatchEvent(changeEvent); @@ -48,7 +50,7 @@ import IssuablesHelper from '~/helpers/issuables_helper'; describe('class constructor', () => { beforeEach(() => { - spyOn(jQuery, 'ajax').and.stub(); + spyOn($, 'ajax').and.stub(); }); it('calls .initCloseReopenReport', () => { |