Skip to content

Commit 6d0dbeb

Browse files
b4ldrb4ldr
committed
Drop support for puppet 4.5
Support for puppet 4.5 was dropped from stdlib some time ago however the spec tests all include an if guard to prevent them running on puppet 4.5. As this is no longer required this PR cleans up theses guards
1 parent 6c3aa83 commit 6d0dbeb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1084
-1293
lines changed

‎spec/type_aliases/absolute_path_spec.rb‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
11
require 'spec_helper'
22

3-
if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
4-
describe 'Stdlib::Compat::Absolute_path' do
5-
describe 'valid paths handling' do
6-
['C:/', 'C:\\', 'C:\\WINDOWS\\System32', 'C:/windows/system32', 'X:/foo/bar', 'X:\\foo\\bar', '\\\\host\\windows', '//host/windows', '/', '/var/tmp', '/var/opt/../lib/puppet',
7-
'/var/opt//lib/puppet', '/var/ůťƒ8', '/var/ネット'].each do |value|
8-
describe value.inspect do
9-
it { is_expected.to allow_value(value) }
10-
end
3+
describe 'Stdlib::Compat::Absolute_path' do
4+
describe 'valid paths handling' do
5+
['C:/', 'C:\\', 'C:\\WINDOWS\\System32', 'C:/windows/system32', 'X:/foo/bar', 'X:\\foo\\bar', '\\\\host\\windows', '//host/windows', '/', '/var/tmp', '/var/opt/../lib/puppet',
6+
'/var/opt//lib/puppet', '/var/ůťƒ8', '/var/ネット'].each do |value|
7+
describe value.inspect do
8+
it { is_expected.to allow_value(value) }
119
end
1210
end
11+
end
1312

14-
describe 'invalid path handling' do
15-
context 'with garbage inputs' do
16-
[
17-
nil,
18-
[nil],
19-
[nil, nil],
20-
{ 'foo' => 'bar' },
21-
{},
22-
'',
23-
].each do |value|
24-
describe value.inspect do
25-
it { is_expected.not_to allow_value(value) }
26-
end
13+
describe 'invalid path handling' do
14+
context 'with garbage inputs' do
15+
[
16+
nil,
17+
[nil],
18+
[nil, nil],
19+
{ 'foo' => 'bar' },
20+
{},
21+
'',
22+
].each do |value|
23+
describe value.inspect do
24+
it { is_expected.not_to allow_value(value) }
2725
end
2826
end
27+
end
2928

30-
context 'with relative paths' do
31-
['relative1', '.', '..', './foo', '../foo', 'etc/puppetlabs/puppet', 'opt/puppet/bin', 'relative\\windows', '\\var\\ůťƒ8', '\\var\\ネット'].each do |value|
32-
describe value.inspect do
33-
it { is_expected.not_to allow_value(value) }
34-
end
29+
context 'with relative paths' do
30+
['relative1', '.', '..', './foo', '../foo', 'etc/puppetlabs/puppet', 'opt/puppet/bin', 'relative\\windows', '\\var\\ůťƒ8', '\\var\\ネット'].each do |value|
31+
describe value.inspect do
32+
it { is_expected.not_to allow_value(value) }
3533
end
3634
end
3735
end

‎spec/type_aliases/array_spec.rb‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
require 'spec_helper'
22

3-
if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
4-
describe 'Stdlib::Compat::Array' do
5-
describe 'accepts arrays' do
6-
[
7-
[],
8-
['one'],
9-
[1],
10-
[{}],
11-
[[]],
12-
].each do |value|
13-
describe value.inspect do
14-
it { is_expected.to allow_value(value) }
15-
end
3+
describe 'Stdlib::Compat::Array' do
4+
describe 'accepts arrays' do
5+
[
6+
[],
7+
['one'],
8+
[1],
9+
[{}],
10+
[[]],
11+
].each do |value|
12+
describe value.inspect do
13+
it { is_expected.to allow_value(value) }
1614
end
1715
end
16+
end
1817

19-
describe 'rejects other values' do
20-
[
21-
'',
22-
'one',
23-
'1',
24-
{},
25-
].each do |value|
26-
describe value.inspect do
27-
it { is_expected.not_to allow_value(value) }
28-
end
18+
describe 'rejects other values' do
19+
[
20+
'',
21+
'one',
22+
'1',
23+
{},
24+
].each do |value|
25+
describe value.inspect do
26+
it { is_expected.not_to allow_value(value) }
2927
end
3028
end
3129
end

‎spec/type_aliases/base32_spec.rb‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
11
require 'spec_helper'
22

