f52ea2a708
--- type: change description: |- Rework how FilterFilesChanged works Previously the filter would only match if _all_ files changed matched a pattern within it. This ends up not being very useful, as usually the filter is being used to guard a specific set of content within the project, and so it's a lot more useful to have the filter match if _any_ files changed matched a pattern. fingerprint: AFSaaPVOBsFYc0D3JQd0M7yJKDiS8/VjAsppPXTngGPb credentials: - type: pgp_signature pub_key_id: 95C46FA6A41148AC body: iQIzBAABAgAdFiEEJ6tQKp6olvZKJ0lwlcRvpqQRSKwFAl63Q/oACgkQlcRvpqQRSKxHew//QO74joMfwg+mCiSKjXRbTidYW/ILr3mspFSLMYS5RKcf2YQNpYOP24a7BINe5LQYXGAOEH7PxEWOTTJTzwv90/T/jmYwJJMuNRa3NHXfCRS63i7L2b4nWSEATPQlGZRaMLOOsYdg2m/mcEQuHgf+fmfd4iRGFJHDzxj4etcfD/cHi9fg8Assr7E8K9xoYp3vs/8cPWGP16p94LHmsu5m8pt990Bn4XzxUzHAseyjPgs3OElH67SqW9D9F2PHZvdmCo58bvt13otzn137jwf/EZQOkcOWXxaOxNG8bqZFWgFGUEQajgXYLwfPULC4J3c1Rj+umAT0R1QPzj0h2MIoE/gM1wbw5fwtIfCpM9pA526TFJfdujvYY4x8oPMve9hTQ0FZ9Vv1cTCrOWo5vVNjum0jY58GGr9/I+PXupstDmGnKHnwivz459YNq0Uuyir3KgyM8fY7rTf+FQslrv7Hafnrju3KqCvCoHT0nNj0dWVen5RFK6dee4fsYvGK8ujKYCJpwm+3/0ggJOCC3XsMOCCh/F/YMvq4Xtwo7AbNIrVPOSIAnu2khkybInmZGmIVEP4E6MWfVzjb4wVVocqYhhuHg09IDeBv9WS5s3KBUVL4RNYadrUXMOs4W7wXvHILSYx87j0UJfy9bUfALwclXaFuhBYzghbBQVN3L00ASaw= account: mediocregopher
138 lines
2.9 KiB
Go
138 lines
2.9 KiB
Go
package accessctl
|
|
|
|
import (
|
|
"errors"
|
|
"reflect"
|
|
"testing"
|
|
)
|
|
|
|
type filterCommitMatchTest struct {
|
|
descr string
|
|
filter Filter
|
|
req CommitRequest
|
|
match bool
|
|
|
|
// assumes match == false, and will ensure that the returned wrapped error
|
|
// is this one.
|
|
matchErr error
|
|
}
|
|
|
|
func runCommitMatchTests(t *testing.T, tests []filterCommitMatchTest) {
|
|
for _, test := range tests {
|
|
t.Run(test.descr, func(t *testing.T) {
|
|
err := test.filter.MatchCommit(test.req)
|
|
shouldMatch := test.match && test.matchErr == nil
|
|
if shouldMatch && err != nil {
|
|
t.Fatalf("expected to match, got %v", err)
|
|
|
|
} else if shouldMatch {
|
|
return
|
|
|
|
} else if fErr := new(ErrFilterNoMatch); !errors.As(err, fErr) {
|
|
t.Fatalf("expected ErrFilterNoMatch, got: %#v", err)
|
|
|
|
} else if test.matchErr != nil && !reflect.DeepEqual(fErr.Err, test.matchErr) {
|
|
t.Fatalf("expected err %#v, not %#v", test.matchErr, fErr.Err)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestFilterPayloadType(t *testing.T) {
|
|
mkReq := func(commitType string) CommitRequest {
|
|
return CommitRequest{Type: commitType}
|
|
}
|
|
|
|
runCommitMatchTests(t, []filterCommitMatchTest{
|
|
{
|
|
descr: "single match",
|
|
filter: FilterPayloadType{
|
|
Type: "foo",
|
|
},
|
|
req: mkReq("foo"),
|
|
match: true,
|
|
},
|
|
{
|
|
descr: "single no match",
|
|
filter: FilterPayloadType{
|
|
Type: "foo",
|
|
},
|
|
req: mkReq("bar"),
|
|
match: false,
|
|
},
|
|
{
|
|
descr: "multi match first",
|
|
filter: FilterPayloadType{
|
|
Types: []string{"foo", "bar"},
|
|
},
|
|
req: mkReq("foo"),
|
|
match: true,
|
|
},
|
|
{
|
|
descr: "multi match second",
|
|
filter: FilterPayloadType{
|
|
Types: []string{"foo", "bar"},
|
|
},
|
|
req: mkReq("bar"),
|
|
match: true,
|
|
},
|
|
{
|
|
descr: "multi no match",
|
|
filter: FilterPayloadType{
|
|
Types: []string{"foo", "bar"},
|
|
},
|
|
req: mkReq("baz"),
|
|
match: false,
|
|
},
|
|
})
|
|
}
|
|
|
|
func TestFilterCommitAttributes(t *testing.T) {
|
|
mkReq := func(nonFF bool) CommitRequest {
|
|
return CommitRequest{NonFastForward: nonFF}
|
|
}
|
|
|
|
runCommitMatchTests(t, []filterCommitMatchTest{
|
|
{
|
|
descr: "ff with empty filter",
|
|
filter: FilterCommitAttributes{},
|
|
req: mkReq(false),
|
|
match: true,
|
|
},
|
|
{
|
|
descr: "non-ff with empty filter",
|
|
filter: FilterCommitAttributes{},
|
|
req: mkReq(true),
|
|
match: true,
|
|
},
|
|
{
|
|
descr: "ff with non-ff filter",
|
|
filter: FilterCommitAttributes{NonFastForward: true},
|
|
req: mkReq(false),
|
|
match: false,
|
|
},
|
|
{
|
|
descr: "non-ff with non-ff filter",
|
|
filter: FilterCommitAttributes{NonFastForward: true},
|
|
req: mkReq(true),
|
|
match: true,
|
|
},
|
|
{
|
|
descr: "ff with inverted non-ff filter",
|
|
filter: FilterNot{Filter: FilterUnion{
|
|
CommitAttributes: &FilterCommitAttributes{NonFastForward: true},
|
|
}},
|
|
req: mkReq(false),
|
|
match: true,
|
|
},
|
|
{
|
|
descr: "non-ff with inverted non-ff filter",
|
|
filter: FilterNot{Filter: FilterUnion{
|
|
CommitAttributes: &FilterCommitAttributes{NonFastForward: true},
|
|
}},
|
|
req: mkReq(true),
|
|
match: false,
|
|
},
|
|
})
|
|
}
|