diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-06-15 16:21:53 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-06-15 16:21:53 -0500 |
| commit | 132be812d1c4ecf185f8839432f6bcafa13880e5 (patch) | |
| tree | 1a9316a7ddc27ac72b12db4c796f8e20b964964d | |
| parent | d5ab729dd31725b8657112c83082dc57c10f5089 (diff) | |
| download | gitlab-ce-132be812d1c4ecf185f8839432f6bcafa13880e5.tar.gz | |
fix frontend test failures after jasmine upgradekarma-headless-chrome-redux
| -rw-r--r-- | app/assets/javascripts/api.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/issue_show/components/app_spec.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 6680834a8d1..56fa0d71a9a 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -77,7 +77,7 @@ const Api = { dataType: 'json', }) .done(label => callback(label)) - .error(message => callback(message.responseJSON)); + .fail(message => callback(message.responseJSON)); }, // Return group projects list. Filtered by query @@ -134,7 +134,7 @@ const Api = { dataType: 'json', }) .done(file => callback(null, file)) - .error(callback); + .fail(callback); }, users(query, options) { diff --git a/spec/javascripts/issue_show/components/app_spec.js b/spec/javascripts/issue_show/components/app_spec.js index 59c006aa0af..2ccc4f16192 100644 --- a/spec/javascripts/issue_show/components/app_spec.js +++ b/spec/javascripts/issue_show/components/app_spec.js @@ -126,7 +126,7 @@ describe('Issuable output', () => { describe('updateIssuable', () => { it('fetches new data after update', (done) => { - spyOn(vm.service, 'getData'); + spyOn(vm.service, 'getData').and.callThrough(); spyOn(vm.service, 'updateIssuable').and.callFake(() => new Promise((resolve) => { resolve({ json() { |