From ddcb29928355ee425374adf34c69e4efc7e53251 Mon Sep 17 00:00:00 2001
From: Landon Grindheim <landon.grindheim@gmail.com>
Date: Wed, 4 May 2022 17:05:22 +0000
Subject: [PATCH] Strip newline characters from ENV var values

---
 __tests__/proxy-integration.test.ts | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/__tests__/proxy-integration.test.ts b/__tests__/proxy-integration.test.ts
index c19aee1..7f109eb 100644
--- a/__tests__/proxy-integration.test.ts
+++ b/__tests__/proxy-integration.test.ts
@@ -96,31 +96,39 @@ integration('ProxyBuilder', () => {
     ])
     const stdout = proc.stdout.toString()
     expect(stdout).toEqual('ca-pem-contents')
+
+    await proxy.shutdown()
   })
 
   jest.setTimeout(20000)
   it('forwards custom proxy urls if configured', async () => {
-    process.env.HTTP_PROXY = 'HTTP_PROXY'
+    const url = 'http://example.com'
+    process.env.HTTP_PROXY = url
 
     const proxy = await builder.run(jobId, credentials)
     await proxy.container.start()
 
     const id = proxy.container.id
     const proc = spawnSync('docker', ['exec', id, 'printenv', 'http_proxy'])
-    const output = proc.stdout.toString()
-    expect(output).toEqual('HTTP_PROXY')
+    const output = proc.stdout.toString().trim()
+    expect(output).toMatch(url)
+
+    await proxy.shutdown()
   })
 
   jest.setTimeout(20000)
   it('forwards downcased proxy urls if configured', async () => {
-    process.env.https_proxy = 'https_proxy'
+    const url = 'https://example.com'
+    process.env.https_proxy = url
 
     const proxy = await builder.run(jobId, credentials)
     await proxy.container.start()
 
     const id = proxy.container.id
-    const proc = spawnSync('docker', ['exec', id, 'printenv', 'https_proxy'])
-    const output = proc.stdout.toString()
-    expect(output).toEqual('https_proxy')
+    const proc = await spawnSync('docker', ['exec', id, 'printenv', 'https_proxy'])
+    const output = proc.stdout.toString().trim()
+    expect(output).toEqual(url)
+
+    await proxy.shutdown()
   })
 })