test auto merge

Author: bivas

bot/actions/automerge/automerge.go

@@ -1,6 +1,7 @@
 package automerge
 
 import (
+	"fmt"
 	"github.com/bivas/rivi/bot"
 	"github.com/bivas/rivi/util"
 	"github.com/mitchellh/mapstructure"
@@ -9,6 +10,7 @@ import (
 
 type action struct {
 	rule *rule
+	err  error
 }
 
 type MergeableEventData interface {
@@ -19,6 +21,7 @@ func (a *action) Apply(config bot.Configuration, meta bot.EventData) {
 	mergeable, ok := meta.(MergeableEventData)
 	if !ok {
 		util.Logger.Warning("Event data does not support merge. Check your configurations")
+		a.err = fmt.Errorf("Event data does not support merge")
 		return
 	}
 	approvals := 0
@@ -30,6 +33,7 @@ func (a *action) Apply(config bot.Configuration, meta bot.EventData) {
 		}
 		clean := strings.ToLower(strings.TrimSpace(comment.Comment))
 		if _, ok := approvedSearchPhrases[clean]; ok {
+			assignees.Remove(comment.Commenter)
 			approvals++
 		}
 	}
@@ -38,7 +42,6 @@ func (a *action) Apply(config bot.Configuration, meta bot.EventData) {
 			meta.AddComment(a.rule.Comment)
 		}
 		mergeable.Merge(a.rule.Strategy)
-
 	}
 }
 

bot/actions/automerge/automerge_test.go

@@ -1 +1,80 @@
 package automerge
+
+import (
+	"github.com/bivas/rivi/bot"
+	"github.com/bivas/rivi/bot/mock"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+type mockMergableEventData struct {
+	mock.MockEventData
+	merged bool
+	method string
+}
+
+func (m *mockMergableEventData) Merge(mergeMethod string) {
+	m.merged = true
+	m.method = mergeMethod
+}
+
+func TestNotCapableToMerge(t *testing.T) {
+	action := action{rule: &rule{}}
+	action.rule.Defaults()
+	config := &mock.MockConfiguration{}
+	meta := &mock.MockEventData{Assignees: []string{"user1"}, Comments: []bot.Comment{
+		{Commenter: "user1", Comment: "approved"},
+	}}
+	action.Apply(config, meta)
+	assert.NotNil(t, action.err, "should be unable to merge")
+}
+
+func TestCapableToMerge(t *testing.T) {
+	action := action{rule: &rule{}}
+	action.rule.Defaults()
+	config := &mock.MockConfiguration{}
+	mockEventData := mock.MockEventData{Assignees: []string{"user1"}, Comments: []bot.Comment{
+		{Commenter: "user1", Comment: "approved"},
+	}}
+	meta := &mockMergableEventData{MockEventData: mockEventData}
+	action.Apply(config, meta)
+	assert.True(t, meta.merged, "should be merged")
+	assert.Equal(t, "merge", meta.method, "default should be merge")
+}
+
+func TestOriginComment(t *testing.T) {
+	action := action{rule: &rule{}}
+	action.rule.Defaults()
+	config := &mock.MockConfiguration{}
+	mockEventData := mock.MockEventData{Assignees: []string{"user1"}, Origin: "user2", Comments: []bot.Comment{
+		{Commenter: "user2", Comment: "approved"},
+	}}
+	meta := &mockMergableEventData{MockEventData: mockEventData}
+	action.Apply(config, meta)
+	assert.False(t, meta.merged, "should not be merged")
+}
+
+func TestNotApprovedComment(t *testing.T) {
+	action := action{rule: &rule{}}
+	action.rule.Defaults()
+	config := &mock.MockConfiguration{}
+	mockEventData := mock.MockEventData{Assignees: []string{"user1"}, Origin: "user2", Comments: []bot.Comment{
+		{Commenter: "user1", Comment: "not approved"},
+	}}
+	meta := &mockMergableEventData{MockEventData: mockEventData}
+	action.Apply(config, meta)
+	assert.False(t, meta.merged, "should not be merged")
+}
+
+func TestSameApprovedComment(t *testing.T) {
+	action := action{rule: &rule{Require: 2}}
+	action.rule.Defaults()
+	config := &mock.MockConfiguration{}
+	mockEventData := mock.MockEventData{Assignees: []string{"user1"}, Origin: "user2", Comments: []bot.Comment{
+		{Commenter: "user1", Comment: "approved"},
+		{Commenter: "user1", Comment: "approved"},
+	}}
+	meta := &mockMergableEventData{MockEventData: mockEventData}
+	action.Apply(config, meta)
+	assert.False(t, meta.merged, "should not be merged")
+}