Skip to content

Commit 65a493c

Browse files
author
jordanbreen28
committed
(CONT-802) - Style/TrailingCommaInHashLiteral
1 parent c830644 commit 65a493c

29 files changed

+253
-268
lines changed

‎.rubocop_todo.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,3 @@ RSpec/NamedSubject:
2121
RSpec/RepeatedExampleGroupBody:
2222
Exclude:
2323
- 'spec/defines/config/server/realm_spec.rb'
24-
25-
# # Offense count: 1
26-
# # This cop supports safe autocorrection (--autocorrect).
27-
# # Configuration parameters: EnforcedStyle.
28-
# # SupportedStyles: implicit, explicit
29-
# Style/RescueStandardError:
30-
# Exclude:
31-
# - 'spec/spec_helper.rb'
32-
33-
# Offense count: 253
34-
# This cop supports safe autocorrection (--autocorrect).
35-
# Configuration parameters: EnforcedStyleForMultiline.
36-
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
37-
Style/TrailingCommaInHashLiteral:
38-
Enabled: false

‎spec/classes/init_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
describe 'tomcat' do
55
let :facts do
66
{
7-
os: { family: 'Debian' },
7+
os: { family: 'Debian' }
88
}
99
end
1010

‎spec/classes/tomcat_spec.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context 'not installing from source' do
77
let :facts do
88
{
9-
os: { family: 'Debian' },
9+
os: { family: 'Debian' }
1010
}
1111
end
1212
let :params do
@@ -19,13 +19,13 @@
1919
context 'not managing user/group' do
2020
let :facts do
2121
{
22-
os: { family: 'Debian' },
22+
os: { family: 'Debian' }
2323
}
2424
end
2525
let :params do
2626
{
2727
manage_user: false,
28-
manage_group: false,
28+
manage_group: false
2929
}
3030
end
3131

@@ -36,12 +36,12 @@
3636
context 'with invalid $manage_user' do
3737
let :facts do
3838
{
39-
os: { family: 'Debian' },
39+
os: { family: 'Debian' }
4040
}
4141
end
4242
let :params do
4343
{
44-
manage_user: 'foo',
44+
manage_user: 'foo'
4545
}
4646
end
4747

@@ -55,7 +55,7 @@
5555
context 'on windows' do
5656
let :facts do
5757
{
58-
os: { family: 'windows' },
58+
os: { family: 'windows' }
5959
}
6060
end
6161

@@ -69,7 +69,7 @@
6969
context 'on Solaris' do
7070
let :facts do
7171
{
72-
os: { family: 'Solaris' },
72+
os: { family: 'Solaris' }
7373
}
7474
end
7575

@@ -83,7 +83,7 @@
8383
context 'on OSX' do
8484
let :facts do
8585
{
86-
os: { family: 'Darwin' },
86+
os: { family: 'Darwin' }
8787
}
8888
end
8989

‎spec/defines/config/context/environment_spec.rb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
let :facts do
1010
{
1111
os: { family: 'Debian' },
12-
augeas: { version: '1.0.0' },
12+
augeas: { version: '1.0.0' }
1313
}
1414
end
1515
let :title do
@@ -25,9 +25,9 @@
2525
value: '10',
2626
additional_attributes: {
2727
'foo' => 'bar',
28-
'bar' => 'foo',
28+
'bar' => 'foo'
2929
},
30-
attributes_to_remove: ['foobar', 'barfoo'],
30+
attributes_to_remove: ['foobar', 'barfoo']
3131
}
3232
end
3333

@@ -55,7 +55,7 @@
5555
let :params do
5656
{
5757
catalina_base: '/opt/apache-tomcat/foo',
58-
ensure: 'absent',
58+
ensure: 'absent'
5959
}
6060
end
6161

@@ -73,7 +73,7 @@
7373
{
7474
catalina_base: '/opt/apache-tomcat/foo',
7575
type: 'java.lang.Integer',
76-
value: '10',
76+
value: '10'
7777
}
7878
end
7979

@@ -99,7 +99,7 @@
9999
catalina_base: '/opt/apache-tomcat/foo',
100100
type: 'java.lang.Integer',
101101
value: '10',
102-
override: true,
102+
override: true
103103
}
104104
end
105105

@@ -125,7 +125,7 @@
125125
catalina_base: '/opt/apache-tomcat/foo',
126126
type: 'java.lang.Integer',
127127
value: '10',
128-
description: 'foo bar',
128+
description: 'foo bar'
129129
}
130130
end
131131

@@ -150,7 +150,7 @@
150150
let :params do
151151
{
152152
ensure: 'foobar',
153-
catalina_base: '/opt/apache-tomcat/foo',
153+
catalina_base: '/opt/apache-tomcat/foo'
154154
}
155155
end
156156

@@ -164,7 +164,7 @@
164164
context 'Empty catalina_base' do
165165
let :params do
166166
{
167-
catalina_base: '',
167+
catalina_base: ''
168168
}
169169
end
170170

@@ -179,7 +179,7 @@
179179
let :params do
180180
{
181181
catalina_base: '/opt/apache-tomcat/foo',
182-
value: '10',
182+
value: '10'
183183
}
184184
end
185185