3-
if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
4-
describe 'Stdlib::Base32' do
5-
describe 'valid handling' do
6-
['ASDASDDASD3453453', 'ASDASDDASD3453453=', 'ASDASDDASD3453453==', 'ASDASDDASD3453453===', 'ASDASDDASD3453453====', 'ASDASDDASD3453453=====', 'ASDASDDASD3453453======', 'asdasddasd3453453',
7-
'asdasddasd3453453=', 'asdasddasd3453453==', 'asdasddasd3453453===', 'asdasddasd3453453====', 'asdasddasd3453453=====', 'asdasddasd3453453======'].each do |value|
8-
describe value.inspect do
9-
it { is_expected.to allow_value(value) }
10-
end
3+
describe 'Stdlib::Base32' do
4+
describe 'valid handling' do
5+
['ASDASDDASD3453453', 'ASDASDDASD3453453=', 'ASDASDDASD3453453==', 'ASDASDDASD3453453===', 'ASDASDDASD3453453====', 'ASDASDDASD3453453=====', 'ASDASDDASD3453453======', 'asdasddasd3453453',
6+
'asdasddasd3453453=', 'asdasddasd3453453==', 'asdasddasd3453453===', 'asdasddasd3453453====', 'asdasddasd3453453=====', 'asdasddasd3453453======'].each do |value|
7+
describe value.inspect do
8+
it { is_expected.to allow_value(value) }
119
end
1210
end
11+
end
1312

14-
describe 'invalid path handling' do
15-
context 'garbage inputs' do
16-
[
17-
[nil],
18-
[nil, nil],
19-
{ 'foo' => 'bar' },
20-
{},
21-
"\nASDASDDASD3453453",
22-
"\nASDASDDASD3453453\n",
23-
"ASDASDDASD3453453\n",
24-
'',
25-
'asdasd!@#$',
26-
'=asdasd9879876876+/',
27-
'asda=sd9879876876+/',
28-
'asdaxsd9879876876+/===',
29-
'asdads asdasd',
30-
'asdasddasd3453453=======',
31-
'asdaSddasd',
32-
'asdasddasd1',
33-
'asdasddasd9',
34-
].each do |value|
35-
describe value.inspect do
36-
it { is_expected.not_to allow_value(value) }
37-
end
13+
describe 'invalid path handling' do
14+
context 'garbage inputs' do
15+
[
16+
[nil],
17+
[nil, nil],
18+
{ 'foo' => 'bar' },
19+
{},
20+
"\nASDASDDASD3453453",
21+
"\nASDASDDASD3453453\n",
22+
"ASDASDDASD3453453\n",
23+
'',
24+
'asdasd!@#$',
25+
'=asdasd9879876876+/',
26+
'asda=sd9879876876+/',
27+
'asdaxsd9879876876+/===',
28+
'asdads asdasd',
29+
'asdasddasd3453453=======',
30+
'asdaSddasd',
31+
'asdasddasd1',
32+
'asdasddasd9',
33+
].each do |value|
34+
describe value.inspect do
35+
it { is_expected.not_to allow_value(value) }
3836
end
3937
end
4038
end

‎spec/type_aliases/base64_spec.rb‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
require 'spec_helper'
22

3-
if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
4-
describe 'Stdlib::Base64' do
5-
describe 'valid handling' do
6-
['asdasdASDSADA342386832/746+=', 'asdasdASDSADA34238683274/6+', 'asdasdASDSADA3423868327/46+=='].each do |value|
7-
describe value.inspect do
8-
it { is_expected.to allow_value(value) }
9-
end
3+
describe 'Stdlib::Base64' do
4+
describe 'valid handling' do
5+
['asdasdASDSADA342386832/746+=', 'asdasdASDSADA34238683274/6+', 'asdasdASDSADA3423868327/46+=='].each do |value|
6+
describe value.inspect do
7+
it { is_expected.to allow_value(value) }
108
end
119
end
10+
end
1211

13-
describe 'invalid path handling' do
14-
context 'garbage inputs' do
15-
[
16-
[nil],
17-
[nil, nil],
18-
{ 'foo' => 'bar' },
19-
{},
20-
'',
21-
"\nasdasdASDSADA342386832/746+=",
22-
"\nasdasdASDSADA342386832/746+=\n",
23-
"asdasdASDSADA342386832/746+=\n",
24-
'asdasd!@#$',
25-
'=asdasd9879876876+/',
26-
'asda=sd9879876876+/',
27-
'asdaxsd9879876876+/===',
28-
'asdads asdasd',
29-
].each do |value|
30-
describe value.inspect do
31-
it { is_expected.not_to allow_value(value) }
32-
end
12+
describe 'invalid path handling' do
13+
context 'garbage inputs' do
14+
[
15+
[nil],
16+
[nil, nil],
17+
{ 'foo' => 'bar' },
18+
{},
19+
'',
20+
"\nasdasdASDSADA342386832/746+=",
21+
"\nasdasdASDSADA342386832/746+=\n",
22+
"asdasdASDSADA342386832/746+=\n",
23+
'asdasd!@#$',
24+
'=asdasd9879876876+/',
25+
'asda=sd9879876876+/',
26+
'asdaxsd9879876876+/===',
27+
'asdads asdasd',
28+
].each do |value|
29+
describe value.inspect do
30+
it { is_expected.not_to allow_value(value) }
3331
end
3432
end
3533
end

