summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-02-02 14:54:18 +0000
committerPhil Hughes <me@iamphill.com>2018-02-05 09:41:46 +0000
commit39fa83553c6a05ebc08adc2eff8f8d25d9cdd8ac (patch)
tree9d8ba359a1ed6039002a5cb3bf2330121b1a2047
parent10cc5d1a8069a3347b1139ea46c38a373b2b3a35 (diff)
downloadgitlab-ce-39fa83553c6a05ebc08adc2eff8f8d25d9cdd8ac.tar.gz
fixed unhandled promise rejection
-rw-r--r--app/assets/javascripts/right_sidebar.js4
-rw-r--r--spec/javascripts/right_sidebar_spec.js3
2 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js
index 36658516228..01c3be5411f 100644
--- a/app/assets/javascripts/right_sidebar.js
+++ b/app/assets/javascripts/right_sidebar.js
@@ -75,12 +75,12 @@ Sidebar.prototype.toggleTodo = function(e) {
$('.js-issuable-todo').disable().addClass('is-loading');
- return axios[ajaxType](url, {
+ axios[ajaxType](url, {
issuable_id: $this.data('issuable-id'),
issuable_type: $this.data('issuable-type'),
}).then(({ data }) => {
this.todoUpdateDone(data);
- });
+ }).catch(() => flash(`There was an error ${ajaxType === 'post' ? 'adding a' : 'deleting the'} todo.`));
};
Sidebar.prototype.todoUpdateDone = function(data) {
diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js
index 05a958f754b..35bb630bf5d 100644
--- a/spec/javascripts/right_sidebar_spec.js
+++ b/spec/javascripts/right_sidebar_spec.js
@@ -74,8 +74,7 @@ import Sidebar from '~/right_sidebar';
it('should broadcast todo:toggle event when add todo clicked', function(done) {
var todos = getJSONFixture('todos/todos.json');
- spyOn(axios, 'get').and.callThrough();
- mock.onAny(`${gl.TEST_HOST}/frontend-fixtures/issues-project/todos`).reply(200, todos);
+ mock.onPost(/(.*)\/todos$/).reply(200, todos);
var todoToggleSpy = spyOnEvent(document, 'todo:toggle');