Skip to content

Add SuperprojectType field to check configuration #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 21, 2020
Merged

Add SuperprojectType field to check configuration #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54b76a8
Use dedicated project type comparison method to determine check run
per1234 Dec 18, 2020
308020e
Add SuperprojectType field to check configuration
per1234 Dec 18, 2020
940bad4
Use check configuration superproject type field to skip subprojects
per1234 Dec 18, 2020
95701c0
Only require official prefix on standalone library names
per1234 Dec 18, 2020
92f626f
Don't run Library Manager-specific checks on bundled libraries
per1234 Dec 18, 2020
5c621be
Disable Library Manager-specific checks for subprojects
per1234 Dec 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/rule/rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func Runner(project project.Type) {
func shouldRun(ruleConfiguration ruleconfiguration.Type, currentProject project.Type) (bool, error) {
configurationRuleModes := configuration.RuleModes(currentProject.SuperprojectType)

if ruleConfiguration.ProjectType != currentProject.ProjectType {
if !(ruleConfiguration.ProjectType.Matches(currentProject.ProjectType) && ruleConfiguration.SuperprojectType.Matches(currentProject.SuperprojectType)) {
return false, nil
}

Expand Down
29 changes: 17 additions & 12 deletions internal/rule/rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,25 @@ func Test_shouldRun(t *testing.T) {
testTables := []struct {
testName string
ruleProjectType projecttype.Type
ruleSuperprojectType projecttype.Type
projectType projecttype.Type
superprojectType projecttype.Type
disableModes []rulemode.Type
enableModes []rulemode.Type
libraryManagerSetting string
complianceSetting string
shouldRunAssertion assert.BoolAssertionFunc
errorAssertion assert.ErrorAssertionFunc
}{
{"Project type mismatch", projecttype.Library, projecttype.Sketch, []rulemode.Type{}, []rulemode.Type{}, "false", "specification", assert.False, assert.NoError},
{"Disable mode match", projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.LibraryManagerSubmission}, []rulemode.Type{}, "submit", "specification", assert.False, assert.NoError},
{"Enable mode match", projecttype.Library, projecttype.Library, []rulemode.Type{}, []rulemode.Type{rulemode.LibraryManagerSubmission}, "submit", "specification", assert.True, assert.NoError},
{"Disable mode default", projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.Default}, []rulemode.Type{rulemode.LibraryManagerSubmission}, "update", "specification", assert.False, assert.NoError},
{"Disable mode default override", projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.Default}, []rulemode.Type{rulemode.LibraryManagerSubmission}, "submit", "specification", assert.True, assert.NoError},
{"Enable mode default", projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.LibraryManagerSubmission}, []rulemode.Type{rulemode.Default}, "update", "specification", assert.True, assert.NoError},
{"Enable mode default override", projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.LibraryManagerSubmission}, []rulemode.Type{rulemode.Default}, "submit", "specification", assert.False, assert.NoError},
{"Unable to resolve", projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.LibraryManagerSubmission}, []rulemode.Type{rulemode.LibraryManagerIndexed}, "false", "specification", assert.False, assert.Error},
{"Project type mismatch", projecttype.Library, projecttype.All, projecttype.Sketch, projecttype.Sketch, []rulemode.Type{}, []rulemode.Type{}, "false", "specification", assert.False, assert.NoError},
{"Superproject type mismatch", projecttype.Sketch, projecttype.Library, projecttype.Sketch, projecttype.Sketch, []rulemode.Type{}, []rulemode.Type{}, "false", "specification", assert.False, assert.NoError},
{"Disable mode match", projecttype.Library, projecttype.All, projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.LibraryManagerSubmission}, []rulemode.Type{}, "submit", "specification", assert.False, assert.NoError},
{"Enable mode match", projecttype.Library, projecttype.All, projecttype.Library, projecttype.Library, []rulemode.Type{}, []rulemode.Type{rulemode.LibraryManagerSubmission}, "submit", "specification", assert.True, assert.NoError},
{"Disable mode default", projecttype.Library, projecttype.All, projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.Default}, []rulemode.Type{rulemode.LibraryManagerSubmission}, "update", "specification", assert.False, assert.NoError},
{"Disable mode default override", projecttype.Library, projecttype.All, projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.Default}, []rulemode.Type{rulemode.LibraryManagerSubmission}, "submit", "specification", assert.True, assert.NoError},
{"Enable mode default", projecttype.Library, projecttype.All, projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.LibraryManagerSubmission}, []rulemode.Type{rulemode.Default}, "update", "specification", assert.True, assert.NoError},
{"Enable mode default override", projecttype.Library, projecttype.All, projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.LibraryManagerSubmission}, []rulemode.Type{rulemode.Default}, "submit", "specification", assert.False, assert.NoError},
{"Unable to resolve", projecttype.Library, projecttype.All, projecttype.Library, projecttype.Library, []rulemode.Type{rulemode.LibraryManagerSubmission}, []rulemode.Type{rulemode.LibraryManagerIndexed}, "false", "specification", assert.False, assert.Error},
}

flags := test.ConfigurationFlags()
Expand All @@ -58,13 +61,15 @@ func Test_shouldRun(t *testing.T) {
configuration.Initialize(flags, []string{"/foo"})

ruleConfiguration := ruleconfiguration.Type{
ProjectType: testTable.ruleProjectType,
DisableModes: testTable.disableModes,
EnableModes: testTable.enableModes,
ProjectType: testTable.ruleProjectType,
SuperprojectType: testTable.ruleSuperprojectType,
DisableModes: testTable.disableModes,
EnableModes: testTable.enableModes,
}

project := project.Type{
ProjectType: testTable.projectType,
ProjectType: testTable.projectType,
SuperprojectType: testTable.superprojectType,
}
run, err := shouldRun(ruleConfiguration, project)
testTable.errorAssertion(t, err, testTable.testName)
Expand Down
Loading