From 33f1d64363f894d690df1dd60cf0d3539227e91e Mon Sep 17 00:00:00 2001 From: Takanori Oishi Date: Sun, 26 Dec 2021 20:53:30 +0900 Subject: [PATCH] fix: getMultilineInput trims whitespace --- packages/core/__tests__/core.test.ts | 41 ++++++++++++++++++++++------ packages/core/src/core.ts | 6 +++- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/packages/core/__tests__/core.test.ts b/packages/core/__tests__/core.test.ts index b54752ef83..d00374fd35 100644 --- a/packages/core/__tests__/core.test.ts +++ b/packages/core/__tests__/core.test.ts @@ -33,8 +33,8 @@ const testEnvVars = { INPUT_BOOLEAN_INPUT_FALSE3: 'FALSE', INPUT_WRONG_BOOLEAN_INPUT: 'wrong', INPUT_WITH_TRAILING_WHITESPACE: ' some val ', - INPUT_MY_INPUT_LIST: 'val1\nval2\nval3', + INPUT_LIST_WITH_TRAILING_WHITESPACE: ' val1 \n val2 \n ', // Save inputs STATE_TEST_1: 'state_val', @@ -212,14 +212,6 @@ describe('@actions/core', () => { ) }) - it('getMultilineInput works', () => { - expect(core.getMultilineInput('my input list')).toEqual([ - 'val1', - 'val2', - 'val3' - ]) - }) - it('getInput trims whitespace by default', () => { expect(core.getInput('with trailing whitespace')).toBe('some val') }) @@ -260,6 +252,37 @@ describe('@actions/core', () => { ) }) + it('getMultilineInput works', () => { + expect(core.getMultilineInput('my input list')).toEqual([ + 'val1', + 'val2', + 'val3' + ]) + }) + + it('getMultilineInput trims whitespace by default', () => { + expect(core.getMultilineInput('list with trailing whitespace')).toEqual([ + 'val1', + 'val2' + ]) + }) + + it('getMultilineInput trims whitespace when option is explicitly true', () => { + expect( + core.getMultilineInput('list with trailing whitespace', { + trimWhitespace: true + }) + ).toEqual(['val1', 'val2']) + }) + + it('getMultilineInput does not trim whitespace when option is false', () => { + expect( + core.getMultilineInput('list with trailing whitespace', { + trimWhitespace: false + }) + ).toEqual([' val1 ', ' val2 ', ' ']) + }) + it('setOutput produces the correct command', () => { core.setOutput('some output', 'some value') assertWriteCalls([ diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts index f123aaaaef..36f8f433ab 100644 --- a/packages/core/src/core.ts +++ b/packages/core/src/core.ts @@ -170,7 +170,11 @@ export function getMultilineInput( .split('\n') .filter(x => x !== '') - return inputs + if (options && options.trimWhitespace === false) { + return inputs + } + + return inputs.map(input => input.trim()) } /**