Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 15:09:20 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 15:09:20 +0300
commitb84eeb256c4a780d902faee1f99ca9a711b3214a (patch)
tree32918aadbea9210eace50efbce9afbfb8cd3ba84 /spec/fixtures
parent53ae6b7e3f83591ad251a3f771f5bf3b8cf087ba (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/test_reports_comparer.json2
-rw-r--r--spec/fixtures/api/schemas/entities/test_suite_comparer.json12
2 files changed, 8 insertions, 6 deletions
diff --git a/spec/fixtures/api/schemas/entities/test_reports_comparer.json b/spec/fixtures/api/schemas/entities/test_reports_comparer.json
index d7880801c01..03812527f71 100644
--- a/spec/fixtures/api/schemas/entities/test_reports_comparer.json
+++ b/spec/fixtures/api/schemas/entities/test_reports_comparer.json
@@ -12,11 +12,13 @@
"properties": {
"total": { "type": "integer" },
"resolved": { "type": "integer" },
+ "errored": { "type": "integer" },
"failed": { "type": "integer" }
},
"required": [
"total",
"resolved",
+ "errored",
"failed"
]
},
diff --git a/spec/fixtures/api/schemas/entities/test_suite_comparer.json b/spec/fixtures/api/schemas/entities/test_suite_comparer.json
index d63fea1f0db..ecb331ae013 100644
--- a/spec/fixtures/api/schemas/entities/test_suite_comparer.json
+++ b/spec/fixtures/api/schemas/entities/test_suite_comparer.json
@@ -16,17 +16,17 @@
"properties": {
"total": { "type": "integer" },
"resolved": { "type": "integer" },
+ "errored": { "type": "integer" },
"failed": { "type": "integer" }
},
- "required": [
- "total",
- "resolved",
- "failed"
- ]
+ "required": ["total", "resolved", "errored", "failed"]
},
"new_failures": { "type": "array", "items": { "$ref": "test_case.json" } },
"resolved_failures": { "type": "array", "items": { "$ref": "test_case.json" } },
- "existing_failures": { "type": "array", "items": { "$ref": "test_case.json" } }
+ "existing_failures": { "type": "array", "items": { "$ref": "test_case.json" } },
+ "new_errors": { "type": "array", "items": { "$ref": "test_case.json" } },
+ "resolved_errors": { "type": "array", "items": { "$ref": "test_case.json" } },
+ "existing_errors": { "type": "array", "items": { "$ref": "test_case.json" } }
},
"additionalProperties": false
}