Skip to content

Commit 8b901ce

Browse files
author
jordanbreen28
committed
(maint) - Regenerate todo
1 parent 316d959 commit 8b901ce

File tree

7 files changed

+60
-55
lines changed

7 files changed

+60
-55
lines changed

‎.rubocop_todo.yml‎

Lines changed: 34 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2023-09-29 10:39:55 UTC using RuboCop version 1.56.4.
3+
# on 2023-10-03 14:14:01 UTC using RuboCop version 1.56.4.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
@@ -13,6 +13,11 @@ Lint/DuplicateBranch:
1313
- 'lib/rspec-puppet/matchers/compile.rb'
1414
- 'lib/rspec-puppet/matchers/run.rb'
1515

16+
# Offense count: 1
17+
Lint/DuplicateMethods:
18+
Exclude:
19+
- 'lib/rspec-puppet/adapters.rb'
20+
1621
# Offense count: 2
1722
# Configuration parameters: AllowComments, AllowEmptyLambdas.
1823
Lint/EmptyBlock:
@@ -59,48 +64,48 @@ Lint/UselessAssignment:
5964
- 'lib/rspec-puppet/matchers/create_generic.rb'
6065
- 'lib/rspec-puppet/monkey_patches.rb'
6166

62-
# Offense count: 29
67+
# Offense count: 27
6368
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
6469
Metrics/AbcSize:
65-
Max: 47
70+
Max: 59
6671

6772
# Offense count: 7
6873
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
6974
# AllowedMethods: refine
7075
Metrics/BlockLength:
7176
Max: 111
7277

73-
# Offense count: 3
78+
# Offense count: 1
7479
# Configuration parameters: CountBlocks.
7580
Metrics/BlockNesting:
7681
Max: 4
7782

78-
# Offense count: 5
83+
# Offense count: 6
7984
# Configuration parameters: CountComments, CountAsOne.
8085
Metrics/ClassLength:
8186
Max: 297
8287

83-
# Offense count: 19
88+
# Offense count: 18
8489
# Configuration parameters: AllowedMethods, AllowedPatterns.
8590
Metrics/CyclomaticComplexity:
8691
Max: 18
8792

88-
# Offense count: 53
93+
# Offense count: 47
8994
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
9095
Metrics/MethodLength:
91-
Max: 37
96+
Max: 53
9297

9398
# Offense count: 2
9499
# Configuration parameters: CountComments, CountAsOne.
95100
Metrics/ModuleLength:
96-
Max: 422
101+
Max: 383
97102

98103
# Offense count: 2
99104
# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
100105
Metrics/ParameterLists:
101106
Max: 9
102107

103-
# Offense count: 14
108+
# Offense count: 13
104109
# Configuration parameters: AllowedMethods, AllowedPatterns.
105110
Metrics/PerceivedComplexity:
106111
Max: 20
@@ -181,7 +186,7 @@ RSpec/BeforeAfterAll:
181186
- '**/spec/support/**/*.rb'
182187
- 'spec/unit/coverage_spec.rb'
183188

184-
# Offense count: 76
189+
# Offense count: 74
185190
# Configuration parameters: Prefixes, AllowedPatterns.
186191
# Prefixes: when, with, without
187192
RSpec/ContextWording:
@@ -192,31 +197,16 @@ RSpec/ContextWording:
192197
RSpec/DescribeClass:
193198
Enabled: false
194199

195-
# Offense count: 25
200+
# Offense count: 23
196201
# Configuration parameters: CountAsOne.
197202
RSpec/ExampleLength:
198203
Max: 12
199204

200-
# Offense count: 15
205+
# Offense count: 16
201206
# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
202207
# Include: **/*_spec*rb*, **/spec/**/*
203208
RSpec/FilePath:
204-
Exclude:
205-
- 'spec/cache_spec.rb'
206-
- 'spec/classes/test_multi_os.rb'
207-
- 'spec/raw_string_spec.rb'
208-
- 'spec/support_spec.rb'
209-
- 'spec/unit/coverage_spec.rb'
210-
- 'spec/unit/example/function_example_group_spec.rb'
211-
- 'spec/unit/facter_impl_spec.rb'
212-
- 'spec/unit/matchers/allow_value_spec.rb'
213-
- 'spec/unit/matchers/count_generic_spec.rb'
214-
- 'spec/unit/matchers/parameter_matcher_spec.rb'
215-
- 'spec/unit/matchers/raise_error_spec.rb'
216-
- 'spec/unit/matchers/run_spec.rb'
217-
- 'spec/unit/monkey_patches/win32/taskscheduler_spec.rb'
218-
- 'spec/unit/raw_string_spec.rb'
219-
- 'spec/unit/sensitive_spec.rb'
209+
Enabled: false
220210