‎spec/type_aliases/bool_spec.rb‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
require 'spec_helper'
22

3-
if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
4-
describe 'Stdlib::Compat::Bool' do
5-
describe 'accepts booleans' do
6-
[
7-
true,
8-
false,
9-
].each do |value|
10-
describe value.inspect do
11-
it { is_expected.to allow_value(value) }
12-
end
3+
describe 'Stdlib::Compat::Bool' do
4+
describe 'accepts booleans' do
5+
[
6+
true,
7+
false,
8+
].each do |value|
9+
describe value.inspect do
10+
it { is_expected.to allow_value(value) }
1311
end
1412
end
13+
end
1514

16-
describe 'rejects other values' do
17-
[
18-
[1],
19-
[{}],
20-
[true],
21-
'true',
22-
'false',
23-
].each do |value|
24-
describe value.inspect do
25-
it { is_expected.not_to allow_value(value) }
26-
end
15+
describe 'rejects other values' do
16+
[
17+
[1],
18+
[{}],
19+
[true],
20+
'true',
21+
'false',
22+
].each do |value|
23+
describe value.inspect do
24+
it { is_expected.not_to allow_value(value) }
2725
end
2826
end
2927
end

‎spec/type_aliases/compat__ip_address.rb‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
11
require 'spec_helper'
22

3-
if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
4-
describe 'Stdlib::Compat::Ip_address' do
5-
describe 'accepts ipv4 and ipv6 addresses' do
6-
[
7-
'224.0.0.0',
8-
'255.255.255.255',
9-
'0.0.0.0',
10-
'192.88.99.0',
11-
'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
12-
'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
13-
].each do |value|
14-
describe value.inspect do
15-
it { is_expected.to allow_value(value) }
16-
end
3+
describe 'Stdlib::Compat::Ip_address' do
4+
describe 'accepts ipv4 and ipv6 addresses' do
5+
[
6+
'224.0.0.0',
7+
'255.255.255.255',
8+
'0.0.0.0',
9+
'192.88.99.0',
10+
'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
11+
'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
12+
].each do |value|
13+
describe value.inspect do
14+
it { is_expected.to allow_value(value) }
1715
end
1816
end
19-
describe 'rejects other values' do
20-
[
21-
nil,
22-
[nil],
23-
[nil, nil],
24-
{ 'foo' => 'bar' },
25-
{},
26-
'',
27-
'nope',
28-
'77',
29-
'4.4.4',
30-
'2001:0db8:85a3:000000:0000:8a2e:0370:7334',
31-
].each do |value|
32-
describe value.inspect do
33-
it { is_expected.not_to allow_value(value) }
34-
end
17+
end
18+
describe 'rejects other values' do
19+
[
20+
nil,
21+
[nil],
22+
[nil, nil],
23+
{ 'foo' => 'bar' },
24+
{},
25+
'',
26+
'nope',
27+
'77',
28+
'4.4.4',
29+
'2001:0db8:85a3:000000:0000:8a2e:0370:7334',
30+
].each do |value|
31+
describe value.inspect do
32+
it { is_expected.not_to allow_value(value) }
3533
end
3634
end
3735
end

‎spec/type_aliases/compat__ipv4_spec.rb‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
require 'spec_helper'
22

3-
if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
4-
describe 'Stdlib::Compat::Ipv4' do
5-
describe 'accepts ipv4 addresses' do
6-
SharedData::IPV4_PATTERNS.each do |value|
7-
describe value.inspect do
8-
it { is_expected.to allow_value(value) }
9-
end
3+
describe 'Stdlib::Compat::Ipv4' do
4+
describe 'accepts ipv4 addresses' do
5+
SharedData::IPV4_PATTERNS.each do |value|
6+
describe value.inspect do
7+
it { is_expected.to allow_value(value) }
108
end
119
end
12-
describe 'rejects other values' do
13-
SharedData::IPV4_NEGATIVE_PATTERNS.each do |value|
14-
describe value.inspect do
15-
it { is_expected.not_to allow_value(value) }
16-
end
10+
end
11+
describe 'rejects other values' do
12+
SharedData::IPV4_NEGATIVE_PATTERNS.each do |value|
13+
describe value.inspect do
14+
it { is_expected.not_to allow_value(value) }
1715
end
1816
end
1917
end

0 commit comments

Comments
 (0)