Skip to content

Commit

Permalink
Add file property to AnnotationProperties (actions#896)
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcono1234 authored Sep 28, 2021
1 parent ea81280 commit 60145e4
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 2 deletions.
5 changes: 5 additions & 0 deletions packages/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ export interface AnnotationProperties {
*/
title?: string

/**
* The name of the file for which the annotation should be created.
*/
file?: string

/**
* The start line for the annotation.
*/
Expand Down
39 changes: 37 additions & 2 deletions packages/core/__tests__/core.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,14 @@ describe('@actions/core', () => {
const message = 'this is my error message'
core.error(new Error(message), {
title: 'A title',
file: 'root/test.txt',
startColumn: 1,
endColumn: 2,
startLine: 5,
endLine: 5
})
assertWriteCalls([
`::error title=A title,line=5,endLine=5,col=1,endColumn=2::Error: ${message}${os.EOL}`
`::error title=A title,file=root/test.txt,line=5,endLine=5,col=1,endColumn=2::Error: ${message}${os.EOL}`
])
})

Expand All @@ -304,25 +305,59 @@ describe('@actions/core', () => {
const message = 'this is my error message'
core.warning(new Error(message), {
title: 'A title',
file: 'root/test.txt',
startColumn: 1,
endColumn: 2,
startLine: 5,
endLine: 5
})
assertWriteCalls([
`::warning title=A title,line=5,endLine=5,col=1,endColumn=2::Error: ${message}${os.EOL}`
`::warning title=A title,file=root/test.txt,line=5,endLine=5,col=1,endColumn=2::Error: ${message}${os.EOL}`
])
})

it('notice sets the correct message', () => {
core.notice('Notice')
assertWriteCalls([`::notice::Notice${os.EOL}`])
})

it('notice escapes the message', () => {
core.notice('\r\nnotice\n')
assertWriteCalls([`::notice::%0D%0Anotice%0A${os.EOL}`])
})

it('notice handles an error object', () => {
const message = 'this is my error message'
core.notice(new Error(message))
assertWriteCalls([`::notice::Error: ${message}${os.EOL}`])
})

it('notice handles parameters correctly', () => {
const message = 'this is my error message'
core.notice(new Error(message), {
title: 'A title',
file: 'root/test.txt',
startColumn: 1,
endColumn: 2,
startLine: 5,
endLine: 5
})
assertWriteCalls([
`::notice title=A title,file=root/test.txt,line=5,endLine=5,col=1,endColumn=2::Error: ${message}${os.EOL}`
])
})

it('annotations map field names correctly', () => {
const commandProperties = toCommandProperties({
title: 'A title',
file: 'root/test.txt',
startColumn: 1,
endColumn: 2,
startLine: 5,
endLine: 5
})
expect(commandProperties.title).toBe('A title')
expect(commandProperties.file).toBe('root/test.txt')
expect(commandProperties.col).toBe(1)
expect(commandProperties.endColumn).toBe(2)
expect(commandProperties.line).toBe(5)
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ export interface AnnotationProperties {
*/
title?: string

/**
* The path of the file for which the annotation should be created.
*/
file?: string

/**
* The start line for the annotation.
*/
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export function toCommandProperties(

return {
title: annotationProperties.title,
file: annotationProperties.file,
line: annotationProperties.startLine,
endLine: annotationProperties.endLine,
col: annotationProperties.startColumn,
Expand Down

0 comments on commit 60145e4

Please sign in to comment.