Skip to content

Commit fe07640

Browse files
committed
(CAT01435) Address outdated code
Was unable to find much that needed to be updated with the majority of the outdated code references existing within the legacy fact tests.
1 parent 96916a4 commit fe07640

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

spec/unit/puppet-lint/plugins/check_classes/variable_scope_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,11 @@ class foo() {
239239
end
240240
end
241241

242-
context 'support the use of facts and trusted facts for Puppet 3.5 onwards' do
242+
context 'support the use of facts and trusted facts' do
243243
let(:code) do
244244
<<-END
245245
class foo() {
246-
if $facts['osfamily'] == 'redhat' or $trusted['osfamily'] == 'redhat' {
246+
if $facts['os']['family'] == 'redhat' or $trusted['os']['family'] == 'redhat' {
247247
$redhat = true
248248
}
249249
}

spec/unit/puppet-lint/plugins/check_whitespace/arrow_alignment_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ class { 'some_class':
477477
context 'where the top level of the block has no parameters' do
478478
let(:code) do
479479
<<-END
480-
case $::osfamily {
480+
case $facts['os']['family'] {
481481
'RedHat': {
482482
$datadir = $::operatingsystem ? {
483483
'Amazon' => pick($datadir, 'value'),

spec/unit/puppet-lint/plugins/legacy_facts/legacy_facts_spec.rb

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,79 +29,79 @@
2929
context "fact variable using legacy $facts['osfamily']" do
3030
let(:code) { "$facts['osfamily']" }
3131

32-
it 'onlies detect a single problem' do
32+
it 'only detect a single problem' do
3333
expect(problems.size).to eq(1)
3434
end
3535
end
3636

3737
context 'fact variable using legacy $::osfamily' do
3838
let(:code) { '$::osfamily' }
3939

40-
it 'onlies detect a single problem' do
40+
it 'only detect a single problem' do
4141
expect(problems.size).to eq(1)
4242
end
4343
end
4444

4545
context 'fact variable using legacy $::blockdevice_sda_model' do
4646
let(:code) { '$::blockdevice_sda_model' }
4747

48-
it 'onlies detect a single problem' do
48+
it 'only detect a single problem' do
4949
expect(problems.size).to eq(1)
5050
end
5151
end
5252

5353
context "fact variable using legacy $facts['ipaddress6_em2']" do
5454
let(:code) { "$facts['ipaddress6_em2']" }
5555

56-
it 'onlies detect a single problem' do
56+
it 'only detect a single problem' do
5757
expect(problems.size).to eq(1)
5858
end
5959
end
6060

6161
context 'fact variable using legacy $::zone_foobar_uuid' do
6262
let(:code) { '$::zone_foobar_uuid' }
6363

64-
it 'onlies detect a single problem' do
64+
it 'only detect a single problem' do
6565
expect(problems.size).to eq(1)
6666
end
6767
end
6868

6969
context 'fact variable using legacy $::processor314' do
7070
let(:code) { '$::processor314' }
7171

72-
it 'onlies detect a single problem' do
72+
it 'only detect a single problem' do
7373
expect(problems.size).to eq(1)
7474
end
7575
end
7676

7777
context 'fact variable using legacy $::sp_l3_cache' do
7878
let(:code) { '$::sp_l3_cache' }
7979

80-
it 'onlies detect a single problem' do
80+
it 'only detect a single problem' do
8181
expect(problems.size).to eq(1)
8282
end
8383
end
8484

8585
context 'fact variable using legacy $::sshrsakey' do
8686
let(:code) { '$::sshrsakey' }
8787

88-
it 'onlies detect a single problem' do
88+
it 'only detect a single problem' do
8989
expect(problems.size).to eq(1)
9090
end
9191
end
9292

9393
context 'fact variable in interpolated string "${::osfamily}"' do
9494
let(:code) { '"start ${::osfamily} end"' }
9595

96-
it 'onlies detect a single problem' do
96+
it 'only detect a single problem' do
9797
expect(problems.size).to eq(1)
9898
end
9999
end
100100

101101
context 'fact variable using legacy variable in double quotes "$::osfamily"' do
102102
let(:code) { '"$::osfamily"' }
103103

104-
it 'onlies detect a single problem' do
104+
it 'only detect a single problem' do
105105
expect(problems.size).to eq(1)
106106
end
107107
end
@@ -168,7 +168,7 @@
168168
let(:code) { "$facts['osfamily']" }
169169
let(:msg) { "legacy fact 'osfamily'" }
170170

171-
it 'onlies detect a single problem' do
171+
it 'only detect a single problem' do
172172
expect(problems.size).to eq(1)
173173
end
174174

@@ -210,7 +210,7 @@
210210
let(:code) { '$::osfamily' }
211211
let(:msg) { "legacy fact 'osfamily'" }
212212

213-
it 'onlies detect a single problem' do
213+
it 'only detect a single problem' do
214214
expect(problems.size).to eq(1)
215215
end
216216

@@ -227,7 +227,7 @@
227227
let(:code) { '$::sshrsakey' }
228228
let(:msg) { "legacy fact 'sshrsakey'" }
229229

230-
it 'onlies detect a single problem' do
230+
it 'only detect a single problem' do
231231
expect(problems.size).to eq(1)
232232
end
233233

@@ -243,7 +243,7 @@
243243
context 'fact variable using legacy $::memoryfree_mb' do
244244
let(:code) { '$::memoryfree_mb' }
245245

246-
it 'onlies detect a single problem' do
246+
it 'only detect a single problem' do
247247
expect(problems.size).to eq(1)
248248
end
249249

@@ -255,7 +255,7 @@
255255
context 'fact variable using legacy $::blockdevice_sda_model' do
256256
let(:code) { '$::blockdevice_sda_model' }
257257

258-
it 'onlies detect a single problem' do
258+
it 'only detect a single problem' do
259259
expect(problems.size).to eq(1)
260260
end
261261

@@ -267,7 +267,7 @@
267267
context "fact variable using legacy $facts['ipaddress6_em2']" do
268268
let(:code) { "$facts['ipaddress6_em2']" }
269269

270-
it 'onlies detect a single problem' do
270+
it 'only detect a single problem' do
271271
expect(problems.size).to eq(1)
272272
end
273273

@@ -279,7 +279,7 @@
279279
context 'fact variable using legacy $::zone_foobar_uuid' do
280280
let(:code) { '$::zone_foobar_uuid' }
281281

282-
it 'onlies detect a single problem' do
282+
it 'only detect a single problem' do
283283
expect(problems.size).to eq(1)
284284
end
285285

@@ -291,7 +291,7 @@
291291
context 'fact variable using legacy $::processor314' do
292292
let(:code) { '$::processor314' }
293293

294-
it 'onlies detect a single problem' do
294+
it 'only detect a single problem' do
295295
expect(problems.size).to eq(1)
296296
end
297297

@@ -303,7 +303,7 @@
303303
context 'fact variable using legacy $::sp_l3_cache' do
304304
let(:code) { '$::sp_l3_cache' }
305305

306-
it 'onlies detect a single problem' do
306+
it 'only detect a single problem' do
307307
expect(problems.size).to eq(1)
308308
end
309309

@@ -315,7 +315,7 @@
315315
context 'fact variable using legacy $::sshrsakey' do
316316
let(:code) { '$::sshrsakey' }
317317

318-
it 'onlies detect a single problem' do
318+
it 'only detect a single problem' do
319319
expect(problems.size).to eq(1)
320320
end
321321

@@ -327,7 +327,7 @@
327327
context 'fact variable in interpolated string "${::osfamily}"' do
328328
let(:code) { '"start ${::osfamily} end"' }
329329

330-
it 'onlies detect a single problem' do
330+
it 'only detect a single problem' do
331331
expect(problems.size).to eq(1)
332332
end
333333

@@ -339,7 +339,7 @@
339339
context 'fact variable using legacy variable in double quotes "$::osfamily"' do
340340
let(:code) { '"$::osfamily"' }
341341

342-
it 'onlies detect a single problem' do
342+
it 'only detect a single problem' do
343343
expect(problems.size).to eq(1)
344344
end
345345

@@ -351,7 +351,7 @@
351351
context 'fact variable using legacy variable in double quotes "$::gid"' do
352352
let(:code) { '"$::gid"' }
353353

354-
it 'onlies detect a single problem' do
354+
it 'only detect a single problem' do
355355
expect(problems.size).to eq(1)
356356
end
357357

@@ -363,7 +363,7 @@
363363
context 'fact variable using legacy variable in double quotes "$::id"' do
364364
let(:code) { '"$::id"' }
365365

366-
it 'onlies detect a single problem' do
366+
it 'only detect a single problem' do
367367
expect(problems.size).to eq(1)
368368
end
369369

@@ -375,7 +375,7 @@
375375
context 'fact variable using legacy variable in double quotes "$::lsbdistcodename"' do
376376
let(:code) { '"$::lsbdistcodename"' }
377377

378-
it 'onlies detect a single problem' do
378+
it 'only detect a single problem' do
379379
expect(problems.size).to eq(1)
380380
end
381381

@@ -387,7 +387,7 @@
387387
context 'fact variable using legacy variable in double quotes "$::lsbdistdescription"' do
388388
let(:code) { '"$::lsbdistdescription"' }
389389

390-
it 'onlies detect a single problem' do
390+
it 'only detect a single problem' do
391391
expect(problems.size).to eq(1)
392392
end
393393

@@ -399,7 +399,7 @@
399399
context 'fact variable using legacy variable in double quotes "$::lsbdistid"' do
400400
let(:code) { '"$::lsbdistid"' }
401401

402-
it 'onlies detect a single problem' do
402+
it 'only detect a single problem' do
403403
expect(problems.size).to eq(1)
404404
end
405405

@@ -411,7 +411,7 @@
411411
context 'fact variable using legacy variable in double quotes "$::lsbdistrelease"' do
412412
let(:code) { '"$::lsbdistrelease"' }
413413

414-
it 'onlies detect a single problem' do
414+
it 'only detect a single problem' do
415415
expect(problems.size).to eq(1)
416416
end
417417

@@ -423,7 +423,7 @@
423423
context 'fact variable using legacy variable in double quotes "$::lsbmajdistrelease"' do
424424
let(:code) { '"$::lsbmajdistrelease"' }
425425

426-
it 'onlies detect a single problem' do
426+
it 'only detect a single problem' do
427427
expect(problems.size).to eq(1)
428428
end
429429

@@ -435,7 +435,7 @@
435435
context 'fact variable using legacy variable in double quotes "$::lsbminordistrelease"' do
436436
let(:code) { '"$::lsbminordistrelease"' }
437437

438-
it 'onlies detect a single problem' do
438+
it 'only detect a single problem' do
439439
expect(problems.size).to eq(1)
440440
end
441441

@@ -447,7 +447,7 @@
447447
context 'fact variable using legacy variable in double quotes "$::lsbrelease"' do
448448
let(:code) { '"$::lsbrelease"' }
449449

450-
it 'onlies detect a single problem' do
450+
it 'only detect a single problem' do
451451
expect(problems.size).to eq(1)
452452
end
453453

@@ -459,7 +459,7 @@
459459
context "fact variable using facts hash in double quotes \"$facts['lsbrelease']\"" do
460460
let(:code) { "\"${facts['lsbrelease']}\"" }
461461

462-
it 'onlies detect a single problem' do
462+
it 'only detect a single problem' do
463463
expect(problems.size).to eq(1)
464464
end
465465

0 commit comments

Comments
 (0)