Skip to content

Commit f218c85

Browse files
author
David Swan
committed
RubocopDay4
1 parent 14ae34b commit f218c85

12 files changed

+139
-134
lines changed

‎spec/acceptance/deprecation_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
apply_manifest(remove_file_manifest)
1717
end
1818

19-
context 'with --strict=error', if: get_puppet_version =~ %r{^4} do
19+
context 'with --strict=error', if: return_puppet_version =~ %r{^4} do
2020
let(:result) { on(default, puppet('apply', '--strict=error', '-e', add_file_manifest), acceptable_exit_codes: (0...256)) }
2121

2222
after :all do
@@ -36,7 +36,7 @@
3636
end
3737
end
3838

39-
context 'with --strict=warning', if: get_puppet_version =~ %r{^4} do
39+
context 'with --strict=warning', if: return_puppet_version =~ %r{^4} do
4040
let(:result) { on(default, puppet('apply', '--strict=warning', '-e', add_file_manifest), acceptable_exit_codes: (0...256)) }
4141

4242
after :all do
@@ -56,7 +56,7 @@
5656
end
5757
end
5858

59-
context 'with --strict=off', if: get_puppet_version =~ %r{^4} do
59+
context 'with --strict=off', if: return_puppet_version =~ %r{^4} do
6060
let(:result) { on(default, puppet('apply', '--strict=off', '-e', add_file_manifest), acceptable_exit_codes: (0...256)) }
6161

6262
after :all do
@@ -76,7 +76,7 @@
7676
end
7777
end
7878

79-
context 'puppet 3 test', if: get_puppet_version =~ %r{^3} do
79+
context 'puppet 3 test', if: return_puppet_version =~ %r{^3} do
8080
let(:result) { on(default, puppet('apply', '--parser=future', '-e', add_file_manifest), acceptable_exit_codes: (0...256)) }
8181

8282
after :all do

‎spec/acceptance/is_a_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /usr/bin/env ruby -S rspec # rubocop:disable Lint/ScriptPermission : Rubocop Mistake???
22
require 'spec_helper_acceptance'
33

