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:
authorShinya Maeda <shinya@gitlab.com>2018-08-03 14:08:13 +0300
committerShinya Maeda <shinya@gitlab.com>2018-08-03 14:08:13 +0300
commit41f28a9ffabf4eb45c53836ea4de3b7a49229eaa (patch)
tree174d41cf6bb28ccc3c88727618886a431364a63c /spec/fixtures
parent06b8f47cf3b8ce65012fe905f6d3953ff175fa85 (diff)
Add factory for parsers. Add required specification in json schema matcher. Improved test code.
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/entities/test_case.json4
-rw-r--r--spec/fixtures/api/schemas/entities/test_reports_comparer.json19
-rw-r--r--spec/fixtures/api/schemas/entities/test_suite_comparer.json22
3 files changed, 39 insertions, 6 deletions
diff --git a/spec/fixtures/api/schemas/entities/test_case.json b/spec/fixtures/api/schemas/entities/test_case.json
index 9b08d6c2302..c9ba1f3ad18 100644
--- a/spec/fixtures/api/schemas/entities/test_case.json
+++ b/spec/fixtures/api/schemas/entities/test_case.json
@@ -1,5 +1,9 @@
{
"type": "object",
+ "required" : [
+ "status",
+ "name"
+ ],
"properties": {
"status": { "type": "string" },
"name": { "type": "string" },
diff --git a/spec/fixtures/api/schemas/entities/test_reports_comparer.json b/spec/fixtures/api/schemas/entities/test_reports_comparer.json
index a7cd934069a..d7880801c01 100644
--- a/spec/fixtures/api/schemas/entities/test_reports_comparer.json
+++ b/spec/fixtures/api/schemas/entities/test_reports_comparer.json
@@ -1,11 +1,24 @@
{
"type": "object",
+ "required" : [
+ "status",
+ "summary",
+ "suites"
+ ],
"properties": {
"status": { "type": "string" },
"summary": {
- "total": { "type": "integer" },
- "resolved": { "type": "integer" },
- "failed": { "type": "integer" }
+ "type": "object",
+ "properties": {
+ "total": { "type": "integer" },
+ "resolved": { "type": "integer" },
+ "failed": { "type": "integer" }
+ },
+ "required": [
+ "total",
+ "resolved",
+ "failed"
+ ]
},
"suites": { "type": "array", "items": { "$ref": "test_suite_comparer.json" } }
},
diff --git a/spec/fixtures/api/schemas/entities/test_suite_comparer.json b/spec/fixtures/api/schemas/entities/test_suite_comparer.json
index 192a8f3fd71..d63fea1f0db 100644
--- a/spec/fixtures/api/schemas/entities/test_suite_comparer.json
+++ b/spec/fixtures/api/schemas/entities/test_suite_comparer.json
@@ -1,12 +1,28 @@
{
"type": "object",
+ "required": [
+ "name",
+ "status",
+ "summary",
+ "new_failures",
+ "resolved_failures",
+ "existing_failures"
+ ],
"properties": {
"name": { "type": "string" },
"status": { "type": "string" },
"summary": {
- "total": { "type": "integer" },
- "resolved": { "type": "integer" },
- "failed": { "type": "integer" }
+ "type": "object",
+ "properties": {
+ "total": { "type": "integer" },
+ "resolved": { "type": "integer" },
+ "failed": { "type": "integer" }
+ },
+ "required": [
+ "total",
+ "resolved",
+ "failed"
+ ]
},
"new_failures": { "type": "array", "items": { "$ref": "test_case.json" } },
"resolved_failures": { "type": "array", "items": { "$ref": "test_case.json" } },