Started Postman Collection v2.1.0 support for URLs

URL object were causing empty URLs, which shoved everything into /
instead of gracefully figuring it out. Now if a URL is an object with
"raw" it'll use the raw string.

Proper Postman Collection v2.1.0 support would be fantastic, but for now
this is solving a problem I'm having in production.

Author: Phil Sturgeon

src/loaders/postman/v2.0/Loader.js

@@ -95,14 +95,26 @@ methods.resolve = (options, uri, { $ref = '' } = {}) => {
 }
 
 methods.normalizeRequestItem = (item) => {
-  if (item.request && typeof item.request === 'string') {
+  if (!item.request) {
+    return item
+  }
+
+  // If request is a string then make it into a url string and a GET
+  if (typeof item.request === 'string') {
     const url = item.request
+
     item.request = {
       url,
       method: 'GET'
     }
   }
 
+  // Downgrade Postman Collection v2.1.0's fancy object to a string
+  const url = item.request.url
+  if (url && typeof url === 'object' && url.raw) {
+    item.request.url = url.raw
+  }
+
   return item
 }
 

src/loaders/postman/v2.0/__tests__/Loader.spec.js

@@ -130,12 +130,16 @@ describe('loaders/postman/v2.0/Loader.js', () => {
       const inputs = [
         {},
         { request: {} },
-        { request: 'https://www.example.com' }
+        // Postman Collection v2.0.0 is a string
+        { request: 'https://www.example.com' },
+        // Postman Collection v2.1.0 is an object
+        { request: { url: { raw: 'https://www.example.com' }, method: 'POST' } }
       ]
       const expected = [
         {},
         { request: {} },
-        { request: { url: 'https://www.example.com', method: 'GET' } }
+        { request: { url: 'https://www.example.com', method: 'GET' } },
+        { request: { url: 'https://www.example.com', method: 'POST' } }
       ]
       const actual = inputs.map(input => __internals__.normalizeRequestItem(input))
       expect(actual).toEqual(expected)

testing/e2e/postman-collection2-internal/e2e.spec.js

@@ -45,7 +45,7 @@ const fixDiff = (actual, index) => {
 }
 
 describe('postman collection v2 -> internal', () => {
-  for (let index = 0; index < 1; index += 1) {
+  for (let index = 0; index < 2; index += 1) {
     it('should match expected output for test case #' + index, (done) => {
       const output = fs.readFileSync(
         resolve(__dirname, './test-case-' + index + '/output.json'),

testing/e2e/postman-collection2-internal/test-case-1/input.json

@@ -0,0 +1,103 @@
+{
+	"info": {
+		"name": "User Management API",
+		"description": "Certainly not a snippet from a real thing at work",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Users",
+			"description": "User Management API",
+			"item": [
+				{
+					"name": "Fetch Users",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"value": "Bearer {{access_token}}",
+								"key": "Authorization"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": ""
+						},
+						"url": {
+							"raw": "http://example.org/users",
+							"host": [
+								"http://example.org"
+							],
+							"path": [
+								"users"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Create a User",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"value": "application/json",
+								"key": "Content-Type"
+							},
+							{
+								"value": "Bearer {{access_token}}",
+								"key": "Authorization"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n  \"data\" : {\n    \"attributes\" : {\n        \"username\" : \"user\",\n        \"email\" : \"[email protected]\",\n        \"firstName\" : \"Some\",\n        \"lastName\" : \"User\",\n        \"enabled\" : true,\n        \"password\" : \"abc123\"\n    }\n  }\n}"
+						},
+						"url": {
+							"raw": "http://example.org/users",
+							"host": [
+								"http://example.org"
+							],
+							"path": [
+								"users"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Update a User",
+					"request": {
+						"method": "PATCH",
+						"header": [
+							{
+								"value": "application/json",
+								"key": "Content-Type"
+							},
+							{
+								"value": "Bearer {{access_token}}",
+								"key": "Authorization"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n  \"data\" : {\n    \"attributes\" : {\n        \"foo\" : \"bar\",\n        \"password\": null\n    }\n  }\n}"
+						},
+						"url": {
+							"raw": "http://example.org/users/{{user_id}}",
+							"host": [
+								"http://example.org"
+							],
+							"path": [
+								"users",
+								"{{user_id}}"
+							]
+						},
+						"description": "Update an existing user"
+					},
+					"response": []
+				}
+			]
+		}
+	]
+}