testing

Author: msau42

pkg/git/git_integration_test.go

@@ -135,13 +135,14 @@ func newTestRepo(t *testing.T) *testRepo {
 	_, err = worktree.Add(branchTestFileName)
 	require.Nil(t, err)
 
+	author.When = time.Now()
 	firstBranchCommit, err := worktree.Commit("Second commit", &gogit.CommitOptions{
 		Author: author,
 		All:    true,
 	})
 	require.Nil(t, err)
 
-	secondTagName := "v0.1.1"
+	secondTagName := "v1.17.1"
 	secondTagRef, err := cloneRepo.CreateTag(secondTagName, firstBranchCommit,
 		&gogit.CreateTagOptions{
 			Tagger:  author,
@@ -159,13 +160,14 @@ func newTestRepo(t *testing.T) *testRepo {
 	_, err = worktree.Add(secondBranchTestFileName)
 	require.Nil(t, err)
 
+	author.When = time.Now()
 	secondBranchCommit, err := worktree.Commit("Third commit", &gogit.CommitOptions{
 		Author: author,
 		All:    true,
 	})
 	require.Nil(t, err)
 
-	thirdTagName := "v0.1.2"
+	thirdTagName := "v1.17.2"
 	thirdTagRef, err := cloneRepo.CreateTag(thirdTagName, secondBranchCommit,
 		&gogit.CreateTagOptions{
 			Tagger:  author,
@@ -183,6 +185,7 @@ func newTestRepo(t *testing.T) *testRepo {
 	_, err = worktree.Add(thirdBranchTestFileName)
 	require.Nil(t, err)
 
+	author.When = time.Now()
 	thirdBranchCommit, err := worktree.Commit("Fourth commit", &gogit.CommitOptions{
 		Author: author,
 		All:    true,
@@ -408,6 +411,15 @@ func TestSuccessLatestTagForBranch(t *testing.T) {
 	require.Equal(t, util.SemverToTagString(version), testRepo.firstTagName)
 }
 
+func TestSuccessLatestTagForBranchRelease(t *testing.T) {
+	testRepo := newTestRepo(t)
+	defer testRepo.cleanup(t)
+
+	version, err := testRepo.sut.LatestTagForBranch("release-1.17")
+	require.Nil(t, err)
+	require.Equal(t, util.SemverToTagString(version), testRepo.thirdTagName)
+}
+
 func TestFailureLatestTagForBranchInvalidBranch(t *testing.T) {
 	testRepo := newTestRepo(t)
 	defer testRepo.cleanup(t)
@@ -448,8 +460,8 @@ func TestSuccessLatestPatchToLatest(t *testing.T) {
 
 	result, err := testRepo.sut.LatestPatchToLatest(testRepo.branchName)
 	require.Nil(t, err)
-	require.Equal(t, result.StartSHA(), testRepo.firstCommit)
-	require.Equal(t, result.StartRev(), testRepo.firstTagName)
+	require.Equal(t, result.StartSHA(), testRepo.secondBranchCommit)
+	require.Equal(t, result.StartRev(), testRepo.thirdTagName)
 	require.Equal(t, result.EndSHA(), testRepo.thirdBranchCommit)
 }
 
@@ -529,9 +541,9 @@ func TestTagsForBranchOnBranch(t *testing.T) {
 	result, err := testRepo.sut.TagsForBranch(testRepo.branchName)
 	require.Nil(t, err)
 	require.Equal(t, result, []string{
-		testRepo.firstTagName,
 		testRepo.thirdTagName,
 		testRepo.secondTagName,
+		testRepo.firstTagName,
 	})
 }