Skip to content

Commit 48a6537

Browse files
thboopthboop
authored
Fix HTTP client tests (actions#1792)
* fix tests and update dependencies
1 parent f003268 commit 48a6537

File tree

4 files changed

+54
-49
lines changed

4 files changed

+54
-49
lines changed

‎package-lock.json

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/http-client/__tests__/basics.test.ts

+32-31
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('basics', () => {
3737
// "user-agent": "typed-test-client-tests"
3838
// },
3939
// "origin": "173.95.152.44",
40-
// "url": "https://postman-echo.com/get"
40+
// "url": "http://postman-echo.com/get"
4141
// }
4242

4343
it('does basic http get request', async () => {
@@ -63,16 +63,17 @@ describe('basics', () => {
6363
expect(obj.headers['user-agent']).toBeFalsy()
6464
})
6565

66+
/* TODO write a mock rather then relying on a third party
6667
it('does basic https get request', async () => {
6768
const res: httpm.HttpClientResponse = await _http.get(
68-
'https://postman-echo.com/get'
69+
'http://postman-echo.com/get'
6970
)
7071
expect(res.message.statusCode).toBe(200)
7172
const body: string = await res.readBody()
7273
const obj = JSON.parse(body)
73-
expect(obj.url).toBe('https://postman-echo.com/get')
74+
expect(obj.url).toBe('http://postman-echo.com/get')
7475
})
75-
76+
*/
7677
it('does basic http get request with default headers', async () => {
7778
const http: httpm.HttpClient = new httpm.HttpClient(
7879
'http-client-tests',
@@ -125,45 +126,45 @@ describe('basics', () => {
125126
it('pipes a get request', async () => {
126127
return new Promise<void>(async resolve => {
127128
const file = fs.createWriteStream(sampleFilePath)
128-
;(await _http.get('https://postman-echo.com/get')).message
129+
;(await _http.get('http://postman-echo.com/get')).message
129130
.pipe(file)
130131
.on('close', () => {
131132
const body: string = fs.readFileSync(sampleFilePath).toString()
132133
const obj = JSON.parse(body)
133-
expect(obj.url).toBe('https://postman-echo.com/get')
134+
expect(obj.url).toBe('http://postman-echo.com/get')
134135
resolve()
135136
})
136137
})
137138
})
138139

139140
it('does basic get request with redirects', async () => {
140141
const res: httpm.HttpClientResponse = await _http.get(
141-
`https://postman-echo.com/redirect-to?url=${encodeURIComponent(
142-
'https://postman-echo.com/get'
142+
`http://postman-echo.com/redirect-to?url=${encodeURIComponent(
143+
'http://postman-echo.com/get'
143144
)}`
144145
)
145146
expect(res.message.statusCode).toBe(200)
146147
const body: string = await res.readBody()
147148
const obj = JSON.parse(body)
148-
expect(obj.url).toBe('https://postman-echo.com/get')
149+
expect(obj.url).toBe('http://postman-echo.com/get')
149150
})
150151

151152
it('does basic get request with redirects (303)', async () => {
152153
const res: httpm.HttpClientResponse = await _http.get(
153-
`https://postman-echo.com/redirect-to?url=${encodeURIComponent(
154-
'https://postman-echo.com/get'
154+
`http://postman-echo.com/redirect-to?url=${encodeURIComponent(
155+
'http://postman-echo.com/get'
155156
)}&status_code=303`
156157
)
157158
expect(res.message.statusCode).toBe(200)
158159
const body: string = await res.readBody()
159160
const obj = JSON.parse(body)
160-
expect(obj.url).toBe('https://postman-echo.com/get')
161+
expect(obj.url).toBe('http://postman-echo.com/get')
161162
})
162163

163164
it('returns 404 for not found get request on redirect', async () => {
164165
const res: httpm.HttpClientResponse = await _http.get(
165-
`https://postman-echo.com/redirect-to?url=${encodeURIComponent(
166-
'https://postman-echo.com/status/404'
166+
`http://postman-echo.com/redirect-to?url=${encodeURIComponent(
167+
'http://postman-echo.com/status/404'
167168
)}&status_code=303`
168169
)
169170
expect(res.message.statusCode).toBe(404)
@@ -177,8 +178,8 @@ describe('basics', () => {
177178
{allowRedirects: false}
178179
)
179180
const res: httpm.HttpClientResponse = await http.get(
180-
`https://postman-echo.com/redirect-to?url=${encodeURIComponent(
181-
'https://postman-echo.com/get'
181+
`http://postman-echo.com/redirect-to?url=${encodeURIComponent(
182+
'http://postman-echo.com/get'
182183
)}`
183184
)
184185
expect(res.message.statusCode).toBe(302)
@@ -191,8 +192,8 @@ describe('basics', () => {
191192
authorization: 'shhh'
192193
}
193194
const res: httpm.HttpClientResponse = await _http.get(
194-
`https://postman-echo.com/redirect-to?url=${encodeURIComponent(
195-
'https://www.postman-echo.com/get'
195+
`http://postman-echo.com/redirect-to?url=${encodeURIComponent(
196+
'http://www.postman-echo.com/get'
196197
)}`,
197198
headers
198199
)
@@ -204,7 +205,7 @@ describe('basics', () => {
204205
expect(obj.headers[httpm.Headers.Accept]).toBe('application/json')
205206
expect(obj.headers['Authorization']).toBeUndefined()
206207
expect(obj.headers['authorization']).toBeUndefined()
207-
expect(obj.url).toBe('https://www.postman-echo.com/get')
208+
expect(obj.url).toBe('http://www.postman-echo.com/get')
208209
})
209210

210211
it('does not pass Auth with diff hostname redirects', async () => {
@@ -213,8 +214,8 @@ describe('basics', () => {
213214
Authorization: 'shhh'
214215
}
215216
const res: httpm.HttpClientResponse = await _http.get(
216-
`https://postman-echo.com/redirect-to?url=${encodeURIComponent(
217-
'https://www.postman-echo.com/get'
217+
`http://postman-echo.com/redirect-to?url=${encodeURIComponent(
218+
'http://www.postman-echo.com/get'
218219
)}`,
219220
headers
220221
)
@@ -226,7 +227,7 @@ describe('basics', () => {
226227
expect(obj.headers[httpm.Headers.Accept]).toBe('application/json')
227228
expect(obj.headers['Authorization']).toBeUndefined()
228229
expect(obj.headers['authorization']).toBeUndefined()
229-
expect(obj.url).toBe('https://www.postman-echo.com/get')
230+
expect(obj.url).toBe('http://www.postman-echo.com/get')
230231
})
231232

232233
it('does basic head request', async () => {
@@ -289,11 +290,11 @@ describe('basics', () => {
289290

290291
it('gets a json object', async () => {
291292
const jsonObj = await _http.getJson<HttpBinData>(
292-
'https://postman-echo.com/get'
293+
'http://postman-echo.com/get'
293294
)
294295
expect(jsonObj.statusCode).toBe(200)
295296
expect(jsonObj.result).toBeDefined()
296-
expect(jsonObj.result?.url).toBe('https://postman-echo.com/get')
297+
expect(jsonObj.result?.url).toBe('http://postman-echo.com/get')
297298
expect(jsonObj.result?.headers[httpm.Headers.Accept]).toBe(
298299
httpm.MediaTypes.ApplicationJson
299300
)
@@ -304,7 +305,7 @@ describe('basics', () => {
304305

305306
it('getting a non existent json object returns null', async () => {
306307
const jsonObj = await _http.getJson<HttpBinData>(
307-
'https://postman-echo.com/status/404'
308+
'http://postman-echo.com/status/404'
308309
)
309310
expect(jsonObj.statusCode).toBe(404)
310311
expect(jsonObj.result).toBeNull()
@@ -313,12 +314,12 @@ describe('basics', () => {
313314
it('posts a json object', async () => {
314315
const res = {name: 'foo'}
315316
const restRes = await _http.postJson<HttpBinData>(
316-
'https://postman-echo.com/post',
317+
'http://postman-echo.com/post',
317318
res
318319
)
319320
expect(restRes.statusCode).toBe(200)
320321
expect(restRes.result).toBeDefined()
321-
expect(restRes.result?.url).toBe('https://postman-echo.com/post')
322+
expect(restRes.result?.url).toBe('http://postman-echo.com/post')
322323
expect(restRes.result?.json.name).toBe('foo')
323324
expect(restRes.result?.headers[httpm.Headers.Accept]).toBe(
324325
httpm.MediaTypes.ApplicationJson
@@ -334,12 +335,12 @@ describe('basics', () => {
334335
it('puts a json object', async () => {
335336
const res = {name: 'foo'}
336337
const restRes = await _http.putJson<HttpBinData>(
337-
'https://postman-echo.com/put',
338+
'http://postman-echo.com/put',
338339
res
339340
)
340341
expect(restRes.statusCode).toBe(200)
341342
expect(restRes.result).toBeDefined()
342-
expect(restRes.result?.url).toBe('https://postman-echo.com/put')
343+
expect(restRes.result?.url).toBe('http://postman-echo.com/put')
343344
expect(restRes.result?.json.name).toBe('foo')
344345

345346
expect(restRes.result?.headers[httpm.Headers.Accept]).toBe(
@@ -356,12 +357,12 @@ describe('basics', () => {
356357
it('patch a json object', async () => {
357358
const res = {name: 'foo'}
358359
const restRes = await _http.patchJson<HttpBinData>(
359-
'https://postman-echo.com/patch',
360+
'http://postman-echo.com/patch',
360361
res
361362
)
362363
expect(restRes.statusCode).toBe(200)
363364
expect(restRes.result).toBeDefined()
364-
expect(restRes.result?.url).toBe('https://postman-echo.com/patch')
365+
expect(restRes.result?.url).toBe('http://postman-echo.com/patch')
365366
expect(restRes.result?.json.name).toBe('foo')
366367
expect(restRes.result?.headers[httpm.Headers.Accept]).toBe(
367368
httpm.MediaTypes.ApplicationJson

‎packages/http-client/__tests__/headers.test.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('headers', () => {
1212
it('preserves existing headers on getJson', async () => {
1313
const additionalHeaders = {[httpm.Headers.Accept]: 'foo'}
1414
let jsonObj = await _http.getJson<any>(
15-
'https://postman-echo.com/get',
15+
'http://postman-echo.com/get',
1616
additionalHeaders
1717
)
1818
expect(jsonObj.result.headers[httpm.Headers.Accept]).toBe('foo')
@@ -26,7 +26,7 @@ describe('headers', () => {
2626
[httpm.Headers.Accept]: 'baz'
2727
}
2828
}
29-
jsonObj = await httpWithHeaders.getJson<any>('https://postman-echo.com/get')
29+
jsonObj = await httpWithHeaders.getJson<any>('http://postman-echo.com/get')
3030
expect(jsonObj.result.headers[httpm.Headers.Accept]).toBe('baz')
3131
expect(jsonObj.headers[httpm.Headers.ContentType]).toContain(
3232
httpm.MediaTypes.ApplicationJson
@@ -36,7 +36,7 @@ describe('headers', () => {
3636
it('preserves existing headers on postJson', async () => {
3737
const additionalHeaders = {[httpm.Headers.Accept]: 'foo'}
3838
let jsonObj = await _http.postJson<any>(
39-
'https://postman-echo.com/post',
39+
'http://postman-echo.com/post',
4040
{},
4141
additionalHeaders
4242
)
@@ -52,7 +52,7 @@ describe('headers', () => {
5252
}
5353
}
5454
jsonObj = await httpWithHeaders.postJson<any>(
55-
'https://postman-echo.com/post',
55+
'http://postman-echo.com/post',
5656
{}
5757
)
5858
expect(jsonObj.result.headers[httpm.Headers.Accept]).toBe('baz')
@@ -64,7 +64,7 @@ describe('headers', () => {
6464
it('preserves existing headers on putJson', async () => {
6565
const additionalHeaders = {[httpm.Headers.Accept]: 'foo'}
6666
let jsonObj = await _http.putJson<any>(
67-
'https://postman-echo.com/put',
67+
'http://postman-echo.com/put',
6868
{},
6969
additionalHeaders
7070
)
@@ -80,7 +80,7 @@ describe('headers', () => {
8080
}
8181
}
8282
jsonObj = await httpWithHeaders.putJson<any>(
83-
'https://postman-echo.com/put',
83+
'http://postman-echo.com/put',
8484
{}
8585
)
8686
expect(jsonObj.result.headers[httpm.Headers.Accept]).toBe('baz')
@@ -92,7 +92,7 @@ describe('headers', () => {
9292
it('preserves existing headers on patchJson', async () => {
9393
const additionalHeaders = {[httpm.Headers.Accept]: 'foo'}
9494
let jsonObj = await _http.patchJson<any>(
95-
'https://postman-echo.com/patch',
95+
'http://postman-echo.com/patch',
9696
{},
9797
additionalHeaders
9898
)
@@ -108,7 +108,7 @@ describe('headers', () => {
108108
}
109109
}
110110
jsonObj = await httpWithHeaders.patchJson<any>(
111-
'https://postman-echo.com/patch',
111+
'http://postman-echo.com/patch',
112112
{}
113113
)
114114
expect(jsonObj.result.headers[httpm.Headers.Accept]).toBe('baz')

‎packages/http-client/__tests__/proxy.test.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -222,30 +222,33 @@ describe('proxy', () => {
222222
expect(_proxyConnects).toHaveLength(0)
223223
})
224224

225+
// TODO mock this out so we don't rely on a third party
226+
/*
225227
it('HttpClient does basic https get request through proxy', async () => {
226228
process.env['https_proxy'] = _proxyUrl
227229
const httpClient = new httpm.HttpClient()
228230
const res: httpm.HttpClientResponse = await httpClient.get(
229-
'https://postman-echo.com/get'
231+
'http://postman-echo.com/get'
230232
)
231233
expect(res.message.statusCode).toBe(200)
232234
const body: string = await res.readBody()
233235
const obj = JSON.parse(body)
234-
expect(obj.url).toBe('https://postman-echo.com/get')
236+
expect(obj.url).toBe('http://postman-echo.com/get')
235237
expect(_proxyConnects).toEqual(['postman-echo.com:443'])
236238
})
239+
*/
237240

238-
it('HttpClient does basic https get request when bypass proxy', async () => {
239-
process.env['https_proxy'] = _proxyUrl
241+
it('HttpClient does basic http get request when bypass proxy', async () => {
242+
process.env['http_proxy'] = _proxyUrl
240243
process.env['no_proxy'] = 'postman-echo.com'
241244
const httpClient = new httpm.HttpClient()
242245
const res: httpm.HttpClientResponse = await httpClient.get(
243-
'https://postman-echo.com/get'
246+
'http://postman-echo.com/get'
244247
)
245248
expect(res.message.statusCode).toBe(200)
246249
const body: string = await res.readBody()
247250
const obj = JSON.parse(body)
248-
expect(obj.url).toBe('https://postman-echo.com/get')
251+
expect(obj.url).toBe('http://postman-echo.com/get')
249252
expect(_proxyConnects).toHaveLength(0)
250253
})
251254

0 commit comments

Comments
 (0)