Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Include verification for main branch #22

Closed
wants to merge 2 commits into from
Closed

feat: Include verification for main branch #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34a3677
feat: Include verification for main branch
codeis4fun Mar 25, 2024
7cea067
test: Include unit tests for main branch
codeis4fun Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/commit-message/commit_message_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,19 @@ func (f *CommitMessage) PrettifyCommitMessage(commitMessage string) (string, err
return f.upperFirstLetterOfSentence(message), nil
}

func isMergeMasterToBranch(message string) bool {
func isMergeIntoToBranch(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") {
if strings.Contains(row, "'origin/master' into") || strings.Contains(row, "merge branch 'master' into") || strings.Contains(row, "'origin/main' into") || strings.Contains(row, "merge branch 'main' into") {
return true
}
}
return false
}

func (f *CommitMessage) IsValidMessage(message string) bool {
if isMergeMasterToBranch(message) {
if isMergeIntoToBranch(message) {
return true
}

Expand Down
8 changes: 8 additions & 0 deletions src/commit-message/commit_message_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,12 @@ 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 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)
}
Loading