feat: add support for merge strategy (#353)

Author: bobdoah

bitbucket.go

@@ -299,25 +299,37 @@ type RepositoryTagTarget struct {
 	Hash string `json:"hash"`
 }
 
+type PullRequestsMergeStrategy string
+
+const (
+	MergeCommit       PullRequestsMergeStrategy = "merge_commit"
+	Squash            PullRequestsMergeStrategy = "squash"
+	FastForward       PullRequestsMergeStrategy = "fast_forward"
+	SquashFastForward PullRequestsMergeStrategy = "squash_fast_forward"
+	RebaseFastForward PullRequestsMergeStrategy = "rebase_fast_forward"
+	RebaseMerge       PullRequestsMergeStrategy = "rebase_merge"
+)
+
 type PullRequestsOptions struct {
-	ID                string   `json:"id"`
-	CommentID         string   `json:"comment_id"`
-	Owner             string   `json:"owner"`
-	RepoSlug          string   `json:"repo_slug"`
-	Title             string   `json:"title"`
-	Description       string   `json:"description"`
-	CloseSourceBranch bool     `json:"close_source_branch"`
-	SourceBranch      string   `json:"source_branch"`
-	SourceRepository  string   `json:"source_repository"`
-	DestinationBranch string   `json:"destination_branch"`
-	DestinationCommit string   `json:"destination_repository"`
-	Message           string   `json:"message"`
-	Reviewers         []string `json:"reviewers"`
-	States            []string `json:"states"`
-	Query             string   `json:"query"`
-	Sort              string   `json:"sort"`
-	Draft             bool     `json:"draft"`
-	Commit            string   `json:"commit"`
+	ID                string                    `json:"id"`
+	CommentID         string                    `json:"comment_id"`
+	Owner             string                    `json:"owner"`
+	RepoSlug          string                    `json:"repo_slug"`
+	Title             string                    `json:"title"`
+	Description       string                    `json:"description"`
+	CloseSourceBranch bool                      `json:"close_source_branch"`
+	SourceBranch      string                    `json:"source_branch"`
+	SourceRepository  string                    `json:"source_repository"`
+	DestinationBranch string                    `json:"destination_branch"`
+	DestinationCommit string                    `json:"destination_repository"`
+	MergeStrategy     PullRequestsMergeStrategy `json:"merge_strategy"`
+	Message           string                    `json:"message"`
+	Reviewers         []string                  `json:"reviewers"`
+	States            []string                  `json:"states"`
+	Query             string                    `json:"query"`
+	Sort              string                    `json:"sort"`
+	Draft             bool                      `json:"draft"`
+	Commit            string                    `json:"commit"`
 	ctx               context.Context
 }
 

pullrequests.go

@@ -265,6 +265,10 @@ func (p *PullRequests) buildPullRequestBody(po *PullRequestsOptions) (string, er
 		body["close_source_branch"] = po.CloseSourceBranch
 	}
 
+	if po.MergeStrategy != "" {
+		body["merge_strategy"] = po.MergeStrategy
+	}
+
 	if po.Draft {
 		body["draft"] = true
 	}

pullrequests_test.go

@@ -937,3 +937,69 @@ func TestPullRequestsDecline_NotFound(t *testing.T) {
 	assert.Error(t, err)
 	assert.Nil(t, result)
 }
+func TestBuildPullRequestBody_MergeStrategy(t *testing.T) {
+	t.Parallel()
+
+	tests := map[string]struct {
+		strategy PullRequestsMergeStrategy
+		expected string
+	}{
+		"MergeCommit":       {MergeCommit, "merge_commit"},
+		"Squash":            {Squash, "squash"},
+		"FastForward":       {FastForward, "fast_forward"},
+		"SquashFastForward": {SquashFastForward, "squash_fast_forward"},
+		"RebaseFastForward": {RebaseFastForward, "rebase_fast_forward"},
+		"RebaseMerge":       {RebaseMerge, "rebase_merge"},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+			pr := &PullRequests{}
+			opts := &PullRequestsOptions{
+				Title:         "Merge Strategy",
+				MergeStrategy: tc.strategy,
+			}
+
+			data, err := pr.buildPullRequestBody(opts)
+			require.NoError(t, err)
+
+			var body map[string]interface{}
+			require.NoError(t, json.Unmarshal([]byte(data), &body))
+
+			assert.Equal(t, tc.expected, body["merge_strategy"], "Strategy %s did not serialize correctly", name)
+		})
+	}
+}
+
+func TestPullRequestsMerge_WithStrategy(t *testing.T) {
+	t.Parallel()
+	var receivedBody map[string]interface{}
+
+	client, server := setupMockServer(func(w http.ResponseWriter, r *http.Request) {
+		bodyBytes, _ := io.ReadAll(r.Body)
+		_ = json.Unmarshal(bodyBytes, &receivedBody)
+
+		mergedPR := realisticPRResponse()
+		mergedPR["state"] = "MERGED"
+		respondJSON(w, http.StatusOK, mergedPR)
+	})
+	defer server.Close()
+
+	opts := &PullRequestsOptions{
+		Owner:         "owner",
+		RepoSlug:      "repo",
+		ID:            "1",
+		MergeStrategy: FastForward,
+		Message:       "Fast-forwarding this PR",
+	}
+
+	result, err := client.Repositories.PullRequests.Merge(opts)
+
+	require.NoError(t, err)
+	assert.Equal(t, string(FastForward), receivedBody["merge_strategy"])
+	assert.Equal(t, "Fast-forwarding this PR", receivedBody["message"])
+
+	resultMap := result.(map[string]interface{})
+	assert.Equal(t, "MERGED", resultMap["state"])
+}