refactor: remove body and footers in convention

pkg/convention/commit.go

@@ -18,10 +18,9 @@ var (
 )
 
 type Commit struct {
-	Type           string
+	Type        string
-	Scope          string
+	Scope       string
-	Description    string
+	Description string
-	BodyAndFooters string
 }
 
 func NewCommit(c git.Commit) (result Commit, err error) {
@@ -37,9 +36,6 @@ func NewCommit(c git.Commit) (result Commit, err error) {
 		return
 	}
 
-	bodyAndFooters := message[len(header):]
-	parseBodyAndFooters(bodyAndFooters, &result)
-
 	return
 }
 
@@ -60,9 +56,3 @@ func parseHeader(header string, commit *Commit) error {
 
 	return nil
 }
-
-func parseBodyAndFooters(bodyAndFooters string, commit *Commit) {
-	bodyAndFooters = strings.TrimSpace(bodyAndFooters)
-
-	commit.BodyAndFooters = bodyAndFooters
-}

pkg/convention/commit_test.go

@@ -1,9 +1,6 @@
 package convention
 
 import (
-	"fmt"
-	"io/ioutil"
-	"strings"
 	"testing"
 
 	"github.com/haunt98/changeloguru/pkg/comparision"
@@ -14,40 +11,34 @@ import (
 func TestNewCommit(t *testing.T) {
 	tests := []struct {
 		name    string
+		c       git.Commit
 		wantErr error
 	}{
-		{
-			name: "Commit message with description and breaking change footer",
-		},
 		{
 			name: "Commit message with not character to draw attention to breaking change",
+			c: git.Commit{
+				Message: "refactor!: drop support for Node 6",
+			},
 		},
 		{
 			name: "Commit message with no body",
+			c: git.Commit{
+				Message: "docs: correct spelling of CHANGELOG",
+			},
 		},
 		{
 			name: "Commit message with scope",
-		},
+			c: git.Commit{
-		{
+				Message: "feat(lang): add polish language",
-			name: "Commit message with multi-paragraph body and multiple footers",
+			},
 		},
 	}
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			g := goldie.New(t)
-			gName := g.GoldenFileName(t, t.Name())
 
-			inputName := strings.TrimSuffix(gName, ".golden") + ".txt"
+			gotResult, gotErr := NewCommit(tc.c)
-			fmt.Println("inputName", inputName)
-			bytes, err := ioutil.ReadFile(inputName)
-			if err != nil {
-				t.Error(err)
-			}
-
-			gotResult, gotErr := NewCommit(git.Commit{
-				Message: string(bytes),
-			})
 			comparision.Diff(t, tc.wantErr, gotErr)
 			if tc.wantErr != nil {
 				return

pkg/convention/testdata/TestNewCommit/Commit_message_with_description_and_breaking_change_footer.golden

@@ -1,6 +0,0 @@
-{
-  "Type": "feat",
-  "Scope": "",
-  "Description": "allow provided config object to extend other configs",
-  "BodyAndFooters": "BREAKING CHANGE: `extends` key in config file is now used for extending other config files"
-}

pkg/convention/testdata/TestNewCommit/Commit_message_with_description_and_breaking_change_footer.txt

@@ -1,3 +0,0 @@
-feat: allow provided config object to extend other configs
-
-BREAKING CHANGE: `extends` key in config file is now used for extending other config files

pkg/convention/testdata/TestNewCommit/Commit_message_with_multi-paragraph_body_and_multiple_footers.golden

@@ -1,6 +0,0 @@
-{
-  "Type": "fix",
-  "Scope": "",
-  "Description": "correct minor typos in code",
-  "BodyAndFooters": "see the issue for details\n\non typos fixed.\n\nReviewed-by: Z\nRefs #133"
-}

pkg/convention/testdata/TestNewCommit/Commit_message_with_multi-paragraph_body_and_multiple_footers.txt

@@ -1,8 +0,0 @@
-fix: correct minor typos in code
-
-see the issue for details
-
-on typos fixed.
-
-Reviewed-by: Z
-Refs #133

pkg/convention/testdata/TestNewCommit/Commit_message_with_no_body.golden

@@ -1,6 +1,5 @@
 {
   "Type": "docs",
   "Scope": "",
-  "Description": "correct spelling of CHANGELOG",
+  "Description": "correct spelling of CHANGELOG"
-  "BodyAndFooters": ""
 }

pkg/convention/testdata/TestNewCommit/Commit_message_with_no_body.txt

@@ -1 +0,0 @@
-docs: correct spelling of CHANGELOG

pkg/convention/testdata/TestNewCommit/Commit_message_with_not_character_to_draw_attention_to_breaking_change.golden

@@ -1,6 +1,5 @@
 {
   "Type": "refactor",
   "Scope": "",
-  "Description": "drop support for Node 6",
+  "Description": "drop support for Node 6"
-  "BodyAndFooters": ""
 }

pkg/convention/testdata/TestNewCommit/Commit_message_with_not_character_to_draw_attention_to_breaking_change.txt

@@ -1 +0,0 @@
-refactor!: drop support for Node 6

pkg/convention/testdata/TestNewCommit/Commit_message_with_scope.golden

@@ -1,6 +1,5 @@
 {
   "Type": "feat",
   "Scope": "lang",
-  "Description": "add polish language",
+  "Description": "add polish language"
-  "BodyAndFooters": ""
 }

pkg/convention/testdata/TestNewCommit/Commit_message_with_scope.txt

@@ -1 +0,0 @@
-feat(lang): add polish language