Using TrimPrefix for getting current branch and improved tests

mmontes11 · mmontes11 · commit 2a166d1dd763 · 2020-09-30T18:26:22.000+02:00
diff --git a/git/git.go b/git/git.go
@@ -294,9 +294,5 @@ func firstLine(output []byte) string {
 
 func getBranchShortName(output []byte) string {
 	branch := firstLine(output)
-	prefix := "refs/heads/"
-	if i := strings.Index(branch, prefix); i != -1 {
-		return branch[i+len(prefix):]
-	}
-	return branch
+	return strings.TrimPrefix(branch, "refs/heads/")
 }
diff --git a/git/git_test.go b/git/git_test.go
@@ -45,13 +45,17 @@ func Test_CurrentBranch(t *testing.T) {
 	}
 	cases := []c{
 		{
-			Stub:     "branch-name",
+			Stub:     "branch-name\n",
 			Expected: "branch-name",
 		},
 		{
-			Stub:     "refs/heads/branch-name",
+			Stub:     "refs/heads/branch-name\n",
 			Expected: "branch-name",
 		},
+		{
+			Stub:     "refs/heads/branch\u00A0with\u00A0non\u00A0breaking\u00A0space\n",
+			Expected: "branch\u00A0with\u00A0non\u00A0breaking\u00A0space",
+		},
 	}
 
 	for _, v := range cases {

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,17 @@ func Test_CurrentBranch(t *testing.T) {`
`45`	`45`	`}`
`46`	`46`	`cases := []c{`
`47`	`47`	`{`
`48`		`- Stub: "branch-name",`
	`48`	`+ Stub: "branch-name\n",`
`49`	`49`	`Expected: "branch-name",`
`50`	`50`	`},`
`51`	`51`	`{`
`52`		`- Stub: "refs/heads/branch-name",`
	`52`	`+ Stub: "refs/heads/branch-name\n",`
`53`	`53`	`Expected: "branch-name",`
`54`	`54`	`},`
	`55`	`+ {`
	`56`	`+ Stub: "refs/heads/branch\u00A0with\u00A0non\u00A0breaking\u00A0space\n",`
	`57`	`+ Expected: "branch\u00A0with\u00A0non\u00A0breaking\u00A0space",`
	`58`	`+ },`
`55`	`59`	`}`
`56`	`60`
`57`	`61`	`for _, v := range cases {`