summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2018-01-02 19:27:00 -0200
committerOswaldo Ferreira <oswaldo@gitlab.com>2018-01-02 19:27:00 -0200
commitfeee48a4cfe37ac25c55d82cba0d96b4b37d85a1 (patch)
treea86260b4133c91eb757623a028eb778d644c7300 /spec/fixtures
parentbf8c20729baffbf55605484230ff33680d72139b (diff)
downloadgitlab-ce-feee48a4cfe37ac25c55d82cba0d96b4b37d85a1.tar.gz
Fixes spec failures due to not returning metrics for MRs other than closed/merged
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request_widget.json6
1 files changed, 4 insertions, 2 deletions
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"] },