Skip to content
Snippets Groups Projects
Commit 27dfd5d6 authored by Colton Leekley-Winslow's avatar Colton Leekley-Winslow
Browse files

fix job endpoints tests after raml rebase

parent 77be4515
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 63 additions and 20 deletions
raml/examples/output/session-template-recalc.json 0 → 100644
+ 12
− 0
View file @ 27dfd5d6
[
"5818cc639e512c35c9e4d3a3",
"5818cc639e512c35c9e4d3a4",
"5818cc639e512c35c9e4d3a5",
"5818cc639e512c35c9e4d3a6",
"5818cc639e512c35c9e4d3a7",
"5818cc639e512c35c9e4d3a8",
"5818cc639e512c35c9e4d3a9",
"5818cc639e512c35c9e4d3aa",
"5818cc639e512c35c9e4d3ab",
"5818cc639e512c35c9e4d3ac"
]
raml/resources/projects.raml
+ 8
− 9
View file @ 27dfd5d6
......@@ -42,15 +42,11 @@ post:
description: Template was saved
body:
application/json:
example: |
{"modified": 1}
schema: !include ../schemas/output/container-update.json
example: !include ../examples/output/container-update.json
404:
description: Project was not found
/recalc:
uriParameters:
ProjectId:
type: string
required: true
post:
description: |
Recalculate if sessions in the project satisfy the template.
......@@ -60,9 +56,12 @@ post:
description: |
Project's sessions' compliance was recalculated.
Returns list of session that were modified.
body:
application/json:
schema: !include ../schemas/output/session-template-recalc.json
example: !include ../examples/output/session-template-recalc.json
404:
description: Project was not found
delete:
description: Remove the session template for a project
responses:
......@@ -70,8 +69,8 @@ post:
description: Template was removed
body:
application/json:
example: |
{"modified": 1}
example: !include ../examples/output/container-delete.json
schema: !include ../schemas/output/container-delete.json
404:
description: Project was not found
......
raml/schemas/definitions/job.json
+ 6
− 1
View file @ 27dfd5d6
......@@ -111,8 +111,13 @@
},
"required":["type", "uri", "location"]
}
}
},
"target":{"type":"object"},
"outputs":{"type":"array"}
}
},
"saved_files":{
"type":"array"
}
}
}
raml/schemas/definitions/project.json
+ 2
− 1
View file @ 27dfd5d6
......@@ -25,7 +25,8 @@
"permissions":{
"type":"array",
"items":{"$ref":"../definitions/permission.json#"}
}
},
"template":{"$ref":"../definitions/project-template.json#"}
},
"additionalProperties": false
}
......
raml/schemas/definitions/session.json
+ 5
− 1
View file @ 27dfd5d6
......@@ -5,6 +5,8 @@
"uid": {"type": "string"},
"timestamp": {"type": ["string", "null"], "format": "date-time"},
"timezone": {"type": "string"},
"project_has_template":{"type":"boolean"},
"satisfies_template":{"type":"boolean"},
"session-input":{
"type": "object",
"properties": {
......@@ -43,7 +45,9 @@
"type":"array",
"items":{"$ref":"../definitions/permission.json#"}
},
"group":{"$ref":"../definitions/group.json#/definitions/name"}
"group":{"$ref":"../definitions/group.json#/definitions/name"},
"project_has_template":{"$ref":"#/definitions/project_has_template"},
"satisfies_template":{"$ref":"#/definitions/satisfies_template"}
},
"additionalProperties": false
}
......
raml/schemas/output/job-list.json
+ 4
− 1
View file @ 27dfd5d6
......@@ -5,6 +5,7 @@
"type":"object",
"properties":{
"_id":{"$ref":"../definitions/job.json#/definitions/id"},
"origin":{"$ref":"../definitions/job.json#/definitions/origin"},
"name":{"$ref":"../definitions/job.json#/definitions/name"},
"inputs":{"$ref":"../definitions/job.json#/definitions/inputs-array"},
"destination":{"$ref":"../definitions/job.json#/definitions/destination"},
......@@ -13,7 +14,9 @@
"attempt":{"$ref":"../definitions/job.json#/definitions/attempt"},
"created":{"$ref":"../definitions/created-modified.json#/definitions/created"},
"modified":{"$ref":"../definitions/created-modified.json#/definitions/modified"},
"config":{"$ref":"../definitions/job.json#/definitions/config"}
"config":{"$ref":"../definitions/job.json#/definitions/config"},
"request":{"$ref":"../definitions/job.json#/definitions/request"},
"saved_files":{"$ref":"../definitions/job.json#/definitions/saved_files"}
},
"additionalProperties":false,
"required":[
......
raml/schemas/output/job-next.json
+ 3
− 1
View file @ 27dfd5d6
......@@ -3,6 +3,7 @@
"type":"object",
"properties":{
"_id":{"$ref":"../definitions/job.json#/definitions/id"},
"origin":{"$ref":"../definitions/job.json#/definitions/origin"},
"name":{"$ref":"../definitions/job.json#/definitions/name"},
"inputs":{"$ref":"../definitions/job.json#/definitions/inputs-array"},
"destination":{"$ref":"../definitions/job.json#/definitions/destination"},
......@@ -12,7 +13,8 @@
"created":{"$ref":"../definitions/created-modified.json#/definitions/created"},
"modified":{"$ref":"../definitions/created-modified.json#/definitions/modified"},
"config":{"$ref":"../definitions/job.json#/definitions/config"},
"request":{"$ref":"../definitions/job.json#/definitions/request"}
"request":{"$ref":"../definitions/job.json#/definitions/request"},
"saved_files":{"$ref":"../definitions/job.json#/definitions/saved_files"}
},
"additionalProperties":false,
"required":[
......
raml/schemas/output/job.json
+ 1
− 0
View file @ 27dfd5d6
......@@ -3,6 +3,7 @@
"type":"object",
"properties":{
"id":{"$ref":"../definitions/job.json#/definitions/id"},
"origin":{"$ref":"../definitions/job.json#/definitions/origin"},
"name":{"$ref":"../definitions/job.json#/definitions/name"},
"inputs":{"$ref":"../definitions/job.json#/definitions/inputs-object"},
"destination":{"$ref":"../definitions/job.json#/definitions/destination"},
......
raml/schemas/output/session-jobs.json
+ 3
− 1
View file @ 27dfd5d6
......@@ -8,6 +8,7 @@
"type":"object",
"properties":{
"id":{"$ref":"../definitions/job.json#/definitions/id"},
"origin":{"$ref":"../definitions/job.json#/definitions/origin"},
"name":{"$ref":"../definitions/job.json#/definitions/name"},
"inputs":{"$ref":"../definitions/job.json#/definitions/inputs-object"},
"destination":{"$ref":"../definitions/job.json#/definitions/destination"},
......@@ -17,7 +18,8 @@
"created":{"$ref":"../definitions/created-modified.json#/definitions/created"},
"modified":{"$ref":"../definitions/created-modified.json#/definitions/modified"},
"config":{"$ref":"../definitions/job.json#/definitions/config"},
"request":{"$ref":"../definitions/job.json#/definitions/request"}
"request":{"$ref":"../definitions/job.json#/definitions/request"},
"saved_files":{"$ref":"../definitions/job.json#/definitions/saved_files"}
},
"additionalProperties":false,
"required":[
......
raml/schemas/output/session-template-recalc.json 0 → 100644
+ 14
− 0
View file @ 27dfd5d6
{
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties":{
"sessions_changed":{
"type":"array",
"items":{
"allOf":[{"$ref":"../definitions/objectid.json#"}]
}
}
},
"additionalProperties":false,
"required":["sessions_changed"]
}
test/integration_tests/postman/integration_tests.postman_collection
+ 5
− 5
View file @ 27dfd5d6
{
"variables": [],
"info": {
"name": "test",
"_postman_id": "00548165-ad93-9f33-4cbc-ca7721664759",
"name": "test copy",
"_postman_id": "3b18b34b-ff24-0bde-72b5-0dd2d8f40eb4",
"description": "",
"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json"
},
......@@ -234,7 +234,7 @@
"listen": "test",
"script": {
"type": "text/javascript",
"exec": "tests[\"Status code is 200\"] = responseCode.code === 200;\n\ntests[\"Response time is less than 500ms\"] = responseTime < 500;\n\nvar jsonData = JSON.parse(responseBody);\ntests[\"Upload complte\"] = jsonData[0].name === \"test-1.dcm\";"
"exec": "tests[\"Status code is 200\"] = responseCode.code === 200;\n\ntests[\"Response time is less than 200ms\"] = responseTime < 200;\n\nvar jsonData = JSON.parse(responseBody);\ntests[\"Upload complte\"] = jsonData[0].name === \"test-1.dcm\";"
}
}
],
......@@ -321,7 +321,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n\t\"name\": \"test-case-gear\",\n\t\"manifest\": {\n\t\t\"name\": \"test-case-gear\",\n\t\t\"label\": \"Test Case Gear\",\n\t\t\"version\": \"0\",\n\t\t\n\t\t\"author\": \"Nathaniel Kofalt\",\n\t\t\"description\": \"A gear built to drive test cases\",\n\t\t\n\t\t\"url\": \"http://none.example\",\n\t\t\"source\": \"http://none.example\",\n\t\t\"license\": \"MIT\",\n\t\t\n\t\t\"config\": {\n\t\t\t\"two-digit multiple of ten\": {\n\t\t\t\t\"exclusiveMaximum\": true,\n\t\t\t\t\"type\": \"number\",\n\t\t\t\t\"multipleOf\": 10,\n\t\t\t\t\"maximum\": 100\n\t\t\t}\n\t\t},\n\t\t\n\t\t\"inputs\": {\n\t\t\t\"any text file <= 100 KB\": {\n\t\t\t\t\"base\": \"file\",\n\t\t\t\t\"name\": {\n\t\t\t\t\t\"pattern\": \"^.*.txt$\"\n\t\t\t\t},\n\t\t\t\t\"size\": {\n\t\t\t\t\t\"maximum\": 100000\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t},\n\t\"input\": {}\n}"
"raw": "{\n\t\"name\": \"test-case-gear\",\n\t\"manifest\": {\n\t\t\"name\": \"test-case-gear\",\n\t\t\"label\": \"Test Case Gear\",\n\t\t\"version\": \"0\",\n\t\t\n\t\t\"author\": \"Nathaniel Kofalt\",\n\t\t\"description\": \"A gear built to drive test cases\",\n\t\t\n\t\t\"url\": \"http://none.example\",\n\t\t\"source\": \"http://none.example\",\n\t\t\"license\": \"MIT\",\n\t\t\n\t\t\"config\": {\n\t\t\t\"two-digit multiple of ten\": {\n\t\t\t\t\"exclusiveMaximum\": true,\n\t\t\t\t\"type\": \"number\",\n\t\t\t\t\"multipleOf\": 10,\n\t\t\t\t\"maximum\": 100\n\t\t\t}\n\t\t},\n\t\t\n\t\t\"inputs\": {\n\t\t\t\"any text file <= 100 KB\": {\n\t\t\t\t\"base\": \"file\",\n\t\t\t\t\"name\": {\n\t\t\t\t\t\"pattern\": \"^.*.txt$\"\n\t\t\t\t},\n\t\t\t\t\"size\": {\n\t\t\t\t\t\"maximum\": 100000\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t},\n\t\"input\": {\"type\":\"http\", \"uri\":\"http://not-a-real-gear\", \"location\":\"/some/place\"}\n}"
},
"description": ""
},
......@@ -821,4 +821,4 @@
"response": []
}
]
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment