Fixes runatlantis#835

- Improve tests - Replace instead of Split
mcdafydd · Nov 14, 2019 · 09eb6ac · 09eb6ac
1 parent 71239cf
commit 09eb6ac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/server/events/event_parser.go b/server/events/event_parser.go
@@ -788,14 +788,15 @@ func (e *EventParser) ParseAzureDevopsPull(pull *azuredevops.GitPullRequest) (pu
 	}
 
 	pullModel = models.PullRequest{
-		Author:     authorUsername,
-		HeadBranch: strings.SplitAfterN(headBranch, "/", 3)[2],
+		Author: authorUsername,
+		// Change webhook refs from "refs/heads/<branch>" to "<branch>"
+		HeadBranch: strings.Replace(headBranch, "refs/heads/", "", 1),
 		HeadCommit: commit,
 		URL:        url,
 		Num:        num,
 		State:      pullState,
 		BaseRepo:   baseRepo,
-		BaseBranch: strings.SplitAfterN(baseBranch, "/", 3)[2],
+		BaseBranch: strings.Replace(baseBranch, "refs/heads/", "", 1),
 	}
 	return
 }

diff --git a/server/events/event_parser_test.go b/server/events/event_parser_test.go
@@ -1157,8 +1157,8 @@ func TestParseAzureDevopsPullEvent(t *testing.T) {
 	Equals(t, models.PullRequest{
 		URL:        ADPull.GetURL(),
 		Author:     ADPull.CreatedBy.GetUniqueName(),
-		HeadBranch: strings.SplitAfterN(ADPull.GetSourceRefName(), "/", 3)[2],
-		BaseBranch: strings.SplitAfterN(ADPull.GetTargetRefName(), "/", 3)[2],
+		HeadBranch: "feature/sourceBranch",
+		BaseBranch: "targetBranch",
 		HeadCommit: ADPull.LastMergeSourceCommit.GetCommitID(),
 		Num:        ADPull.GetPullRequestID(),
 		State:      models.OpenPullState,
@@ -1257,8 +1257,8 @@ func TestParseAzureDevopsPull(t *testing.T) {
 	Equals(t, models.PullRequest{
 		URL:        ADPull.GetURL(),
 		Author:     ADPull.CreatedBy.GetUniqueName(),
-		HeadBranch: strings.SplitAfterN(ADPull.GetSourceRefName(), "/", 3)[2],
-		BaseBranch: strings.SplitAfterN(ADPull.GetTargetRefName(), "/", 3)[2],
+		HeadBranch: "feature/sourceBranch",
+		BaseBranch: "targetBranch",
 		HeadCommit: ADPull.LastMergeSourceCommit.GetCommitID(),
 		Num:        ADPull.GetPullRequestID(),
 		State:      models.OpenPullState,

diff --git a/server/events/vcs/fixtures/fixtures.go b/server/events/vcs/fixtures/fixtures.go
@@ -80,7 +80,7 @@ var ADPull = azuredevops.GitPullRequest{
 	},
 	PullRequestID: azuredevops.Int(1),
 	Repository:    &ADRepo,
-	SourceRefName: azuredevops.String("refs/heads/owner/feature/sourceBranch"),
+	SourceRefName: azuredevops.String("refs/heads/feature/sourceBranch"),
 	Status:        azuredevops.String("active"),
 	TargetRefName: azuredevops.String("refs/heads/targetBranch"),
 	URL:           azuredevops.String("https://dev.azure.com/fabrikam/_apis/git/repositories/3411ebc1-d5aa-464f-9615-0b527bc66719/pullRequests/21"),