4-
if get_puppet_version =~ %r{^4}
4+
if return_puppet_version =~ %r{^4}
55
describe 'is_a function' do
66
pp1 = <<-EOS
77
if 'hello world'.is_a(String) {

‎spec/functions/type_spec.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
end
77

88
it 'gives a deprecation warning when called' do
9-
scope.expects(:warning)
10-
.with("type() DEPRECATED: This function will cease to function on Puppet 4; please use type3x() before upgrading for backwards-compatibility, or migrate to the new parser's typing system.")
9+
scope.expects(:warning).with("type() DEPRECATED: This function will cease to function on Puppet 4; please use type3x() before upgrading to puppet 4 for backwards-compatibility, or migrate to the new parser's typing system.") # rubocop:disable Metrics/LineLength : Unable to reduce to required length
1110
scope.function_type(['aoeu'])
1211
end
1312

‎spec/functions/validate_x509_rsa_key_pair_spec.rb

Lines changed: 74 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,94 @@
11
require 'spec_helper'
22

33
describe 'validate_x509_rsa_key_pair' do
4+
# rubocop:disable Lint/IndentHeredoc : Heredoc's are meant to be indented in this way
45
let(:valid_cert) do
56
<<EOS
6-
-----BEGIN CERTIFICATE-----
7-
MIIC9jCCAeCgAwIBAgIRAK11n3X7aypJ7FPM8UFyAeowCwYJKoZIhvcNAQELMBIx
8-
EDAOBgNVBAoTB0FjbWUgQ28wHhcNMTUxMTIzMjIzOTU4WhcNMTYxMTIyMjIzOTU4
9-
WjASMRAwDgYDVQQKEwdBY21lIENvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
10-
CgKCAQEAz9bY/piKahD10AiJSfbI2A8NG5UwRz0r9T/WfvNVdhgrsGFgNQjvpUoZ
11-
nNJpQIHBbgMOiXqfATFjJl5FjEkSf7GUHohlGVls9MX2JmVvknzsiitd75H/EJd+
12-
N+k915lix8Vqmj8d1CTlbF/8tEjzANI67Vqw5QTuqebO7rkIUvRg6yiRfSo75FK1
13-
RinCJyl++kmleBwQZBInQyg95GvJ5JTqMzBs67DeeyzskDhTeTePRYVF2NwL8QzY
14-
htvLIBERTNsyU5i7nkxY5ptUwgFUwd93LH4Q19tPqL5C5RZqXxhE51thOOwafm+a
15-
W/cRkqYqV+tv+j1jJ3WICyF1JNW0BQIDAQABo0swSTAOBgNVHQ8BAf8EBAMCAKAw
16-
EwYDVR0lBAwwCgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADAUBgNVHREEDTALggls
17-
b2NhbGhvc3QwCwYJKoZIhvcNAQELA4IBAQAzRo0hpVTrFQZLIXpwvKwZVGvJdCkV
18-
P95DTsSk/VTGV+/YtxrRqks++hJZnctm2PbnTsCAoIP3AMx+vicCKiKrxvpsLU8/
19-
+6cowUbcuGMdSQktwDqbAgEhQlLsETll06w1D/KC+ejOc4+LRn3GQcEyGDtMk/EX
20-
IeAvBZHr4/kVXWnfo6kzCLcku1f8yE/yDEFClZe9XV1Lk/s+3YfXVtNnMJJ1giZI
21-
QVOe6CkmuQq+4AtIeW8aLkvlfp632jag1F77a1y+L268koKkj0hBMrtcErVQaxmq
22-
xym0+soR4Tk4pTIGckeFglrLxkP2JpM/yTwSEAVlmG9vgTliYKyR0uMl
23-
-----END CERTIFICATE-----
7+
-----BEGIN CERTIFICATE-----
8+
MIIC9jCCAeCgAwIBAgIRAK11n3X7aypJ7FPM8UFyAeowCwYJKoZIhvcNAQELMBIx
9+
EDAOBgNVBAoTB0FjbWUgQ28wHhcNMTUxMTIzMjIzOTU4WhcNMTYxMTIyMjIzOTU4
10+
WjASMRAwDgYDVQQKEwdBY21lIENvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
11+
CgKCAQEAz9bY/piKahD10AiJSfbI2A8NG5UwRz0r9T/WfvNVdhgrsGFgNQjvpUoZ
12+
nNJpQIHBbgMOiXqfATFjJl5FjEkSf7GUHohlGVls9MX2JmVvknzsiitd75H/EJd+
13+
N+k915lix8Vqmj8d1CTlbF/8tEjzANI67Vqw5QTuqebO7rkIUvRg6yiRfSo75FK1
14+
RinCJyl++kmleBwQZBInQyg95GvJ5JTqMzBs67DeeyzskDhTeTePRYVF2NwL8QzY
15+
htvLIBERTNsyU5i7nkxY5ptUwgFUwd93LH4Q19tPqL5C5RZqXxhE51thOOwafm+a
16+
W/cRkqYqV+tv+j1jJ3WICyF1JNW0BQIDAQABo0swSTAOBgNVHQ8BAf8EBAMCAKAw
17+
EwYDVR0lBAwwCgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADAUBgNVHREEDTALggls
18+
b2NhbGhvc3QwCwYJKoZIhvcNAQELA4IBAQAzRo0hpVTrFQZLIXpwvKwZVGvJdCkV
19+
P95DTsSk/VTGV+/YtxrRqks++hJZnctm2PbnTsCAoIP3AMx+vicCKiKrxvpsLU8/
20+
+6cowUbcuGMdSQktwDqbAgEhQlLsETll06w1D/KC+ejOc4+LRn3GQcEyGDtMk/EX
21+
IeAvBZHr4/kVXWnfo6kzCLcku1f8yE/yDEFClZe9XV1Lk/s+3YfXVtNnMJJ1giZI
22+
QVOe6CkmuQq+4AtIeW8aLkvlfp632jag1F77a1y+L268koKkj0hBMrtcErVQaxmq
23+
xym0+soR4Tk4pTIGckeFglrLxkP2JpM/yTwSEAVlmG9vgTliYKyR0uMl
24+
-----END CERTIFICATE-----
2425
EOS
2526
end
2627

2728
let(:valid_key) do
2829
<<EOS
29-
-----BEGIN RSA PRIVATE KEY-----
30-
MIIEogIBAAKCAQEAz9bY/piKahD10AiJSfbI2A8NG5UwRz0r9T/WfvNVdhgrsGFg
31-
NQjvpUoZnNJpQIHBbgMOiXqfATFjJl5FjEkSf7GUHohlGVls9MX2JmVvknzsiitd
32-
75H/EJd+N+k915lix8Vqmj8d1CTlbF/8tEjzANI67Vqw5QTuqebO7rkIUvRg6yiR
33-
fSo75FK1RinCJyl++kmleBwQZBInQyg95GvJ5JTqMzBs67DeeyzskDhTeTePRYVF
34-
2NwL8QzYhtvLIBERTNsyU5i7nkxY5ptUwgFUwd93LH4Q19tPqL5C5RZqXxhE51th
35-
OOwafm+aW/cRkqYqV+tv+j1jJ3WICyF1JNW0BQIDAQABAoIBADAiZ/r+xP+vkd5u
36-
O61/lCBFzBlZQecdybJw6HJaVK6XBndA9hESUr4LHUdui6W+51ddKd65IV4bXAUk
37-
zCKjQb+FFvLDT/bA+TTvLATUdTSN7hJJ3OWBAHuNOlQklof6JCB0Hi4+89+P8/pX
38-
eKUgR/cmuTMDT/iaXdPHeqFbBQyA1ZpQFRjN5LyyJMS/9FkywuNc5wlpsArtc51T
39-
gIKENUZCuPhosR+kMFc2iuTNvqZWPhvouSrmhi2O6nSqV+oy0+irlqSpCF2GsCI8
40-
72TtLpq94Grrq0BEH5avouV+Lp4k83vO65OKCQKUFQlxz3Xkxm2U3J7KzxqnRtM3
41-
/b+cJ/kCgYEA6/yOnaEYhH/7ijhZbPn8RujXZ5VGJXKJqIuaPiHMmHVS5p1j6Bah
42-
2PcnqJA2IlLs3UloN+ziAxAIH6KCBiwlQ/uPBNMMaJsIjPNBEy8axjndKhKUpidg
43-
R0OJ7RQqMShOJ8akrSfWdPtXC/GBuwCYE//t77GgZaIMO3FcT9EKA48CgYEA4Xcx
44-
Fia0Jg9iyAhNmUOXI6hWcGENavMx01+x7XFhbnMjIKTZevFfTnTkrX6HyLXyGtMU
45-
gHOn+k4PE/purI4ARrKO8m5wYEKqSIt4dBMTkIXXirfQjXgfjR8E4T/aPe5fOFZo
46-
7OYuxLRtzmG1C2sW4txwKAKX1LaWcVx/RLSttSsCgYBbcj8Brk+F6OJcqYFdzXGJ
47-
OOlf5mSMVlopyg83THmwCqbZXtw8L6kAHqZrl5airmfDSJLuOQlMDoZXW+3u3mSC
48-
d5TwVahVUN57YDgzaumBLyMZDqIz0MZqVy23hTzkV64Rk9R0lR9xrYQJyMhw4sYL
49-
2f0mCTsSpzz+O+t9so+i2QKBgEC38gMlwPhb2kMI/x1LZYr6uzUu5qcYf+jowy4h
50-
KZKGwkKQj0zXFEB1FV8nvtpCP+irRmtIx6L13SYi8LnfWPzyLE4ynVdES5TfVAgd
51-
obQOdzx+XwL8xDHCAaiWp5K3ZeXKB/xYZnxYPlzLdyh76Ond1OPnOqX4c16+6llS
52-
c7pZAoGATd9NckT0XtXLEsF3IraDivq8dP6bccX2DNfS8UeEvRRrRwpFpSRrmuGb
53-
jbG4yzoIX4RjQfj/z48hwhJB+cKiN9WwcPsFXtHe7v3F6BRwK0JUfrCiXad8/SGZ
54-
KAf7Dfqi608zBdnPWHacre2Y35gPHB00nFQOLS6u46aBNSq07YA=
55-
-----END RSA PRIVATE KEY-----
30+
-----BEGIN RSA PRIVATE KEY-----
31+
MIIEogIBAAKCAQEAz9bY/piKahD10AiJSfbI2A8NG5UwRz0r9T/WfvNVdhgrsGFg
32+
NQjvpUoZnNJpQIHBbgMOiXqfATFjJl5FjEkSf7GUHohlGVls9MX2JmVvknzsiitd
33+
75H/EJd+N+k915lix8Vqmj8d1CTlbF/8tEjzANI67Vqw5QTuqebO7rkIUvRg6yiR
34+
fSo75FK1RinCJyl++kmleBwQZBInQyg95GvJ5JTqMzBs67DeeyzskDhTeTePRYVF
35+
2NwL8QzYhtvLIBERTNsyU5i7nkxY5ptUwgFUwd93LH4Q19tPqL5C5RZqXxhE51th
36+
OOwafm+aW/cRkqYqV+tv+j1jJ3WICyF1JNW0BQIDAQABAoIBADAiZ/r+xP+vkd5u
37+
O61/lCBFzBlZQecdybJw6HJaVK6XBndA9hESUr4LHUdui6W+51ddKd65IV4bXAUk
38+
zCKjQb+FFvLDT/bA+TTvLATUdTSN7hJJ3OWBAHuNOlQklof6JCB0Hi4+89+P8/pX
39+
eKUgR/cmuTMDT/iaXdPHeqFbBQyA1ZpQFRjN5LyyJMS/9FkywuNc5wlpsArtc51T
40+
gIKENUZCuPhosR+kMFc2iuTNvqZWPhvouSrmhi2O6nSqV+oy0+irlqSpCF2GsCI8
41+
72TtLpq94Grrq0BEH5avouV+Lp4k83vO65OKCQKUFQlxz3Xkxm2U3J7KzxqnRtM3
42+
/b+cJ/kCgYEA6/yOnaEYhH/7ijhZbPn8RujXZ5VGJXKJqIuaPiHMmHVS5p1j6Bah
43+
2PcnqJA2IlLs3UloN+ziAxAIH6KCBiwlQ/uPBNMMaJsIjPNBEy8axjndKhKUpidg
44+
R0OJ7RQqMShOJ8akrSfWdPtXC/GBuwCYE//t77GgZaIMO3FcT9EKA48CgYEA4Xcx
45+
Fia0Jg9iyAhNmUOXI6hWcGENavMx01+x7XFhbnMjIKTZevFfTnTkrX6HyLXyGtMU
46+
gHOn+k4PE/purI4ARrKO8m5wYEKqSIt4dBMTkIXXirfQjXgfjR8E4T/aPe5fOFZo
47+
7OYuxLRtzmG1C2sW4txwKAKX1LaWcVx/RLSttSsCgYBbcj8Brk+F6OJcqYFdzXGJ
48+
OOlf5mSMVlopyg83THmwCqbZXtw8L6kAHqZrl5airmfDSJLuOQlMDoZXW+3u3mSC
49+
d5TwVahVUN57YDgzaumBLyMZDqIz0MZqVy23hTzkV64Rk9R0lR9xrYQJyMhw4sYL
50+
2f0mCTsSpzz+O+t9so+i2QKBgEC38gMlwPhb2kMI/x1LZYr6uzUu5qcYf+jowy4h
51+
KZKGwkKQj0zXFEB1FV8nvtpCP+irRmtIx6L13SYi8LnfWPzyLE4ynVdES5TfVAgd
52+
obQOdzx+XwL8xDHCAaiWp5K3ZeXKB/xYZnxYPlzLdyh76Ond1OPnOqX4c16+6llS
53+
c7pZAoGATd9NckT0XtXLEsF3IraDivq8dP6bccX2DNfS8UeEvRRrRwpFpSRrmuGb
54+
jbG4yzoIX4RjQfj/z48hwhJB+cKiN9WwcPsFXtHe7v3F6BRwK0JUfrCiXad8/SGZ
55+
KAf7Dfqi608zBdnPWHacre2Y35gPHB00nFQOLS6u46aBNSq07YA=
56+
-----END RSA PRIVATE KEY-----
5657
EOS
5758
end
5859

5960
let(:another_valid_key) do
6061
<<EOS
61-
-----BEGIN RSA PRIVATE KEY-----
62-
MIIEpAIBAAKCAQEAoISxYJBTPAeAzFnm+lE/ljLlmGal2Xr3vwZKkvJiuKA/m4QJ
63-
0ZNdtkBSDOVuG2dXVv6W4sChRtsCdvuVe7bjTYvlU8TWM3VEJDL9l9cRXScxxlKQ
64-
Xwb35y1yV35NJfaK/jzm9KcErtQQs1RxvGlWRaohmLM8uQcuhjZfMsSlQoHQD5LX
65-
sbPtk82RPyxYc1dj2vsaoi1VvuP2+jv4xLQOmNJY1bT5GTurqiltmxEtWhNNmGg0
66-
2wtK00ifqLVO5HNc3gXQCDM2M99Sbmn1YtbrgsU9xMYfcPmvQvb+YoKskyoqck+c
67-
HR//hi7vslbxABrny15LBkEfRc4TickphSGYXwIDAQABAoIBAATEzGw8/WwMIQRx
68-
K06GeWgh7PZBHm4+m/ud2TtSXiJ0CE+7dXs3cJJIiOd/LW08/bhE6gCkjmYHfaRB
69-
Ryicv1X/cPmzIFX5BuQ4a5ZGOmrVDkKBE27vSxAgJoR46RvWnjx9XLMp/xaekDxz
70-
psldK8X4DvV1ZbltgDFWji947hvyqUtHdKnkQnc5j7aCIFJf9GMfzaeeDPMaL8WF
71-
mVL4iy9EAOjNOHBshZj/OHyU5FbJ8ROwZQlCOiLCdFegftSIXt8EYDnjB3BdsALH
72-
N6hquqrD7xDKyRbTD0K7lqxUubuMwTQpi61jZD8TBTXEPyFVAnoMpXkc0Y+np40A
73-
YiIsR+kCgYEAyrc4Bh6fb9gt49IXGXOSRZ5i5+TmJho4kzIONrJ7Ndclwx9wzHfh
74-
eGBodWaw5CxxQGMf4vEiaZrpAiSFeDffBLR+Wa2TFE5aWkdYkR34maDjO00m4PE1
75-
S+YsZoGw7rGmmj+KS4qv2T26FEHtUI+F31RC1FPohLsQ22Jbn1ORipsCgYEAyrYB
76-
J2Ncf2DlX1C0GfxyUHQOTNl0V5gpGvpbZ0WmWksumYz2kSGOAJkxuDKd9mKVlAcz
77-
czmN+OOetuHTNqds2JJKKJy6hJbgCdd9aho3dId5Xs4oh4YwuFQiG8R/bJZfTlXo
78-
99Qr02L7MmDWYLmrR3BA/93UPeorHPtjqSaYU40CgYEAtmGfWwokIglaSDVVqQVs
79-
3YwBqmcrla5TpkMLvLRZ2/fktqfL4Xod9iKu+Klajv9ZKTfFkXWno2HHL7FSD/Yc
80-
hWwqnV5oDIXuDnlQOse/SeERb+IbD5iUfePpoJQgbrCQlwiB0TNGwOojR2SFMczf
81-
Ai4aLlQLx5dSND9K9Y7HS+8CgYEAixlHQ2r4LuQjoTs0ytwi6TgqE+vn3K+qDTwc
82-
eoods7oBWRaUn1RCKAD3UClToZ1WfMRQNtIYrOAsqdveXpOWqioAP0wE5TTOuZIo
83-
GiWxRgIsc7TNtOmNBv+chCdbNP0emxdyjJUIGb7DFnfCw47EjHnn8Guc13uXaATN
84-
B2ZXgoUCgYAGa13P0ggUf5BMJpBd8S08jKRyvZb1CDXcUCuGtk2yEx45ern9U5WY
85-
zJ13E5z9MKKO8nkGBqrRfjJa8Xhxk4HKNFuzHEet5lvNE7IKCF4YQRb0ZBhnb/78
86-
+4ZKjFki1RrWRNSw9TdvrK6qaDKgTtCTtfRVXAYQXUgq7lSFOTtL3A==
87-
-----END RSA PRIVATE KEY-----
62+
-----BEGIN RSA PRIVATE KEY-----
63+
MIIEpAIBAAKCAQEAoISxYJBTPAeAzFnm+lE/ljLlmGal2Xr3vwZKkvJiuKA/m4QJ
64+
0ZNdtkBSDOVuG2dXVv6W4sChRtsCdvuVe7bjTYvlU8TWM3VEJDL9l9cRXScxxlKQ
65+
Xwb35y1yV35NJfaK/jzm9KcErtQQs1RxvGlWRaohmLM8uQcuhjZfMsSlQoHQD5LX
66+
sbPtk82RPyxYc1dj2vsaoi1VvuP2+jv4xLQOmNJY1bT5GTurqiltmxEtWhNNmGg0
67+
2wtK00ifqLVO5HNc3gXQCDM2M99Sbmn1YtbrgsU9xMYfcPmvQvb+YoKskyoqck+c
68+
HR//hi7vslbxABrny15LBkEfRc4TickphSGYXwIDAQABAoIBAATEzGw8/WwMIQRx
69+
K06GeWgh7PZBHm4+m/ud2TtSXiJ0CE+7dXs3cJJIiOd/LW08/bhE6gCkjmYHfaRB
70+
Ryicv1X/cPmzIFX5BuQ4a5ZGOmrVDkKBE27vSxAgJoR46RvWnjx9XLMp/xaekDxz
71+
psldK8X4DvV1ZbltgDFWji947hvyqUtHdKnkQnc5j7aCIFJf9GMfzaeeDPMaL8WF
72+
mVL4iy9EAOjNOHBshZj/OHyU5FbJ8ROwZQlCOiLCdFegftSIXt8EYDnjB3BdsALH
73+
N6hquqrD7xDKyRbTD0K7lqxUubuMwTQpi61jZD8TBTXEPyFVAnoMpXkc0Y+np40A
74+
YiIsR+kCgYEAyrc4Bh6fb9gt49IXGXOSRZ5i5+TmJho4kzIONrJ7Ndclwx9wzHfh
75+
eGBodWaw5CxxQGMf4vEiaZrpAiSFeDffBLR+Wa2TFE5aWkdYkR34maDjO00m4PE1
76+
S+YsZoGw7rGmmj+KS4qv2T26FEHtUI+F31RC1FPohLsQ22Jbn1ORipsCgYEAyrYB
77+
J2Ncf2DlX1C0GfxyUHQOTNl0V5gpGvpbZ0WmWksumYz2kSGOAJkxuDKd9mKVlAcz
78+
czmN+OOetuHTNqds2JJKKJy6hJbgCdd9aho3dId5Xs4oh4YwuFQiG8R/bJZfTlXo
79+
99Qr02L7MmDWYLmrR3BA/93UPeorHPtjqSaYU40CgYEAtmGfWwokIglaSDVVqQVs
80+
3YwBqmcrla5TpkMLvLRZ2/fktqfL4Xod9iKu+Klajv9ZKTfFkXWno2HHL7FSD/Yc
81+
hWwqnV5oDIXuDnlQOse/SeERb+IbD5iUfePpoJQgbrCQlwiB0TNGwOojR2SFMczf
82+
Ai4aLlQLx5dSND9K9Y7HS+8CgYEAixlHQ2r4LuQjoTs0ytwi6TgqE+vn3K+qDTwc
83+
eoods7oBWRaUn1RCKAD3UClToZ1WfMRQNtIYrOAsqdveXpOWqioAP0wE5TTOuZIo
84+
GiWxRgIsc7TNtOmNBv+chCdbNP0emxdyjJUIGb7DFnfCw47EjHnn8Guc13uXaATN
85+
B2ZXgoUCgYAGa13P0ggUf5BMJpBd8S08jKRyvZb1CDXcUCuGtk2yEx45ern9U5WY
86+
zJ13E5z9MKKO8nkGBqrRfjJa8Xhxk4HKNFuzHEet5lvNE7IKCF4YQRb0ZBhnb/78
87+
+4ZKjFki1RrWRNSw9TdvrK6qaDKgTtCTtfRVXAYQXUgq7lSFOTtL3A==
88+
-----END RSA PRIVATE KEY-----
8889
EOS
8990
end
91+
# rubocop:enable Layout/IndentHeredoc
9092

9193
let(:valid_cert_but_indented) do
9294
valid_cert.gsub(%r{^}, ' ')

‎spec/spec_helper_acceptance.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
end
1919
end
2020

21-
def get_puppet_version
21+
def return_puppet_version
2222
(on default, puppet('--version')).output.chomp
2323
end
2424

2525
RSpec.shared_context 'with faked facts' do
2626
let(:facts_d) do
27-
puppet_version = get_puppet_version
27+
puppet_version = return_puppet_version
2828
if fact('osfamily') =~ %r{windows}i
2929
if fact('kernelmajversion').to_f < 6.0
3030
'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'

‎spec/unit/facter/facter_dot_d_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'spec_helper'
33
require 'facter/facter_dot_d'
44

5-
describe Facter::Util::DotD do
5+
describe Facter::Util::DotD do # rubocop:disable RSpec/FilePath : Spec path is as it should be
66
context 'returns a simple fact' do
77
before :each do
88
Facter.stubs(:version).returns('1.6.1')

‎spec/unit/facter/package_provider_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /usr/bin/env ruby -S rspec
1+
#! /usr/bin/env ruby -S rspec # rubocop:disable Lint/ScriptPermission : Rubocop error??
22
require 'spec_helper'
33
require 'puppet/type'
44
require 'puppet/type/package'

‎spec/unit/facter/pe_version_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
Facter.fact(:puppetversion).stubs(:value).returns(nil)
2121
end
2222

23-
it 'pe_version is nil' do
23+
it 'puppetversion is nil' do
2424
expect(Facter.fact(:puppetversion).value).to be_nil
25+
end
26+
27+
it 'pe_version is nil' do
2528
expect(Facter.fact(:pe_version).value).to be_nil
2629
end
2730
end

‎spec/unit/facter/root_home_spec.rb

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,68 @@
11
#! /usr/bin/env ruby -S rspec
22
require 'spec_helper'
33
require 'facter/root_home'
4+
describe 'Root Home Specs' do
5+
describe Facter::Util::RootHome do
6+
context 'solaris' do
7+
let(:root_ent) { 'root:x:0:0:Super-User:/:/sbin/sh' }
8+
let(:expected_root_home) { '/' }
49

5-
describe Facter::Util::RootHome do
6-
context 'solaris' do
7-
let(:root_ent) { 'root:x:0:0:Super-User:/:/sbin/sh' }
8-
let(:expected_root_home) { '/' }
9-
10-
it 'returns /' do
11-
Facter::Util::Resolution.expects(:exec).with('getent passwd root').returns(root_ent)
12-
expect(described_class.returnt_root_home).to eq(expected_root_home)
10+
it 'returns /' do
11+
Facter::Util::Resolution.expects(:exec).with('getent passwd root').returns(root_ent)
12+
expect(described_class.returnt_root_home).to eq(expected_root_home)
13+
end
1314
end
14-
end
15-
context 'linux' do
16-
let(:root_ent) { 'root:x:0:0:root:/root:/bin/bash' }
17-
let(:expected_root_home) { '/root' }
15+
context 'linux' do
16+
let(:root_ent) { 'root:x:0:0:root:/root:/bin/bash' }
17+
let(:expected_root_home) { '/root' }
1818

19-
it 'returns /root' do
20-
Facter::Util::Resolution.expects(:exec).with('getent passwd root').returns(root_ent)
21-
expect(described_class.returnt_root_home).to eq(expected_root_home)
22-
end
23-
end
24-
context 'windows' do
25-
before :each do
26-
Facter::Util::Resolution.expects(:exec).with('getent passwd root').returns(nil)
19+
it 'returns /root' do
20+
Facter::Util::Resolution.expects(:exec).with('getent passwd root').returns(root_ent)
21+
expect(described_class.returnt_root_home).to eq(expected_root_home)
22+
end
2723
end
28-
it 'is nil on windows' do
29-
expect(described_class.returnt_root_home).to be_nil
24+
context 'windows' do
25+
before :each do
26+
Facter::Util::Resolution.expects(:exec).with('getent passwd root').returns(nil)
27+
end
28+
it 'is nil on windows' do
29+
expect(described_class.returnt_root_home).to be_nil
30+
end
3031
end
3132
end
32-
end
3333

34-
describe 'root_home', type: :fact do
35-
before(:each) { Facter.clear }
36-
after(:each) { Facter.clear }
34+
describe 'root_home', type: :fact do
35+
before(:each) { Facter.clear }
36+
after(:each) { Facter.clear }
3737

38-
context 'macosx' do
39-
before(:each) do
40-
Facter.fact(:kernel).stubs(:value).returns('Darwin')
41-
Facter.fact(:osfamily).stubs(:value).returns('Darwin')
42-
end
43-
let(:expected_root_home) { '/var/root' }
38+
context 'macosx' do
39+
before(:each) do
40+
Facter.fact(:kernel).stubs(:value).returns('Darwin')
41+
Facter.fact(:osfamily).stubs(:value).returns('Darwin')
42+
end
43+
let(:expected_root_home) { '/var/root' }
4444

45-
sample_dscacheutil = File.read(fixtures('dscacheutil', 'root'))
45+
sample_dscacheutil = File.read(fixtures('dscacheutil', 'root'))
4646

47-
it 'returns /var/root' do
48-
Facter::Util::Resolution.stubs(:exec).with('dscacheutil -q user -a name root').returns(sample_dscacheutil)
49-
expect(Facter.fact(:root_home).value).to eq(expected_root_home)
47+
it 'returns /var/root' do
48+
Facter::Util::Resolution.stubs(:exec).with('dscacheutil -q user -a name root').returns(sample_dscacheutil)
49+
expect(Facter.fact(:root_home).value).to eq(expected_root_home)
50+
end
5051
end
51-
end
5252

53-
context 'aix' do
54-
before(:each) do
55-
Facter.fact(:kernel).stubs(:value).returns('AIX')
56-
Facter.fact(:osfamily).stubs(:value).returns('AIX')
57-
end
58-
let(:expected_root_home) { '/root' }
53+
context 'aix' do
54+
before(:each) do
55+
Facter.fact(:kernel).stubs(:value).returns('AIX')
56+
Facter.fact(:osfamily).stubs(:value).returns('AIX')
57+
end
58+
let(:expected_root_home) { '/root' }
5959

60-
sample_lsuser = File.read(fixtures('lsuser', 'root'))
60+
sample_lsuser = File.read(fixtures('lsuser', 'root'))
6161

62-
it 'returns /root' do
63-
Facter::Util::Resolution.stubs(:exec).with('lsuser -c -a home root').returns(sample_lsuser)
64-
expect(Facter.fact(:root_home).value).to eq(expected_root_home)
62+
it 'returns /root' do
63+
Facter::Util::Resolution.stubs(:exec).with('lsuser -c -a home root').returns(sample_lsuser)
64+
expect(Facter.fact(:root_home).value).to eq(expected_root_home)
65+
end
6566
end
6667
end
6768
end

‎spec/unit/facter/service_provider_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /usr/bin/env ruby -S rspec
1+
#! /usr/bin/env ruby -S rspec # rubocop:disable Lint/ScriptPermission : Rubocop error??
22
require 'spec_helper'
33
require 'puppet/type'
44
require 'puppet/type/service'

‎spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /usr/bin/env ruby -S rspec
1+
#! /usr/bin/env ruby -S rspec # rubocop:disable Lint/ScriptPermission : Rubocop error??
22
require 'spec_helper'
33

44
describe 'the enclose_ipv6 function' do

0 commit comments

Comments
 (0)