diff --git a/src/fixtures/runCustomFixtures.ts b/src/fixtures/runCustomFixtures.ts index faf323aa..60a665d8 100644 --- a/src/fixtures/runCustomFixtures.ts +++ b/src/fixtures/runCustomFixtures.ts @@ -31,7 +31,7 @@ export const runCustomFixtures = ({ targetId, clientId, tests }: CustomFixture) } const snippet = new HTTPSnippet(request, opts); - const result = snippet.convert(targetId, clientId, options); + const result = snippet.convert(targetId, clientId, options)[0]; const filePath = path.join(__dirname, '..', 'targets', targetId, clientId, 'fixtures', fixtureFile); if (process.env.OVERWRITE_EVERYTHING) { writeFileSync(filePath, String(result)); diff --git a/src/index.ts b/src/index.ts index 5e762c84..ed8c4b0c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -334,6 +334,6 @@ export class HTTPSnippet { const { convert } = target.clientsById[clientId || target.info.default]; const results = this.requests.map(request => convert(request, options)); - return results.length === 1 ? results[0] : results; + return results; } } diff --git a/src/targets/index.test.ts b/src/targets/index.test.ts index e2e3d231..97eaade1 100644 --- a/src/targets/index.test.ts +++ b/src/targets/index.test.ts @@ -74,8 +74,8 @@ describe('request validation', () => { `${fixture}${extname(targetId, clientId)}`, ); - let result; - let expected; + let result: string[] | false; + let expected: string; try { const options: HTTPSnippetOptions = {}; @@ -88,7 +88,7 @@ describe('request validation', () => { expected = readFileSync(expectedPath).toString(); const snippet = new HTTPSnippet(request, options); - result = snippet.convert(targetId, clientId); + result = snippet.convert(targetId, clientId)[0]; if (OVERWRITE_EVERYTHING && result) { writeFileSync(expectedPath, String(result)); @@ -313,7 +313,7 @@ describe('addTargetClient', () => { const snippet = new HTTPSnippet(short.log.entries[0].request as Request, {}); - const result = snippet.convert('node', 'custom'); + const result = snippet.convert('node', 'custom')[0]; expect(result).toBe('This was generated from a custom client.'); }); @@ -345,7 +345,7 @@ describe('addClientPlugin', () => { const snippet = new HTTPSnippet(short.log.entries[0].request as Request, {}); - const result = snippet.convert('node', 'custom'); + const result = snippet.convert('node', 'custom')[0]; expect(result).toBe('This was generated from a custom client.'); });