diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-02-17 15:12:48 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-02-17 15:12:48 +0000 |
commit | 996ea3e524b833f0024aecd4d3fef7f6eeaf5652 (patch) | |
tree | b407f1f339c43fbd761da9632fa37562479ee217 /spec | |
parent | 40ab56045baef7130c1f8fe88b098fd01f0ec430 (diff) | |
parent | 8a928af0fc54a84c5b858955e7459512155d4af0 (diff) | |
download | gitlab-ce-996ea3e524b833f0024aecd4d3fef7f6eeaf5652.tar.gz |
Merge branch 'task_list_refactor' into 'master'
move task_list setup and events to own class
See merge request !9016
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/merge_request_spec.js | 6 | ||||
-rw-r--r-- | spec/javascripts/notes_spec.js | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js index 25cfa9e9479..34c98f5176a 100644 --- a/spec/javascripts/merge_request_spec.js +++ b/spec/javascripts/merge_request_spec.js @@ -6,9 +6,9 @@ require('~/merge_request'); (function() { describe('MergeRequest', function() { return describe('task lists', function() { - preloadFixtures('static/merge_requests_show.html.raw'); + preloadFixtures('merge_requests/merge_request_with_task_list.html.raw'); beforeEach(function() { - loadFixtures('static/merge_requests_show.html.raw'); + loadFixtures('merge_requests/merge_request_with_task_list.html.raw'); return this.merge = new MergeRequest(); }); it('modifies the Markdown field', function() { @@ -19,7 +19,7 @@ require('~/merge_request'); return it('submits an ajax request on tasklist:changed', function() { spyOn(jQuery, 'ajax').and.callFake(function(req) { expect(req.type).toBe('PATCH'); - expect(req.url).toBe('/foo'); + 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); }); return $('.js-task-list-field').trigger('tasklist:changed'); diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index af495787c54..b5b4f61e5d5 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -35,15 +35,13 @@ require('~/lib/utils/text_utility'); expect($('.js-task-list-field').val()).toBe('- [x] Task List Item'); }); - it('submits the form on tasklist:changed', function() { - var submitted = false; - $('form').on('submit', function(e) { - submitted = true; - e.preventDefault(); + it('submits an ajax request on tasklist:changed', function() { + spyOn(jQuery, 'ajax').and.callFake(function(req) { + expect(req.type).toBe('PATCH'); + expect(req.url).toBe('http://test.host/frontend-fixtures/issues-project/notes/1'); + return expect(req.data.note).not.toBe(null); }); - $('.js-task-list-field').trigger('tasklist:changed'); - expect(submitted).toBe(true); }); }); |