From bf8c20729baffbf55605484230ff33680d72139b Mon Sep 17 00:00:00 2001
From: Oswaldo Ferreira <oswaldo@gitlab.com>
Date: Thu, 7 Dec 2017 15:41:30 -0200
Subject: Cache merged and closed events data in merge_request_metrics table

---
 .../vue_mr_widget/components/states/mr_widget_merged_spec.js  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js')

diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
index 2714e8294fa..90972469630 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
@@ -14,10 +14,13 @@ const createComponent = () => {
     canRevertInCurrentMR: true,
     canRemoveSourceBranch: true,
     sourceBranchRemoved: true,
-    mergedEvent: {
-      author: {},
-      updatedAt: 'mergedUpdatedAt',
-      formattedUpdatedAt: '',
+    metrics: {
+      mergedBy: {},
+      mergedAt: 'mergedUpdatedAt',
+      readableMergedAt: '',
+      closedBy: {},
+      closedAt: 'mergedUpdatedAt',
+      readableClosedAt: '',
     },
     updatedAt: 'mrUpdatedAt',
     targetBranch,
-- 
cgit v1.2.1


From 254c0754eb668ecbb78650d72510ca199a9820de Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Fri, 15 Dec 2017 00:11:00 -0600
Subject: Switch vue_merge_request_widget to Axios

---
 .../vue_mr_widget/components/states/mr_widget_merged_spec.js        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js')

diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
index 2714e8294fa..9d3ae4b448f 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
@@ -111,10 +111,8 @@ describe('MRWidgetMerged', () => {
         spyOn(eventHub, '$emit');
         spyOn(vm.service, 'removeSourceBranch').and.returnValue(new Promise((resolve) => {
           resolve({
-            json() {
-              return {
-                message: 'Branch was removed',
-              };
+            data: {
+              message: 'Branch was removed',
             },
           });
         }));
-- 
cgit v1.2.1