diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2018-01-08 13:33:30 +0100 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2018-01-08 13:33:30 +0100 |
commit | 3f54abb26c48885cb022a1a86ac7dc947579869c (patch) | |
tree | fe1281a3a9d983fbd983d856f24b36112815f6cf | |
parent | 62943cd7961ebe9e3f3343302ec6509c40f5f1fb (diff) | |
download | gitlab-ce-3f54abb26c48885cb022a1a86ac7dc947579869c.tar.gz |
Make tasklist:changed test in merge_request_spec.js asyncwinh-fix-merge-request-spec
-rw-r--r-- | spec/javascripts/merge_request_spec.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js index 2f02c11482f..9d6ea3781bc 100644 --- a/spec/javascripts/merge_request_spec.js +++ b/spec/javascripts/merge_request_spec.js @@ -19,17 +19,24 @@ import IssuablesHelper from '~/helpers/issuables_helper'; $('input[type=checkbox]').attr('checked', true)[0].dispatchEvent(changeEvent); return expect($('.js-task-list-field').val()).toBe('- [x] Task List Item'); }); - return it('submits an ajax request on tasklist:changed', function() { - spyOn(jQuery, 'ajax').and.callFake(function(req) { + + it('submits an ajax request on tasklist:changed', (done) => { + spyOn(jQuery, 'ajax').and.callFake((req) => { expect(req.type).toBe('PATCH'); expect(req.url).toBe(`${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/merge_requests/1.json`); - return expect(req.data.merge_request.description).not.toBe(null); + expect(req.data.merge_request.description).not.toBe(null); + done(); }); - return $('.js-task-list-field').trigger('tasklist:changed'); + + $('.js-task-list-field').trigger('tasklist:changed'); }); }); describe('class constructor', () => { + beforeEach(() => { + spyOn(jQuery, 'ajax').and.stub(); + }); + it('calls .initCloseReopenReport', () => { spyOn(IssuablesHelper, 'initCloseReopenReport'); |