-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace use of whitelist/blacklist with trigger/ignore (#196)
- Loading branch information
Showing
11 changed files
with
293 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| // Copyright 2020 Palantir Technologies, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package bulldozer | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestMarshalling(t *testing.T) { | ||
| t.Run("parseNewConfig", func(t *testing.T) { | ||
| cf := NewConfigFetcher("", []string{""}, nil) | ||
|
|
||
| config := ` | ||
| version: 1 | ||
| merge: | ||
| trigger: | ||
| labels: ["merge when ready"] | ||
| comment_substrings: ["==MERGE_WHEN_READY=="] | ||
| ignore: | ||
| labels: ["do not merge"] | ||
| comment_substrings: ["==DO_NOT_MERGE=="] | ||
| method: squash | ||
| options: | ||
| squash: | ||
| body: summarize_commits | ||
| delete_after_merge: true | ||
| update: | ||
| trigger: | ||
| labels: ["wip", "update me"] | ||
| ignore: | ||
| labels: ["do not update"] | ||
| ` | ||
|
|
||
| actual, err := cf.unmarshalConfig([]byte(config)) | ||
| require.Nil(t, err) | ||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"merge when ready"}, | ||
| CommentSubstrings: []string{"==MERGE_WHEN_READY=="}, | ||
| }, actual.Merge.Trigger) | ||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"do not merge"}, | ||
| CommentSubstrings: []string{"==DO_NOT_MERGE=="}, | ||
| }, actual.Merge.Ignore) | ||
| }) | ||
|
|
||
| t.Run("parseExisting", func(t *testing.T) { | ||
| cf := NewConfigFetcher("", []string{""}, nil) | ||
|
|
||
| config := ` | ||
| version: 1 | ||
| merge: | ||
| whitelist: | ||
| labels: ["merge when ready"] | ||
| comment_substrings: ["==OLD_MERGE_WHEN_READY=="] | ||
| blacklist: | ||
| labels: ["do not merge"] | ||
| comment_substrings: ["==OLD_DO_NOT_MERGE=="] | ||
| method: squash | ||
| options: | ||
| squash: | ||
| body: summarize_commits | ||
| delete_after_merge: true | ||
| update: | ||
| whitelist: | ||
| labels: ["wip", "update me"] | ||
| blacklist: | ||
| labels: ["do not update"] | ||
| ` | ||
|
|
||
| actual, err := cf.unmarshalConfig([]byte(config)) | ||
| require.Nil(t, err) | ||
|
|
||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"merge when ready"}, | ||
| CommentSubstrings: []string{"==OLD_MERGE_WHEN_READY=="}, | ||
| }, actual.Merge.Trigger) | ||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"do not merge"}, | ||
| CommentSubstrings: []string{"==OLD_DO_NOT_MERGE=="}, | ||
| }, actual.Merge.Ignore) | ||
|
|
||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"wip", "update me"}, | ||
| }, actual.Update.Trigger) | ||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"do not update"}, | ||
| }, actual.Update.Ignore) | ||
| }) | ||
|
|
||
| t.Run("ignoresOldConfig", func(t *testing.T) { | ||
| cf := NewConfigFetcher("", []string{""}, nil) | ||
|
|
||
| config := ` | ||
| version: 1 | ||
| merge: | ||
| trigger: | ||
| labels: ["mwr"] | ||
| ignore: | ||
| labels: ["new dnm"] | ||
| whitelist: | ||
| labels: ["merge when ready"] | ||
| comment_substrings: ["==OLD_MERGE_WHEN_READY=="] | ||
| blacklist: | ||
| labels: ["do not merge"] | ||
| comment_substrings: ["==OLD_DO_NOT_MERGE=="] | ||
| method: squash | ||
| options: | ||
| squash: | ||
| body: summarize_commits | ||
| delete_after_merge: true | ||
| update: | ||
| trigger: | ||
| labels: ["new wip"] | ||
| ignore: | ||
| labels: ["new dnu"] | ||
| whitelist: | ||
| labels: ["wip", "update me"] | ||
| blacklist: | ||
| labels: ["do not update"] | ||
| ` | ||
|
|
||
| actual, err := cf.unmarshalConfig([]byte(config)) | ||
| require.Nil(t, err) | ||
|
|
||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"mwr"}, | ||
| }, actual.Merge.Trigger) | ||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"new dnm"}, | ||
| }, actual.Merge.Ignore) | ||
|
|
||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"new wip"}, | ||
| }, actual.Update.Trigger) | ||
| assert.Equal(t, Signals{ | ||
| Labels: []string{"new dnu"}, | ||
| }, actual.Update.Ignore) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.