221211
# Offense count: 2
222212
RSpec/ImplicitBlockExpectation:
@@ -234,7 +224,7 @@ RSpec/InstanceVariable:
234224
- 'spec/types/cleanup_spec.rb'
235225
- 'spec/unit/coverage_spec.rb'
236226

237-
# Offense count: 11
227+
# Offense count: 10
238228
# Configuration parameters: .
239229
# SupportedStyles: have_received, receive
240230
RSpec/MessageSpies:
@@ -248,10 +238,10 @@ RSpec/MultipleDescribes:
248238
- 'spec/classes/sysctl_common_spec.rb'
249239
- 'spec/defines/sysctl_before_spec.rb'
250240
- 'spec/functions/test_function_spec.rb'
251-
- 'spec/unit/adapters_spec.rb'
241+
- 'spec/unit/example/function_example_group_spec.rb'
252242
- 'spec/unit/monkey_patches_spec.rb'
253243

254-
# Offense count: 46
244+
# Offense count: 45
255245
RSpec/MultipleExpectations:
256246
Max: 8
257247

@@ -260,13 +250,13 @@ RSpec/MultipleExpectations:
260250
RSpec/MultipleMemoizedHelpers:
261251
Max: 7
262252

263-
# Offense count: 284
253+
# Offense count: 263
264254
# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
265255
# SupportedStyles: always, named_only
266256
RSpec/NamedSubject:
267257
Enabled: false
268258

269-
# Offense count: 20
259+
# Offense count: 26
270260
# Configuration parameters: AllowedGroups.
271261
RSpec/NestedGroups:
272262
Max: 5
@@ -291,14 +281,15 @@ RSpec/RepeatedExample:
291281
Exclude:
292282
- 'spec/types/valid_provider_spec.rb'
293283

294-
# Offense count: 7
284+
# Offense count: 9
295285
RSpec/RepeatedExampleGroupDescription:
296286
Exclude:
297287
- 'spec/classes/facts_spec.rb'
298288
- 'spec/classes/sysctl_common_spec.rb'
299289
- 'spec/defines/sysctl_before_spec.rb'
290+
- 'spec/unit/adapters_spec.rb'
300291

301-
# Offense count: 14
292+
# Offense count: 15
302293
# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
303294
# Include: **/*_spec.rb
304295
RSpec/SpecFilePathFormat:
@@ -307,10 +298,11 @@ RSpec/SpecFilePathFormat:
307298
- 'spec/cache_spec.rb'
308299
- 'spec/raw_string_spec.rb'
309300
- 'spec/support_spec.rb'
301+
- 'spec/unit/adapters_spec.rb'
310302
- 'spec/unit/coverage_spec.rb'
311-
- 'spec/unit/example/function_example_group_spec.rb'
312303
- 'spec/unit/facter_impl_spec.rb'
313304
- 'spec/unit/matchers/allow_value_spec.rb'
305+
- 'spec/unit/matchers/compile_spec.rb'
314306
- 'spec/unit/matchers/count_generic_spec.rb'
315307
- 'spec/unit/matchers/parameter_matcher_spec.rb'
316308
- 'spec/unit/matchers/raise_error_spec.rb'
@@ -326,22 +318,15 @@ RSpec/SpecFilePathSuffix:
326318
Exclude:
327319
- 'spec/classes/test_multi_os.rb'
328320

329-
# Offense count: 3
321+
# Offense count: 2
330322
RSpec/SubjectStub:
331323
Exclude:
332-
- 'spec/unit/adapters_spec.rb'
333324
- 'spec/unit/coverage_spec.rb'
334325

335-
# Offense count: 1
336-
RSpec/UnspecifiedException:
337-
Exclude:
338-
- 'spec/support_spec.rb'
339-
340-
# Offense count: 16
326+
# Offense count: 7
341327
# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
342328
RSpec/VerifiedDoubles:
343329
Exclude:
344-
- 'spec/spec_helper_unit.rb'
345330
- 'spec/unit/adapters_spec.rb'
346331
- 'spec/unit/example/function_example_group_spec.rb'
347332
- 'spec/unit/matchers/allow_value_spec.rb'
@@ -365,7 +350,7 @@ Style/CombinableLoops:
365350
Exclude:
366351
- 'spec/classes/catalogue_cache_spec.rb'
367352

368-
# Offense count: 65
353+
# Offense count: 55
369354
# Configuration parameters: AllowedConstants.
370355
Style/Documentation:
371356
Enabled: false
@@ -378,15 +363,14 @@ Style/FormatString:
378363
Exclude:
379364
- 'lib/rspec-puppet/coverage.rb'
380365

