fix: typo in the httpie style option not being correctly applied (Kong#254)

erunion · dimitropoulos · web-flow · commit f64080d7d505 · 2022-05-13T15:18:59.000-04:00
Co-authored-by: Dimitri Mitropoulos &lt;dimitrimitropoulos@gmail.com&gt;
diff --git a/src/targets/shell/httpie/client.test.ts b/src/targets/shell/httpie/client.test.ts
@@ -24,12 +24,12 @@ runCustomFixtures({
         headers: true,
         indent: false,
         pretty: 'x',
-        print: 'x',
+        print: 'y',
         short: true,
-        style: 'x',
+        style: 'z',
         timeout: 1,
         verbose: true,
-        verify: 'x',
+        verify: 'v',
       },
       expected: 'short-flags.sh',
     },
@@ -42,11 +42,11 @@ runCustomFixtures({
         headers: true,
         indent: false,
         pretty: 'x',
-        print: 'x',
-        style: 'x',
+        print: 'y',
+        style: 'z',
         timeout: 1,
         verbose: true,
-        verify: 'x',
+        verify: 'v',
       },
       expected: 'long-flags.sh',
     },
diff --git a/src/targets/shell/httpie/client.ts b/src/targets/shell/httpie/client.ts
@@ -88,7 +88,7 @@ export const httpie: Client<HttpieOptions> = {
     }
 
     if (opts.style) {
-      flags.push(`--style=${opts.pretty}`);
+      flags.push(`--style=${opts.style}`);
     }
 
     if (opts.timeout) {
diff --git a/src/targets/shell/httpie/fixtures/long-flags.sh b/src/targets/shell/httpie/fixtures/long-flags.sh
@@ -1 +1 @@
-http --headers --body --verbose --print=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har
+http --headers --body --verbose --print=y --verify=v --cert=foo --pretty=x --style=z --timeout=1 GET http://mockbin.com/har
diff --git a/src/targets/shell/httpie/fixtures/short-flags.sh b/src/targets/shell/httpie/fixtures/short-flags.sh
@@ -1 +1 @@
-http -h -b -v -p=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har
+http -h -b -v -p=y --verify=v --cert=foo --pretty=x --style=z --timeout=1 GET http://mockbin.com/har
diff --git a/src/targets/targets.ts b/src/targets/targets.ts
@@ -176,7 +176,10 @@ export const isClient = (client: Client): client is Client => {
     throw new Error('targets client must have an `info` object with property `link`');
   }
 
-  if (!Object.prototype.hasOwnProperty.call(client, 'convert') || typeof client.convert !== 'function') {
+  if (
+    !Object.prototype.hasOwnProperty.call(client, 'convert') ||
+    typeof client.convert !== 'function'
+  ) {
     throw new Error(
       'targets client must have a `convert` property containing a conversion function',
     );

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export const httpie: Client<HttpieOptions> = {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if (opts.style) {`
`91`		- flags.push(`--style=${opts.pretty}`);
	`91`	+ flags.push(`--style=${opts.style}`);
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if (opts.timeout) {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-http --headers --body --verbose --print=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har`
	`1`	`+http --headers --body --verbose --print=y --verify=v --cert=foo --pretty=x --style=z --timeout=1 GET http://mockbin.com/har`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-http -h -b -v -p=x --verify=x --cert=foo --pretty=x --style=x --timeout=1 GET http://mockbin.com/har`
	`1`	`+http -h -b -v -p=y --verify=v --cert=foo --pretty=x --style=z --timeout=1 GET http://mockbin.com/har`