Merge branch 'test-placer' into add-raml-testing-squashed

raml/api.raml

@@ -9,7 +9,7 @@ traits:
         responses:
             422:
                 description: |
-                    JSON did not validate against schema for this endpoint                                      
+                    JSON did not validate against schema for this endpoint
 
 /download: !include resources/download.raml
 /upload/label: !include resources/upload-by-label.raml

raml/resources/engine.raml

@@ -10,7 +10,7 @@ post:
     ### When ``level`` is ``analysis``:
     > Uploads a list of files to an existing analysis object, marking
       all files as ``output=true`` using the job-based analyses placer
-      class
+      class.  See schemas/input/analysis.json
 
   queryParameters:
     level:

test/integration_tests/postman/environments/integration_tests.postman_collection

+{
+	"id": "a8f4f3da-c945-3c88-f6a2-6d77e69506ca",
+	"name": "test",
+	"description": "",
+	"order": [
+		"8ed30abc-627c-333f-d929-d0abf0db5aa7",
+		"3200a331-89b8-70f4-82af-5a96f32876e9"
+	],
+	"folders": [],
+	"timestamp": 1471364887347,
+	"owner": 0,
+	"public": false,
+	"published": false,
+	"requests": [
+		{
+			"id": "3200a331-89b8-70f4-82af-5a96f32876e9",
+			"headers": "",
+			"url": "{{baseUri}}/engine?user={{test_user}}&level=analysis&root=true&id=57ac736ca16b3e715b930200",
+			"preRequestScript": null,
+			"pathVariables": {},
+			"method": "POST",
+			"data": [
+				{
+					"key": "file1",
+					"value": "engine-analyses-1.txt",
+					"type": "file",
+					"enabled": true
+				},
+				{
+					"key": "metadata",
+					"value": "{\"label\":\"test\"}",
+					"type": "text",
+					"enabled": true
+				}
+			],
+			"dataMode": "params",
+			"version": 2,
+			"tests": null,
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1471607394844,
+			"name": "Test /engine upload - type \"analysis\"",
+			"description": "",
+			"collectionId": "a8f4f3da-c945-3c88-f6a2-6d77e69506ca",
+			"responses": []
+		},
+		{
+			"id": "8ed30abc-627c-333f-d929-d0abf0db5aa7",
+			"headers": "Content-Type: application/json\n",
+			"url": "{{baseUri}}/users?user={{test_user}}",
+			"pathVariables": {},
+			"preRequestScript": "",
+			"method": "GET",
+			"collectionId": "a8f4f3da-c945-3c88-f6a2-6d77e69506ca",
+			"data": [],
+			"dataMode": "raw",
+			"name": "/users",
+			"description": "List users\n\n",
+			"descriptionFormat": "html",
+			"time": 1471364908152,
+			"version": 2,
+			"responses": [],
+			"tests": "tests[\"Status code is 200\"] = responseCode.code === 200;",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"rawModeData": "{\"_id\":\"jane.doe@gmail.com\",\"firstname\":\"Jane\",\"lastname\":\"Doe\",\"email\":\"jane.doe@gmail.com\"}"
+		}
+	]
+}
\ No newline at end of file

test/integration_tests/postman/integration_tests.postman_collection

 {
-	"id": "4451e2c5-aed1-4106-92b8-971ad6002e3a",
+	"id": "a8f4f3da-c945-3c88-f6a2-6d77e69506ca",
 	"name": "test",
 	"description": "",
 	"order": [
-		"84502070-8e56-3c5e-748a-6cf94d64581e"
+		"8ed30abc-627c-333f-d929-d0abf0db5aa7",
+		"3200a331-89b8-70f4-82af-5a96f32876e9"
 	],
 	"folders": [],
 	"timestamp": 1471364887347,
@@ -12,13 +13,45 @@
 	"published": false,
 	"requests": [
 		{
-			"id": "84502070-8e56-3c5e-748a-6cf94d64581e",
+			"id": "3200a331-89b8-70f4-82af-5a96f32876e9",
+			"headers": "",
+			"url": "{{baseUri}}/engine?user={{test_user}}&level=analysis&root=true&id=57ac736ca16b3e715b930200",
+			"preRequestScript": null,
+			"pathVariables": {},
+			"method": "POST",
+			"data": [
+				{
+					"key": "file1",
+					"value": "test_files/engine-analyses-1.txt",
+					"type": "file",
+					"enabled": true
+				},
+				{
+					"key": "metadata",
+					"value": "{\"label\":\"test\"}",
+					"type": "text",
+					"enabled": true
+				}
+			],
+			"dataMode": "params",
+			"version": 2,
+			"tests": "tests[\"Status code is 200\"] = responseCode.code === 200;",
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1471607560876,
+			"name": "Test /engine upload - type \"analysis\"",
+			"description": "",
+			"collectionId": "a8f4f3da-c945-3c88-f6a2-6d77e69506ca",
+			"responses": []
+		},
+		{
+			"id": "8ed30abc-627c-333f-d929-d0abf0db5aa7",
 			"headers": "Content-Type: application/json\n",
 			"url": "{{baseUri}}/users?user={{test_user}}",
 			"pathVariables": {},
 			"preRequestScript": "",
 			"method": "GET",
-			"collectionId": "4451e2c5-aed1-4106-92b8-971ad6002e3a",
+			"collectionId": "a8f4f3da-c945-3c88-f6a2-6d77e69506ca",
 			"data": [],
 			"dataMode": "raw",
 			"name": "/users",
@@ -33,4 +66,4 @@
 			"rawModeData": "{\"_id\":\"jane.doe@gmail.com\",\"firstname\":\"Jane\",\"lastname\":\"Doe\",\"email\":\"jane.doe@gmail.com\"}"
 		}
 	]
-}
\ No newline at end of file
+}

test/integration_tests/postman/test_files/engine-analyses-1.txt

+Replace this with something more realistic