Merge pull request #40 from bookmoons/bookmoons/graphql-var

Support GraphQL variables
grafana · Aug 23, 2019 · 7be3670 · 7be3670
2 parents 00569e1 + 021eb00
commit 7be3670
Show file tree

Hide file tree

Showing 9 changed files with 234 additions and 188 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-bin/libs
-bin/*.json
 npm-debug.log
 package-lock.json
 .bundle

diff --git a/example/v2/github-graphql.json b/example/v2/github-graphql.json
@@ -0,0 +1,72 @@
+{
+	"info": {
+		"_postman_id": "068355d1-ef5d-446c-9cf3-97823da6a196",
+		"name": "GitHub GraphQL",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Query",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"id": "186b3734-3fe3-4495-b4c9-44b0245dbe3c",
+						"exec": [
+							"console.log(pm.response.text())"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{GITHUB_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "graphql",
+					"graphql": {
+						"query": "{\n  viewer {\n    name\n     repositories(last: {{numberOfRepos}}) {\n       nodes {\n         name\n       }\n     }\n   }\n}\n",
+						"variables": ""
+					}
+				},
+				"url": {
+					"raw": "https://api.github.com/graphql",
+					"protocol": "https",
+					"host": [
+						"api",
+						"github",
+						"com"
+					],
+					"path": [
+						"graphql"
+					]
+				}
+			},
+			"response": []
+		}
+	],
+	"variable": [
+		{
+			"id": "b414bfbd-b39b-460a-bbe4-3e768b3784a0",
+			"key": "numberOfRepos",
+			"value": "3",
+			"type": "string"
+		},
+		{
+			"id": "9dff4a0c-28c0-44ff-aebf-1439fd9298a5",
+			"key": "GITHUB_TOKEN",
+			"value": "",
+			"type": "string"
+		}
+	]
+}
diff --git a/example/v2/github.json → example/v2/github-rest.json b/example/v2/github.json → example/v2/github-rest.json
diff --git a/lib/generate/Request/analyze.js b/lib/generate/Request/analyze.js
@@ -87,9 +87,13 @@ function dataUrl (body, feature) {
   feature.data = data
 }
 function dataGraphQL (body, feature) {
-  if (body.graphql) {
-    feature.data = JSON.stringify(body.graphql)
+  const data = {
+    query: body.graphql.query
   }
+  if (body.graphql.variables) {
+    data.variables = body.graphql.variables
+  }
+  feature.data = JSON.stringify(data)
 }
 
 function headers (headers, feature) {

diff --git a/test/int/basic.js b/test/int/basic.js
@@ -153,65 +153,3 @@ export default function() {
 }
 `)
 })
-
-test('graphql', async t => {
-  const [ main ] = await convertFile('test/material/2.1/graphql.json')
-
-  t.is(main, `// Auto-generated by the Load Impact converter
-
-import "./libs/shim/core.js";
-import "./libs/shim/expect.js";
-import { group } from "k6";
-
-export let options = { maxRedirects: 4 };
-
-const Request = Symbol.for("request");
-postman[Symbol.for("initial")]({
-  options
-});
-
-export default function() {
-  group("graphql", function() {
-    postman[Request]({
-      name: "GET /graphql",
-      method: "GET",
-      address:
-        "http://test.com/graphql?query=exampleQuery&operationName=ExampleGraphQLQuery&variables={}",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      post(response) {
-        pm.test("Status code is 200", function() {
-          pm.response.to.have.status(200);
-        });
-
-        pm.test("Response time is less than 900ms", function() {
-          pm.expect(pm.response.responseTime).to.be.below(900);
-        });
-      }
-    });
-
-    postman[Request]({
-      name: "POST /graphql",
-      method: "POST",
-      address: "http://test.com/graphql/",
-      data:
-        '{"query":"testQuery","variables":"{\\\\n  \\\\"name\\\\": \\\\"example\\\\",\\\\n  \\\\"example\\\\": \\\\"test\\\\"\\\\n}"}',
-      headers: {
-        "Content-Type": "application/json"
-      },
-      post(response) {
-        pm.test("Status code is 200", function() {
-          pm.response.to.have.status(200);
-        });
-
-        pm.test("Response time is less than 900ms", function() {
-          pm.expect(pm.response.responseTime).to.be.below(900);
-        });
-      }
-    });
-  });
-}
-`)
-})
-
diff --git a/test/int/graphql.js b/test/int/graphql.js
@@ -0,0 +1,82 @@
+import test from 'ava'
+import convertFile from 'convert/file'
+
+function render (body) {
+  const content = JSON.stringify(body)
+  const escaped = content.replace(/\\/g, '\\\\')
+  return `'${escaped}'`
+}
+
+test('body simple', async t => {
+  const [ main ] = await convertFile(
+    'test/material/2.1/graphql-body-simple.json'
+  )
+  const query = '' +
+`{
+    user {
+        name
+    }
+}`
+  const body = { query }
+  t.is(main, `// Auto-generated by the Load Impact converter
+
+import "./libs/shim/core.js";
+
+export let options = { maxRedirects: 4 };
+
+const Request = Symbol.for("request");
+postman[Symbol.for("initial")]({
+  options
+});
+
+export default function() {
+  postman[Request]({
+    name: "Test Request",
+    method: "POST",
+    address: "http://graphql.example.com/",
+    data: ${render(body)}
+  });
+}
+`)
+})
+
+test('body var', async t => {
+  const [ main ] = await convertFile(
+    'test/material/2.1/graphql-body-var.json'
+  )
+  const query = '' +
+`query UserName($id: UserId) {
+    user(id: $id) {
+        name
+    }
+}`
+  const variables = '' +
+`{
+\t"id": "{{userId}}"
+}`
+  const body = { query, variables }
+  t.is(main, `// Auto-generated by the Load Impact converter
+
+import "./libs/shim/core.js";
+
+export let options = { maxRedirects: 4 };
+
+const Request = Symbol.for("request");
+postman[Symbol.for("initial")]({
+  options,
+  collection: {
+    userId: "5"
+  }
+});
+
+export default function() {
+  postman[Request]({
+    name: "Test Request",
+    method: "POST",
+    address: "http://graphql.example.com/",
+    data:
+      ${render(body)}
+  });
+}
+`)
+})
diff --git a/test/material/2.1/graphql-body-simple.json b/test/material/2.1/graphql-body-simple.json
@@ -0,0 +1,33 @@
+{
+	"info": {
+		"_postman_id": "a3033a78-1a2e-4036-9621-11bc4fdc3ad6",
+		"name": "GraphQL",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Test Request",
+			"request": {
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "graphql",
+					"graphql": {
+						"query": "{\n    user {\n        name\n    }\n}",
+						"variables": ""
+					}
+				},
+				"url": {
+					"raw": "http://graphql.example.com",
+					"protocol": "http",
+					"host": [
+						"graphql",
+						"example",
+						"com"
+					]
+				}
+			},
+			"response": []
+		}
+	]
+}
diff --git a/test/material/2.1/graphql-body-var.json b/test/material/2.1/graphql-body-var.json
@@ -0,0 +1,41 @@
+{
+	"info": {
+		"_postman_id": "a3033a78-1a2e-4036-9621-11bc4fdc3ad6",
+		"name": "GraphQL",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Test Request",
+			"request": {
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "graphql",
+					"graphql": {
+						"query": "query UserName($id: UserId) {\n    user(id: $id) {\n        name\n    }\n}",
+						"variables": "{\n\t\"id\": \"{{userId}}\"\n}"
+					}
+				},
+				"url": {
+					"raw": "http://graphql.example.com",
+					"protocol": "http",
+					"host": [
+						"graphql",
+						"example",
+						"com"
+					]
+				}
+			},
+			"response": []
+		}
+	],
+	"variable": [
+		{
+			"id": "c910e57e-8c50-4ce0-aa13-6ab64f448421",
+			"key": "userId",
+			"value": "5",
+			"type": "string"
+		}
+	]
+}