381-
# Offense count: 15
366+
# Offense count: 14
382367
# This cop supports safe autocorrection (--autocorrect).
383368
Style/IfUnlessModifier:
384369
Exclude:
385370
- 'lib/rspec-puppet/adapters.rb'
386371
- 'lib/rspec-puppet/coverage.rb'
387372
- 'lib/rspec-puppet/example/function_example_group.rb'
388373
- 'lib/rspec-puppet/matchers/create_generic.rb'
389-
- 'lib/rspec-puppet/monkey_patches.rb'
390374
- 'lib/rspec-puppet/support.rb'
391375

392376
# Offense count: 5
@@ -424,7 +408,7 @@ Style/StringConcatenation:
424408
- 'lib/rspec-puppet/matchers/compile.rb'
425409
- 'lib/rspec-puppet/support.rb'
426410

427-
# Offense count: 28
411+
# Offense count: 25
428412
# This cop supports safe autocorrection (--autocorrect).
429413
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
430414
# URISchemes: http, https

‎lib/rspec-puppet/adapters.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def setup_puppet(example_group)
101101
{
102102
environments: loader,
103103
current_environment: env,
104-
loaders: (Puppet::Pops::Loaders.new(env))
104+
loaders: Puppet::Pops::Loaders.new(env)
105105
},
106106
'Setup rspec-puppet environments'
107107
)

‎lib/rspec-puppet/example/function_example_group.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def find_function(function_name = self.class.top_level_description)
9393
loaders = Puppet.lookup(:loaders)
9494
Puppet.override(context_overrides, 'rspec-test scope') do
9595
func = V4FunctionWrapper.new(function_name,
96-
loaders.private_environment_loader.load(:function, function_name), context_overrides)
96+
loaders.private_environment_loader.load(:function, function_name), context_overrides)
9797
@scope = context_overrides[:global_scope]
9898
end
9999

@@ -175,7 +175,7 @@ def build_compiler
175175
compiler
176176
end
177177

178-
def build_scope(compiler, node_name)
178+
def build_scope(compiler, _node_name)
179179
compiler.context_overrides[:global_scope]
180180
end
181181

‎lib/rspec-puppet/monkey_patches.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ class Pops::Lookup::ModuleDataProvider
284284
unless mod
285285
raise Puppet::DataBinding::LookupError,
286286
format(_("Environment '%<env>s', cannot find module '%<module_name>s'"), env: env.name,
287-
module_name: module_name)
287+
module_name: module_name)
288288
end
289289

290290
return Pathname.new(mod.hiera_conf_file)

‎spec/unit/adapters_spec.rb‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ def context_double(options = {})
88
end
99

1010
describe RSpec::Puppet::Adapters::Base do
11+
let(:test_context) { double environment: 'rp_env' }
1112
describe '#setup_puppet' do
1213
it 'sets up all settings listed in the settings map' do
1314
context = context_double
@@ -31,6 +32,25 @@ def context_double(options = {})
3132
end
3233
end
3334

35+
it 'sets Puppet[:strict_variables] to false by default' do
36+
subject.setup_puppet(test_context)
37+
# strict variables enabled by default in puppet 8.x +
38+
setting = Puppet::Util::Package.versioncmp(Puppet.version, '8.0.0') >= 0
39+
expect(Puppet[:strict_variables]).to be(setting)
40+
end
41+
42+
it 'reads the :strict_variables setting' do
43+
allow(test_context).to receive(:strict_variables).and_return true
44+
subject.setup_puppet(test_context)
45+
expect(Puppet[:strict_variables]).to be(true)
46+
end
47+
48+
it 'overrides the environmentpath set by Puppet::Test::TestHelper' do
49+
allow(test_context).to receive(:environmentpath).and_return('/path/to/my/environments')
50+
subject.setup_puppet(test_context)
51+
expect(Puppet[:environmentpath]).to match(%r{(C:)?/path/to/my/environments})
52+
end
53+
3454
describe '#set_setting' do
3555
describe 'with a context specific setting' do
3656
it 'sets the Puppet setting based on the example group setting' do

‎spec/unit/example/function_example_group_spec.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
describe 'when calling with params' do
1212
subject { described_class.new(name, func, overrides) }
13+
1314
it do
1415
expect(func).to receive(:call).with(global_scope, 1, 2).once
1516
subject.call({}, 1, 2)
@@ -18,6 +19,7 @@
1819

1920
describe 'when executing with params' do
2021
subject { described_class.new(name, func, overrides) }
22+
2123
it do
2224
expect(func).to receive(:call).with(global_scope, 1, 2).once
2325
subject.execute(1, 2)

‎spec/unit/matchers/compile_spec.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177

178178
before { subject.and_raise_error(expected_error) }
179179

180-
let(:error_detail) { 'failure (line: 52, column: 1)' }
181180
it('matches') { is_expected.to be_matches catalogue }
182181

183182
it {

0 commit comments

Comments
 (0)