fix(pkg/cleaner): return string even if it doesn't have suffix

Aaron Schlesinger · Aaron Schlesinger · commit 8b0e31b38bd4 · 2016-02-19T14:55:35.000-08:00
diff --git a/pkg/cleaner/cleaner.go b/pkg/cleaner/cleaner.go
@@ -64,6 +64,8 @@ func stripSuffixes(strs []string, suffix string) []string {
 		idx := strings.LastIndex(str, suffix)
 		if idx >= 0 {
 			ret[i] = str[:idx]
+		} else {
+			ret[i] = str
 		}
 	}
 	return ret
diff --git a/pkg/cleaner/cleaner_test.go b/pkg/cleaner/cleaner_test.go
@@ -63,8 +63,9 @@ func TestLocalDirs(t *testing.T) {
 }
 
 func TestStripSuffixes(t *testing.T) {
-	strs := []string{"a.git", "b.git", "c.git"}
+	strs := []string{"a.git", "b.git", "c.git", "d"}
 	newStrs := stripSuffixes(strs, dotGitSuffix)
+	assert.Equal(t, len(newStrs), len(strs), "number of strings")
 	for _, str := range newStrs {
 		assert.False(t, strings.HasSuffix(str, dotGitSuffix), "string %s has suffix %s", str, dotGitSuffix)
 	}

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ func stripSuffixes(strs []string, suffix string) []string {`
`64`	`64`	`idx := strings.LastIndex(str, suffix)`
`65`	`65`	`if idx >= 0 {`
`66`	`66`	`ret[i] = str[:idx]`
	`67`	`+ } else {`
	`68`	`+ ret[i] = str`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`	`return ret`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,9 @@ func TestLocalDirs(t *testing.T) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func TestStripSuffixes(t *testing.T) {`
`66`		`- strs := []string{"a.git", "b.git", "c.git"}`
	`66`	`+ strs := []string{"a.git", "b.git", "c.git", "d"}`
`67`	`67`	`newStrs := stripSuffixes(strs, dotGitSuffix)`
	`68`	`+ assert.Equal(t, len(newStrs), len(strs), "number of strings")`
`68`	`69`	`for _, str := range newStrs {`
`69`	`70`	`assert.False(t, strings.HasSuffix(str, dotGitSuffix), "string %s has suffix %s", str, dotGitSuffix)`
`70`	`71`	`}`