@@ -194,7 +194,7 @@
194194
let :params do
195195
{
196196
catalina_base: '/opt/apache-tomcat/foo',
197-
type: 'java.lang.Integer',
197+
type: 'java.lang.Integer'
198198
}
199199
end
200200

@@ -211,7 +211,7 @@
211211
catalina_base: '/opt/apache-tomcat/foo',
212212
type: 'java.lang.Integer',
213213
value: '10',
214-
override: 'foobar',
214+
override: 'foobar'
215215
}
216216
end
217217

‎spec/defines/config/context/manager_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
let :facts do
1010
{
1111
os: { family: 'Debian' },
12-
augeas: { version: '1.0.0' },
12+
augeas: { version: '1.0.0' }
1313
}
1414
end
1515
let :title do
@@ -23,11 +23,11 @@
2323
manager_classname: 'memcached',
2424
additional_attributes: {
2525
'barfoo' => 'foofoo',
26-
'fizz' => 'buzz',
26+
'fizz' => 'buzz'
2727
},
2828
attributes_to_remove: [
2929
'foobar',
30-
],
30+
]
3131
}
3232
end
3333

@@ -50,7 +50,7 @@
5050
let :params do
5151
{
5252
catalina_base: '/opt/apache-tomcat/test',
53-
ensure: 'absent',
53+
ensure: 'absent'
5454
}
5555
end
5656

‎spec/defines/config/context/parameter_spec.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
let :facts do
1010
{
1111
os: { family: 'Debian' },
12-
augeas: { version: '1.0.0' },
12+
augeas: { version: '1.0.0' }
1313
}
1414
end
1515

@@ -22,7 +22,7 @@
2222
{
2323
catalina_base: '/opt/apache-tomcat/foo',
2424
parameter_name: 'maxExemptions',
25-
value: '10',
25+
value: '10'
2626
}
2727
end
2828

@@ -44,7 +44,7 @@
4444
let :params do
4545
{
4646
catalina_base: '/opt/apache-tomcat/foo',
47-
ensure: 'absent',
47+
ensure: 'absent'
4848
}
4949
end
5050

@@ -63,7 +63,7 @@
6363
let :params do
6464
{
6565
catalina_base: '/opt/apache-tomcat/foo',
66-
value: '10',
66+
value: '10'
6767
}
6868
end
6969

@@ -86,7 +86,7 @@
8686
{
8787
catalina_base: '/opt/apache-tomcat/foo',
8888
value: '10',
89-
override: true,
89+
override: true
9090
}
9191
end
9292

@@ -109,7 +109,7 @@
109109
{
110110
catalina_base: '/opt/apache-tomcat/foo',
111111
value: '10',
112-
description: 'foo bar',
112+
description: 'foo bar'
113113
}
114114
end
115115

‎spec/defines/config/context/resource_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
let :facts do
1010
{
1111
os: { family: 'Debian' },
12-
augeas: { version: '1.0.0' },
12+
augeas: { version: '1.0.0' }
1313
}
1414
end
1515
let :title do
@@ -27,11 +27,11 @@
2727
'validationQuery' => 'getdate()',
2828
'description' => 'description',
2929
'scope' => 'Shareable',
30-
'singleton' => 'true',
30+
'singleton' => 'true'
3131
},
3232
attributes_to_remove: [
3333
'foobar',
34-
],
34+
]
3535
}
3636
end
3737

@@ -59,7 +59,7 @@
5959
let :params do
6060
{
6161
catalina_base: '/opt/apache-tomcat/test',
62-
ensure: 'absent',
62+
ensure: 'absent'
6363
}
6464
end
6565

‎spec/defines/config/context/resourcelink_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
let :facts do
1010
{
1111
os: { family: 'Debian' },
12-
augeas: { version: '1.0.0' },
12+
augeas: { version: '1.0.0' }
1313
}
1414
end
1515
let :title do
@@ -23,11 +23,11 @@
2323
resourcelink_type: 'java',
2424
additional_attributes: {
2525
'factory' => 'javax.naming.spi.ObjectFactory',
26-
'global' => 'simpleValue',
26+
'global' => 'simpleValue'
2727
},
2828
attributes_to_remove: [
2929
'foobar',
30-
],
30+
]
3131
}
3232
end
3333

@@ -51,7 +51,7 @@
5151
let :params do
5252
{
5353
catalina_base: '/opt/apache-tomcat/test',
54-
ensure: 'absent',
54+
ensure: 'absent'
5555
}
5656
end
5757

‎spec/defines/config/context/resources_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
let :facts do
1010
{
1111
os: { family: 'Debian' },
12-
augeas: { version: '1.0.0' },
12+
augeas: { version: '1.0.0' }
1313
}
1414
end
1515
let :title do
@@ -22,11 +22,11 @@
2222
catalina_base: '/opt/apache-tomcat/test',
2323
additional_attributes: {
2424
'cachingAllowed' => 'true',
25-
'cacheMaxSize' => '100000',
25+
'cacheMaxSize' => '100000'
2626
},
2727
attributes_to_remove: [
2828
'foobar',
29-
],
29+
]
3030
}
3131
end
3232

@@ -48,7 +48,7 @@
4848
let :params do
4949
{
5050
catalina_base: '/opt/apache-tomcat/test',
51-
ensure: 'absent',
51+
ensure: 'absent'
5252
}
5353
end
5454

0 commit comments

Comments
 (0)