mach-composer-cli/internal/gitutils/diff_test.go at 5d1e78be7829a42a17a3bddfb123436296d61817 · mach-composer/mach-composer-cli · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
package gitutils

import (
	"context"
	"github.com/go-git/go-git/v5/plumbing"
	"github.com/stretchr/testify/assert"
	"github.com/stretchr/testify/require"
	"testing"
)

func TestPathFilter(t *testing.T) {
	assert.True(t, pathFilter([]string{})("test/test"))
	assert.True(t, pathFilter([]string{"test"})("test/test"))
	assert.True(t, pathFilter([]string{"foo/bar/baz/test"})("test/file.txt"))
	assert.False(t, pathFilter([]string{"foo"})("test/test"))
}

func TestCommitsBetweenResolveFirstError(t *testing.T) {
	tr := NewTestRepository("")

	// First commit
	err := tr.addTextFile("test-1.txt", "test")
	require.NoError(t, err)

	// Second commit
	err = tr.addTextFile("test-2.txt", "test")
	require.NoError(t, err)

	secondHash, err := tr.commit("Second commit")
	require.NoError(t, err)

	ctx := context.Background()
	targetRev := plumbing.Revision(secondHash.String())

	badRev := plumbing.Revision("test")

	// Check results
	_, err = commitsBetween(ctx, tr.repository(), &badRev, &targetRev, []string{})
	require.Error(t, err)
}

func TestCommitsBetween(t *testing.T) {
	tr := NewTestRepository("")

	// First commit
	err := tr.addTextFile("test-1.txt", "test")
	require.NoError(t, err)

	firstHash, err := tr.commit("Initial commit")
	require.NoError(t, err)

	// Second commit
	err = tr.addTextFile("test-2.txt", "test")
	require.NoError(t, err)

	secondHash, err := tr.commit("Second commit")
	require.NoError(t, err)

	ctx := context.Background()

	targetRev := plumbing.Revision(secondHash.String())
	baseRev := plumbing.Revision(firstHash.String())

	commits, err := commitsBetween(ctx, tr.repository(), nil, &targetRev, []string{})
	require.NoError(t, err)
	assert.Equal(t, 2, len(commits))

	commits, err = commitsBetween(ctx, tr.repository(), &baseRev, &targetRev, []string{})
	require.NoError(t, err)
	assert.Equal(t, 1, len(commits))
}

func TestCommitsBetweenFilterPath(t *testing.T) {
	tr := NewTestRepository("")

	// First commit
	err := tr.addTextFile("test-1.txt", "test")
	require.NoError(t, err)

	firstHash, err := tr.commit("Initial commit")
	require.NoError(t, err)
	require.NotNil(t, firstHash)

	// Second commit
	err = tr.addTextFile("test-2.txt", "test")
	require.NoError(t, err)

	err = tr.addTextFile("wanted/test-2.txt", "test")
	require.NoError(t, err)

	_, err = tr.commit("Second commit")
	require.NoError(t, err)

	// Third commit
	err = tr.addTextFile("test-3.txt", "test")
	require.NoError(t, err)

	err = tr.addTextFile("wantedotherdir/test-3.txt", "test")
	require.NoError(t, err)

	thirdHash, err := tr.commit("third commit")
	require.NoError(t, err)

	ctx := context.Background()
	targetRev := plumbing.Revision(thirdHash.String())

	// Check results
	commits, err := commitsBetween(ctx, tr.repository(), nil, &targetRev, []string{})
	require.NoError(t, err)
	assert.Equal(t, 3, len(commits))

	commits, err = commitsBetween(ctx, tr.repository(), nil, &targetRev, []string{"wanted/"})
	require.NoError(t, err)
	assert.Equal(t, 1, len(commits))
}