test: consolidate Go tests (#39962)

Consolidate all Go tests. Coverage is identical to before. Go tests are
around 5% faster while being 7% smaller. No non-test code is touched.

modules/actions/github_test.go

@@ -77,12 +77,6 @@ func TestCanGithubEventMatch(t *testing.T) {
 			webhook_module.HookEventPullRequest,
 			true,
 		},
-		{
-			"pull_request_target cannot match",
-			GithubEventPullRequest,
-			webhook_module.HookEventPullRequestComment,
-			false,
-		},
 		// pull_request_review event
 		{
 			"pull_request_review matches",

modules/actions/jobparser/jobparser_test.go

@@ -18,72 +18,21 @@ import (
 )
 
 func TestParse(t *testing.T) {
-	tests := []struct {
-		name    string
-		options []ParseOption
-		wantErr bool
-	}{
-		{
-			name:    "multiple_jobs",
-			options: nil,
-			wantErr: false,
-		},
-		{
-			name:    "multiple_matrix",
-			options: nil,
-			wantErr: false,
-		},
-		{
-			name:    "has_needs",
-			options: nil,
-			wantErr: false,
-		},
-		{
-			name:    "has_with",
-			options: nil,
-			wantErr: false,
-		},
-		{
-			name:    "has_secrets",
-			options: nil,
-			wantErr: false,
-		},
-		{
-			name:    "empty_step",
-			options: nil,
-			wantErr: false,
-		},
-		{
-			name:    "job_name_with_matrix",
-			options: nil,
-			wantErr: false,
-		},
-		{
-			name:    "prefixed_newline",
-			options: nil,
-			wantErr: false,
-		},
-		{
-			name:    "continue_on_error_expr",
-			options: nil,
-			wantErr: false,
-		},
-	}
-	invalidFileTests := []struct {
-		name string
-	}{
-		{name: "null_job_implicit"},
-		{name: "null_job_explicit"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			content := ReadTestdata(t, tt.name+".in.yaml")
-			want := ReadTestdata(t, tt.name+".out.yaml")
-			got, err := Parse(content, append([]ParseOption{WithGitContext(&model.GithubContext{})}, tt.options...)...)
-			if tt.wantErr {
-				require.Error(t, err)
-			}
+	for _, name := range []string{
+		"multiple_jobs",
+		"multiple_matrix",
+		"has_needs",
+		"has_with",
+		"has_secrets",
+		"empty_step",
+		"job_name_with_matrix",
+		"prefixed_newline",
+		"continue_on_error_expr",
+	} {
+		t.Run(name, func(t *testing.T) {
+			content := ReadTestdata(t, name+".in.yaml")
+			want := ReadTestdata(t, name+".out.yaml")
+			got, err := Parse(content, WithGitContext(&model.GithubContext{}))
 			require.NoError(t, err)
 
 			builder := &strings.Builder{}
@@ -102,9 +51,9 @@ func TestParse(t *testing.T) {
 		})
 	}
 
-	for _, tt := range invalidFileTests {
-		t.Run(tt.name, func(t *testing.T) {
-			content := ReadTestdata(t, tt.name+".in.yaml")
+	for _, name := range []string{"null_job_implicit", "null_job_explicit"} {
+		t.Run(name, func(t *testing.T) {
+			content := ReadTestdata(t, name+".in.yaml")
 			require.NotPanics(t, func() {
 				_, err := Parse(content)
 				require.Error(t, err)
@@ -460,6 +409,8 @@ func TestExpandMatrixWithNeeds(t *testing.T) {
 		{"empty vector", "\n  version: ${{ fromJson(needs.setup.outputs.empty) }}\n", `Matrix vector "version" does not contain any values`},
 		{"empty include", "\n  include: ${{ fromJson(needs.setup.outputs.empty) }}\n", "Matrix must define at least one vector"},
 		{"whole matrix not a mapping", " ${{ fromJson(needs.setup.outputs.empty) }}\n", `Matrix "" is not a map of matrix keys to values`},
+		{"unresolved need", "\n  v: ${{ fromJson(needs.missing.outputs.v) }}\n", "evaluate matrix"},
+		{"invalid strategy field", "\n  os: [linux]\nmax-parallel: ${{ fromJSON('bad') }}\n", "evaluate strategy"},
 	} {
 		t.Run(tt.name+" errors", func(t *testing.T) {
 			_, err := expand(t, tt.matrix)
@@ -475,16 +426,6 @@ func TestExpandMatrixWithNeeds(t *testing.T) {
 		assert.Equal(t, 1, got[0].Strategy.JobTotal)
 	})
 
-	t.Run("unresolved need errors", func(t *testing.T) {
-		_, err := expand(t, "\n  v: ${{ fromJson(needs.missing.outputs.v) }}\n")
-		require.ErrorContains(t, err, "evaluate matrix")
-	})
-
-	t.Run("invalid strategy field errors", func(t *testing.T) {
-		_, err := expand(t, "\n  os: [linux]\nmax-parallel: ${{ fromJSON('bad') }}\n")
-		require.ErrorContains(t, err, "evaluate strategy")
-	})
-
 	// The combination count comes from a runtime output, so it must be rejected before one Job per
 	// combination is built rather than after.
 	t.Run("too many combinations errors", func(t *testing.T) {

modules/actions/jobparser/model_test.go

@@ -332,29 +332,17 @@ func TestSingleWorkflow_SetJob(t *testing.T) {
 
 func TestGetContinueOnError(t *testing.T) {
 	tests := []struct {
-		name string
-		yaml string
-		want bool
+		name            string
+		continueOnError string
+		want            bool
 	}{
-		{
-			name: "absent",
-			yaml: "name: test\non: push\njobs:\n  job1:\n    runs-on: ubuntu-22.04\n    steps:\n      - run: echo hi\n",
-			want: false,
-		},
-		{
-			name: "static true",
-			yaml: "name: test\non: push\njobs:\n  job1:\n    runs-on: ubuntu-22.04\n    continue-on-error: true\n    steps:\n      - run: echo hi\n",
-			want: true,
-		},
-		{
-			name: "static false",
-			yaml: "name: test\non: push\njobs:\n  job1:\n    runs-on: ubuntu-22.04\n    continue-on-error: false\n    steps:\n      - run: echo hi\n",
-			want: false,
-		},
+		{name: "absent", want: false},
+		{name: "static true", continueOnError: "    continue-on-error: true\n", want: true},
+		{name: "static false", continueOnError: "    continue-on-error: false\n", want: false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := Parse([]byte(tt.yaml))
+			got, err := Parse(fmt.Appendf(nil, "name: test\non: push\njobs:\n  job1:\n    runs-on: ubuntu-22.04\n%s    steps:\n      - run: echo hi\n", tt.continueOnError))
 			require.NoError(t, err)
 			require.Len(t, got, 1)
 			_, job := got[0].Job()

modules/actions/workflowpattern/workflow_pattern_test.go

@@ -13,404 +13,214 @@ import (
 
 func TestMatchPattern(t *testing.T) {
 	kases := []struct {
-		inputs       []string
+		inputs       [][]string
 		patterns     []string
 		skipResult   bool
 		filterResult bool
 	}{
 		{
 			patterns:     []string{"*"},
-			inputs:       []string{"path/with/slash"},
+			inputs:       [][]string{{"path/with/slash"}},
 			skipResult:   true,
 			filterResult: false,
 		},
 		{
 			patterns:     []string{"path/a", "path/b", "path/c"},
-			inputs:       []string{"meta", "path/b", "otherfile"},
+			inputs:       [][]string{{"meta", "path/b", "otherfile"}},
 			skipResult:   false,
 			filterResult: false,
 		},
 		{
 			patterns:     []string{"path/a", "path/b", "path/c"},
-			inputs:       []string{"path/b"},
+			inputs:       [][]string{{"path/b"}, {"path/c", "path/b"}, {"path/c", "path/b", "path/a"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"path/a", "path/b", "path/c"},
-			inputs:       []string{"path/c", "path/b"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"path/a", "path/b", "path/c"},
-			inputs:       []string{"path/c", "path/b", "path/a"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"path/a", "path/b", "path/c"},
-			inputs:       []string{"path/c", "path/b", "path/d", "path/a"},
+			inputs:       [][]string{{"path/c", "path/b", "path/d", "path/a"}},
 			skipResult:   false,
 			filterResult: false,
 		},
 		{
 			patterns:     []string{},
-			inputs:       []string{},
+			inputs:       [][]string{{}},
 			skipResult:   false,
 			filterResult: false,
 		},
 		{
 			patterns:     []string{"\\!file"},
-			inputs:       []string{"!file"},
+			inputs:       [][]string{{"!file"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"escape\\\\backslash"},
-			inputs:       []string{"escape\\backslash"},
+			inputs:       [][]string{{"escape\\backslash"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{".yml"},
-			inputs:       []string{"fyml"},
+			inputs:       [][]string{{"fyml"}},
 			skipResult:   true,
 			filterResult: false,
 		},
 		// https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#patterns-to-match-branches-and-tags
 		{
 			patterns:     []string{"feature/*"},
-			inputs:       []string{"feature/my-branch"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"feature/*"},
-			inputs:       []string{"feature/your-branch"},
+			inputs:       [][]string{{"feature/my-branch"}, {"feature/your-branch"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"feature/**"},
-			inputs:       []string{"feature/beta-a/my-branch"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"feature/**"},
-			inputs:       []string{"feature/beta-a/my-branch"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"feature/**"},
-			inputs:       []string{"feature/mona/the/octocat"},
+			inputs:       [][]string{{"feature/beta-a/my-branch"}, {"feature/mona/the/octocat"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"main", "releases/mona-the-octocat"},
-			inputs:       []string{"main"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"main", "releases/mona-the-octocat"},
-			inputs:       []string{"releases/mona-the-octocat"},
+			inputs:       [][]string{{"main"}, {"releases/mona-the-octocat"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"*"},
-			inputs:       []string{"main"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*"},
-			inputs:       []string{"releases"},
+			inputs:       [][]string{{"main"}, {"releases"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"**"},
-			inputs:       []string{"all/the/branches"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**"},
-			inputs:       []string{"every/tag"},
+			inputs:       [][]string{{"all/the/branches"}, {"every/tag"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"*feature"},
-			inputs:       []string{"mona-feature"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*feature"},
-			inputs:       []string{"feature"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*feature"},
-			inputs:       []string{"ver-10-feature"},
+			inputs:       [][]string{{"mona-feature"}, {"feature"}, {"ver-10-feature"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"v2*"},
-			inputs:       []string{"v2"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"v2*"},
-			inputs:       []string{"v2.0"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"v2*"},
-			inputs:       []string{"v2.9"},
+			inputs:       [][]string{{"v2"}, {"v2.0"}, {"v2.9"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"v[12].[0-9]+.[0-9]+"},
-			inputs:       []string{"v1.10.1"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"v[12].[0-9]+.[0-9]+"},
-			inputs:       []string{"v2.0.0"},
+			inputs:       [][]string{{"v1.10.1"}, {"v2.0.0"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		// https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#patterns-to-match-file-paths
 		{
 			patterns:     []string{"*"},
-			inputs:       []string{"README.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*"},
-			inputs:       []string{"server.rb"},
+			inputs:       [][]string{{"README.md"}, {"server.rb"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"*.jsx?"},
-			inputs:       []string{"page.js"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*.jsx?"},
-			inputs:       []string{"page.jsx"},
+			inputs:       [][]string{{"page.js"}, {"page.jsx"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"**"},
-			inputs:       []string{"all/the/files.md"},
+			inputs:       [][]string{{"all/the/files.md"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"*.js"},
-			inputs:       []string{"app.js"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*.js"},
-			inputs:       []string{"index.js"},
+			inputs:       [][]string{{"app.js"}, {"index.js"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"**.js"},
-			inputs:       []string{"index.js"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**.js"},
-			inputs:       []string{"js/index.js"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**.js"},
-			inputs:       []string{"src/js/app.js"},
+			inputs:       [][]string{{"index.js"}, {"js/index.js"}, {"src/js/app.js"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"docs/*"},
-			inputs:       []string{"docs/README.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"docs/*"},
-			inputs:       []string{"docs/file.txt"},
+			inputs:       [][]string{{"docs/README.md"}, {"docs/file.txt"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"docs/**"},
-			inputs:       []string{"docs/README.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"docs/**"},
-			inputs:       []string{"docs/mona/octocat.txt"},
+			inputs:       [][]string{{"docs/README.md"}, {"docs/mona/octocat.txt"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"docs/**/*.md"},
-			inputs:       []string{"docs/README.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"docs/**/*.md"},
-			inputs:       []string{"docs/mona/hello-world.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"docs/**/*.md"},
-			inputs:       []string{"docs/a/markdown/file.md"},
+			inputs:       [][]string{{"docs/README.md"}, {"docs/mona/hello-world.md"}, {"docs/a/markdown/file.md"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"**/docs/**"},
-			inputs:       []string{"docs/hello.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**/docs/**"},
-			inputs:       []string{"dir/docs/my-file.txt"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**/docs/**"},
-			inputs:       []string{"space/docs/plan/space.doc"},
+			inputs:       [][]string{{"docs/hello.md"}, {"dir/docs/my-file.txt"}, {"space/docs/plan/space.doc"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"**/README.md"},
-			inputs:       []string{"README.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**/README.md"},
-			inputs:       []string{"js/README.md"},
+			inputs:       [][]string{{"README.md"}, {"js/README.md"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"**/*src/**"},
-			inputs:       []string{"a/src/app.js"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**/*src/**"},
-			inputs:       []string{"my-src/code/js/app.js"},
+			inputs:       [][]string{{"a/src/app.js"}, {"my-src/code/js/app.js"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"**/*-post.md"},
-			inputs:       []string{"my-post.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**/*-post.md"},
-			inputs:       []string{"path/their-post.md"},
+			inputs:       [][]string{{"my-post.md"}, {"path/their-post.md"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"**/migrate-*.sql"},
-			inputs:       []string{"migrate-10909.sql"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**/migrate-*.sql"},
-			inputs:       []string{"db/migrate-v1.0.sql"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"**/migrate-*.sql"},
-			inputs:       []string{"db/sept/migrate-v1.sql"},
+			inputs:       [][]string{{"migrate-10909.sql"}, {"db/migrate-v1.0.sql"}, {"db/sept/migrate-v1.sql"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"*.md", "!README.md"},
-			inputs:       []string{"hello.md"},
+			inputs:       [][]string{{"hello.md"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"*.md", "!README.md"},
-			inputs:       []string{"README.md"},
-			skipResult:   true,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*.md", "!README.md"},
-			inputs:       []string{"docs/hello.md"},
+			inputs:       [][]string{{"README.md"}, {"docs/hello.md"}},
 			skipResult:   true,
 			filterResult: true,
 		},
 		{
 			patterns:     []string{"*.md", "!README.md", "README*"},
-			inputs:       []string{"hello.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*.md", "!README.md", "README*"},
-			inputs:       []string{"README.md"},
-			skipResult:   false,
-			filterResult: true,
-		},
-		{
-			patterns:     []string{"*.md", "!README.md", "README*"},
-			inputs:       []string{"README.doc"},
+			inputs:       [][]string{{"hello.md"}, {"README.md"}, {"README.doc"}},
 			skipResult:   false,
 			filterResult: true,
 		},
 	}
 
 	for _, kase := range kases {
-		msg := fmt.Sprintf("patterns=%s, input=%s", strings.Join(kase.patterns, ","), strings.Join(kase.inputs, ","))
-		patterns, err := CompilePatterns(kase.patterns...)
-		assert.NoError(t, err, "compile error: %s", msg)
-		assert.Equal(t, kase.skipResult, Skip(patterns, kase.inputs), "unexpected skip result: %s", msg)
-		assert.Equal(t, kase.filterResult, Filter(patterns, kase.inputs), "unexpected filter result: %s", msg)
+		for _, inputs := range kase.inputs {
+			msg := fmt.Sprintf("patterns=%s, input=%s", strings.Join(kase.patterns, ","), strings.Join(inputs, ","))
+			patterns, err := CompilePatterns(kase.patterns...)
+			assert.NoError(t, err, "compile error: %s", msg)
+			assert.Equal(t, kase.skipResult, Skip(patterns, inputs), "unexpected skip result: %s", msg)
+			assert.Equal(t, kase.filterResult, Filter(patterns, inputs), "unexpected filter result: %s", msg)
+		}
 	}
 }

modules/actions/workflows_test.go

@@ -281,6 +281,24 @@ func TestDetectMatched(t *testing.T) {
 }
 
 func TestMatchIssuesEvent(t *testing.T) {
+	labelChangesPayload := func() *api.IssuePayload {
+		return &api.IssuePayload{
+			Action: api.HookIssueLabelUpdated,
+			Issue: &api.Issue{
+				Labels: []*api.Label{
+					{ID: 789, Name: "new-label"},
+				},
+			},
+			Changes: &api.ChangesPayload{
+				AddedLabels: []*api.Label{
+					{ID: 789, Name: "new-label"},
+				},
+				RemovedLabels: []*api.Label{
+					{ID: 123, Name: "deleted-label"},
+				},
+			},
+		}
+	}
 	testCases := []struct {
 		desc      string
 		payload   *api.IssuePayload
@@ -358,67 +376,22 @@ func TestMatchIssuesEvent(t *testing.T) {
 			eventType: "unlabeled",
 		},
 		{
-			desc: "Both adding and removing labels should trigger labeled event",
-			payload: &api.IssuePayload{
-				Action: api.HookIssueLabelUpdated,
-				Issue: &api.Issue{
-					Labels: []*api.Label{
-						{ID: 789, Name: "new-label"},
-					},
-				},
-				Changes: &api.ChangesPayload{
-					AddedLabels: []*api.Label{
-						{ID: 789, Name: "new-label"},
-					},
-					RemovedLabels: []*api.Label{
-						{ID: 123, Name: "deleted-label"},
-					},
-				},
-			},
+			desc:      "Both adding and removing labels should trigger labeled event",
+			payload:   labelChangesPayload(),
 			yamlOn:    "on:\n  issues:\n    types: [labeled]",
 			expected:  true,
 			eventType: "labeled",
 		},
 		{
-			desc: "Both adding and removing labels should trigger unlabeled event",
-			payload: &api.IssuePayload{
-				Action: api.HookIssueLabelUpdated,
-				Issue: &api.Issue{
-					Labels: []*api.Label{
-						{ID: 789, Name: "new-label"},
-					},
-				},
-				Changes: &api.ChangesPayload{
-					AddedLabels: []*api.Label{
-						{ID: 789, Name: "new-label"},
-					},
-					RemovedLabels: []*api.Label{
-						{ID: 123, Name: "deleted-label"},
-					},
-				},
-			},
+			desc:      "Both adding and removing labels should trigger unlabeled event",
+			payload:   labelChangesPayload(),
 			yamlOn:    "on:\n  issues:\n    types: [unlabeled]",
 			expected:  true,
 			eventType: "unlabeled",
 		},
 		{
-			desc: "Both adding and removing labels should trigger both events",
-			payload: &api.IssuePayload{
-				Action: api.HookIssueLabelUpdated,
-				Issue: &api.Issue{
-					Labels: []*api.Label{
-						{ID: 789, Name: "new-label"},
-					},
-				},
-				Changes: &api.ChangesPayload{
-					AddedLabels: []*api.Label{
-						{ID: 789, Name: "new-label"},
-					},
-					RemovedLabels: []*api.Label{
-						{ID: 123, Name: "deleted-label"},
-					},
-				},
-			},
+			desc:      "Both adding and removing labels should trigger both events",
+			payload:   labelChangesPayload(),
 			yamlOn:    "on:\n  issues:\n    types: [labeled, unlabeled]",
 			expected:  true,
 			eventType: "multiple",