Merge pull request #23 from NeowayLabs/fix-is-valid-message-merge-master

fix: Fix IsValidMessage method adding a new exception for merge from master to the branch

CHANGELOG.md

@@ -1,3 +1,6 @@
+v2.0.3:
+ - Fix IsValidMessage method adding a new exception for merge from master to the branch (@esequiel.virtuoso)
+
 v2.0.2:
  - Fix IsValidMessage method adding a new exception for merge from master to the branch (@esequiel.virtuoso)
 

src/commit-message/commit_message_manager.go

@@ -79,7 +79,13 @@ func isMergeMasterToBranch(message string) bool {
 	splitedMessage := strings.Split(strings.ToLower(message), "\n")
 
 	for _, row := range splitedMessage {
-		if strings.Contains(row, "'origin/master' into") || strings.Contains(row, "merge branch 'master' into") {
+		lowerRow := strings.ToLower(row)
+		if strings.Contains(lowerRow, "'origin/master' into") ||
+			strings.Contains(lowerRow, "merge branch 'master' into") ||
+			strings.Contains(lowerRow, "merge branch 'master' of") ||
+			strings.Contains(lowerRow, "'origin/main' into") ||
+			strings.Contains(lowerRow, "merge branch 'main' into") ||
+			strings.Contains(lowerRow, "merge branch 'main' of") {
 			return true
 		}
 	}

src/commit-message/commit_message_manager_test.go

@@ -104,4 +104,20 @@ func TestIsValidMessageMergeMasterBranchSuccess(t *testing.T) {
 	message = "first message row \n Merge branch 'master' into something \n last message row"
 	actual = f.commitMessageManager.IsValidMessage(message)
 	tests.AssertTrue(t, actual)
+
+	message = "first message row \n Merge branch 'master' of something \n last message row"
+	actual = f.commitMessageManager.IsValidMessage(message)
+	tests.AssertTrue(t, actual)
+
+	message = "first message row \n Merge remote-tracking branch 'origin/main' into something \n last message row"
+	actual = f.commitMessageManager.IsValidMessage(message)
+	tests.AssertTrue(t, actual)
+
+	message = "first message row \n Merge branch 'main' into something \n last message row"
+	actual = f.commitMessageManager.IsValidMessage(message)
+	tests.AssertTrue(t, actual)
+
+	message = "first message row \n Merge branch 'main' of something \n last message row"
+	actual = f.commitMessageManager.IsValidMessage(message)
+	tests.AssertTrue(t, actual)
 }