Fixed failing tests

1 files changed, 8 insertions, 9 deletions

diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6
index 0be938448b2..d929fba06b4 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js.es6
+++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6
@@ -34,10 +34,12 @@
     }
 
     resolveAll(namespace, mergeRequestId, discussionId) {
+      const discussion = CommentsStore.state[discussionId];
+
       this.setCSRF();
       Vue.http.options.root = `/${namespace}`;
 
-      CommentsStore.loading[discussionId] = true;
+      discussion.loading = true;
 
       return this.discussionResource.save({
         mergeRequestId,
@@ -45,31 +47,28 @@
       }, {}).then((response) => {
         const data = response.data;
         const user = data ? data.resolved_by : null;
-        const discussion = CommentsStore.state[discussionId];
         discussion.resolveAllNotes(user);
-
-        CommentsStore.loading[discussionId] = false;
-
+        discussion.loading = false;
 
         this.updateUpdatedHtml(discussionId, data);
       });
     }
 
     unResolveAll(namespace, mergeRequestId, discussionId) {
+      const discussion = CommentsStore.state[discussionId];
+
       this.setCSRF();
       Vue.http.options.root = `/${namespace}`;
 
-      CommentsStore.loading[discussionId] = true;
+      discussion.loading = true;
 
       return this.discussionResource.delete({
         mergeRequestId,
         discussionId
       }, {}).then((response) => {
         const data = response.data;
-        const discussion = CommentsStore.state[discussionId];
         discussion.unResolveAllNotes();
-
-        CommentsStore.loading[discussionId] = false;
+        discussion.loading = false;
 
         this.updateUpdatedHtml(discussionId, data);
       });