fix ref for pr closed event when a pr is merged (#141)
This commit is contained in:
		@@ -75,6 +75,20 @@ describe('input-helper tests', () => {
 | 
				
			|||||||
    expect(settings.repositoryPath).toBe(gitHubWorkspace)
 | 
					    expect(settings.repositoryPath).toBe(gitHubWorkspace)
 | 
				
			||||||
  })
 | 
					  })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  it('qualifies ref', () => {
 | 
				
			||||||
 | 
					    let originalContext = mockGitHub.context
 | 
				
			||||||
 | 
					    try {
 | 
				
			||||||
 | 
					      mockGitHub.context = {...originalContext} // Shallow clone
 | 
				
			||||||
 | 
					      mockGitHub.context.ref = 'some-unqualified-ref'
 | 
				
			||||||
 | 
					      const settings: ISourceSettings = inputHelper.getInputs()
 | 
				
			||||||
 | 
					      expect(settings).toBeTruthy()
 | 
				
			||||||
 | 
					      expect(settings.commit).toBe('1234567890123456789012345678901234567890')
 | 
				
			||||||
 | 
					      expect(settings.ref).toBe('refs/heads/some-unqualified-ref')
 | 
				
			||||||
 | 
					    } finally {
 | 
				
			||||||
 | 
					      mockGitHub.context = originalContext
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  it('requires qualified repo', () => {
 | 
					  it('requires qualified repo', () => {
 | 
				
			||||||
    inputs.repository = 'some-unqualified-repo'
 | 
					    inputs.repository = 'some-unqualified-repo'
 | 
				
			||||||
    assert.throws(() => {
 | 
					    assert.throws(() => {
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							@@ -12757,6 +12757,11 @@ function getInputs() {
 | 
				
			|||||||
        if (isWorkflowRepository) {
 | 
					        if (isWorkflowRepository) {
 | 
				
			||||||
            result.ref = github.context.ref;
 | 
					            result.ref = github.context.ref;
 | 
				
			||||||
            result.commit = github.context.sha;
 | 
					            result.commit = github.context.sha;
 | 
				
			||||||
 | 
					            // Some events have an unqualifed ref. For example when a PR is merged (pull_request closed event),
 | 
				
			||||||
 | 
					            // the ref is unqualifed like "master" instead of "refs/heads/master".
 | 
				
			||||||
 | 
					            if (result.commit && result.ref && !result.ref.startsWith('refs/')) {
 | 
				
			||||||
 | 
					                result.ref = `refs/heads/${result.ref}`;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (!result.ref && !result.commit) {
 | 
					        if (!result.ref && !result.commit) {
 | 
				
			||||||
            result.ref = 'refs/heads/master';
 | 
					            result.ref = 'refs/heads/master';
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,6 +61,12 @@ export function getInputs(): ISourceSettings {
 | 
				
			|||||||
    if (isWorkflowRepository) {
 | 
					    if (isWorkflowRepository) {
 | 
				
			||||||
      result.ref = github.context.ref
 | 
					      result.ref = github.context.ref
 | 
				
			||||||
      result.commit = github.context.sha
 | 
					      result.commit = github.context.sha
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      // Some events have an unqualifed ref. For example when a PR is merged (pull_request closed event),
 | 
				
			||||||
 | 
					      // the ref is unqualifed like "master" instead of "refs/heads/master".
 | 
				
			||||||
 | 
					      if (result.commit && result.ref && !result.ref.startsWith('refs/')) {
 | 
				
			||||||
 | 
					        result.ref = `refs/heads/${result.ref}`
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!result.ref && !result.commit) {
 | 
					    if (!result.ref && !result.commit) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user