Commit7371a84

authored

Fix GitLab Update MR (#119)

1 parent2c007f4 commit7371a84Copy full SHA for 7371a84

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ func (client *GitLabClient) UpdatePullRequest(ctx context.Context, owner, reposi`
`246`	`246`	`Title:&title,`
`247`	`247`	`Description:&body,`
`248`	`248`	`TargetBranch:&targetBranchName,`
`249`		`-StateEvent:vcsutils.MapPullRequestState(&state),`
	`249`	`+StateEvent:mapGitLabPullRequestState(&state),`
`250`	`250`	`}`
`251`	`251`	`client.logger.Debug("updating details of merge request ID:",prId)`
`252`	`252`	`_,_,err:=client.glClient.MergeRequests.UpdateMergeRequest(getProjectID(owner,repository),prId,options,gitlab.WithContext(ctx))`
`@@ -827,3 +827,16 @@ func (client *GitLabClient) getProjectOwnerByID(projectID int) (string, error) {`
`827`	`827`	`}`
`828`	`828`	`returnproject.Namespace.Name,nil`
`829`	`829`	`}`
	`830`	`+`
	`831`	`+funcmapGitLabPullRequestState(statevcsutils.PullRequestState)string {`
	`832`	`+varstateStringValuestring`
	`833`	`+switch*state {`
	`834`	`+casevcsutils.Open:`
	`835`	`+stateStringValue="reopen"`
	`836`	`+casevcsutils.Closed:`
	`837`	`+stateStringValue="closed"`
	`838`	`+default:`
	`839`	`+returnnil`
	`840`	`+}`
	`841`	`+return&stateStringValue`
	`842`	`+}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,12 @@ func TestGitLabClient_UpdatePullRequest(t *testing.T) {`
`177`	`177`
`178`	`178`	`err:=client.UpdatePullRequest(ctx,owner,repo1,"PR title","PR body","master",prId,vcsutils.Open)`
`179`	`179`	`assert.NoError(t,err)`
	`180`	`+err=client.UpdatePullRequest(ctx,owner,repo1,"PR title","PR body","",prId,vcsutils.Open)`
	`181`	`+assert.NoError(t,err)`
	`182`	`+err=client.UpdatePullRequest(ctx,owner,repo1,"PR title","PR body","",prId,vcsutils.Closed)`
	`183`	`+assert.NoError(t,err)`
	`184`	`+err=client.UpdatePullRequest(ctx,owner,repo1,"PR title","PR body","",prId,"default")`
	`185`	`+assert.NoError(t,err)`
`180`	`186`	`}`
`181`	`187`
`182`	`188`	`funcTestGitLabClient_AddPullRequestComment(t*testing.T) {`

Comments

(0)