File tree Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -24,17 +24,13 @@ func (v Validator) Validate(cfg *config.Config) error {
24
24
return err
25
25
}
26
26
27
- return v .validateEnabledDisabledLintersConfig (& cfg .Linters )
28
- }
29
-
30
- func (v Validator ) validateEnabledDisabledLintersConfig (cfg * config.Linters ) error {
31
27
validators := []func (cfg * config.Linters ) error {
32
28
v .validateLintersNames ,
33
29
v .validatePresets ,
34
30
}
35
31
36
32
for _ , v := range validators {
37
- if err := v (cfg ); err != nil {
33
+ if err := v (& cfg . Linters ); err != nil {
38
34
return err
39
35
}
40
36
}
Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ var validatePresetsTestCases = []validatorTestCase{
106
106
},
107
107
}
108
108
109
- func TestValidator_validateEnabledDisabledLintersConfig (t * testing.T ) {
109
+ func TestValidator_Validate (t * testing.T ) {
110
110
m , err := NewManager (nil , nil , NewLinterBuilder ())
111
111
require .NoError (t , err )
112
112
@@ -121,13 +121,13 @@ func TestValidator_validateEnabledDisabledLintersConfig(t *testing.T) {
121
121
t .Run (test .desc , func (t * testing.T ) {
122
122
t .Parallel ()
123
123
124
- err := v .validateEnabledDisabledLintersConfig ( test .cfg )
124
+ err := v .Validate ( & config. Config { Linters : * test .cfg } )
125
125
require .NoError (t , err )
126
126
})
127
127
}
128
128
}
129
129
130
- func TestValidator_validateEnabledDisabledLintersConfig_error (t * testing.T ) {
130
+ func TestValidator_Validate_error (t * testing.T ) {
131
131
m , err := NewManager (nil , nil , NewLinterBuilder ())
132
132
require .NoError (t , err )
133
133
@@ -142,7 +142,7 @@ func TestValidator_validateEnabledDisabledLintersConfig_error(t *testing.T) {
142
142
t .Run (test .desc , func (t * testing.T ) {
143
143
t .Parallel ()
144
144
145
- err := v .validateEnabledDisabledLintersConfig ( test .cfg )
145
+ err := v .Validate ( & config. Config { Linters : * test .cfg } )
146
146
require .Error (t , err )
147
147
148
148
require .EqualError (t , err , test .expected )
You can’t perform that action at this time.
0 commit comments