From feee48a4cfe37ac25c55d82cba0d96b4b37d85a1 Mon Sep 17 00:00:00 2001
From: Oswaldo Ferreira <oswaldo@gitlab.com>
Date: Tue, 2 Jan 2018 19:27:00 -0200
Subject: [PATCH] Fixes spec failures due to not returning metrics for MRs
 other than closed/merged

---
 .../vue_merge_request_widget/stores/mr_widget_store.js      | 4 ++++
 .../fixtures/api/schemas/entities/merge_request_widget.json | 6 ++++--
 spec/serializers/merge_request_widget_entity_spec.rb        | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index 3b0672cb936..474c17ec133 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -125,6 +125,10 @@ export default class MergeRequestStore {
   }
 
   static buildMetrics(metrics) {
+    if (!metrics) {
+      return {};
+    }
+
     return {
       mergedBy: MergeRequestStore.formatUserObject(metrics.merged_by),
       closedBy: MergeRequestStore.formatUserObject(metrics.closed_by),
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json
index dad415e7d81..9de27bee751 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_widget.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json
@@ -32,8 +32,10 @@
     "target_branch": { "type": "string" },
     "target_project_id": { "type": "integer" },
     "metrics": {
-      "type": "object",
-      "$ref": "merge_request_metrics.json"
+      "oneOf": [
+        { "type": "null" },
+        { "$ref": "merge_request_metrics.json" }
+      ]
     },
     "author": { "type": ["object", "null"] },
     "merge_user": { "type": ["object", "null"] },
diff --git a/spec/serializers/merge_request_widget_entity_spec.rb b/spec/serializers/merge_request_widget_entity_spec.rb
index 9bbe815c115..e25552eb0d8 100644
--- a/spec/serializers/merge_request_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_widget_entity_spec.rb
@@ -72,6 +72,7 @@ describe MergeRequestWidgetEntity do
 
     context 'when metrics does not exists' do
       before do
+        resource.mark_as_merged!
         resource.metrics.destroy!
         resource.reload
       end
-- 
GitLab