From cef7a7b43d27eaa14a0de5374879d318161fe2e5 Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 17 Jul 2020 15:49:02 +0900 Subject: [PATCH 1/2] feat: throw error for invalid extended input --- src/get-url.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/get-url.ts b/src/get-url.ts index 95a5735..3c8bd62 100644 --- a/src/get-url.ts +++ b/src/get-url.ts @@ -2,10 +2,10 @@ export default function getURL(os: string, extended: string, version: string): s const extendedStr = (extended: string): string => { if (extended === 'true') { return 'extended_'; - } else { + } else if (extended === 'false') { return ''; - // } else { - // throw new Error(`Invalid input (extended): ${extended}`); + } else { + throw new Error(`Invalid input (extended): ${extended}`); } }; From 28797ce1eec25fee945ea2f027a9bc4c225cdde7 Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 17 Jul 2020 15:56:07 +0900 Subject: [PATCH 2/2] test: fix --- __tests__/main.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts index 0735793..0d09c30 100644 --- a/__tests__/main.test.ts +++ b/__tests__/main.test.ts @@ -25,6 +25,7 @@ describe('Integration testing run()', () => { test('succeed in installing a custom version', async () => { const testVersion = Tool.TestVersionSpec; process.env['INPUT_HUGO-VERSION'] = testVersion; + process.env['INPUT_EXTENDED'] = 'false'; const result: main.ActionResult = await main.run(); expect(result.exitcode).toBe(0); expect(result.output).toMatch(`Hugo Static Site Generator v${testVersion}`); @@ -43,6 +44,7 @@ describe('Integration testing run()', () => { test('succeed in installing the latest version', async () => { const testVersion = 'latest'; process.env['INPUT_HUGO-VERSION'] = testVersion; + process.env['INPUT_EXTENDED'] = 'false'; nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(200, jsonTestBrew); const result: main.ActionResult = await main.run(); expect(result.exitcode).toBe(0); @@ -62,8 +64,8 @@ describe('Integration testing run()', () => { test('fail to install the latest version due to 404 of brew', async () => { process.env['INPUT_HUGO-VERSION'] = 'latest'; + process.env['INPUT_EXTENDED'] = 'false'; nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(404); - await expect(main.run()).rejects.toThrowError(FetchError); }); });