(MAINT) Fix up rubocop settings and clean up inconsistent indentation
This commit is contained in:
parent
99efcb156a
commit
e4ef0ed2f8
|
@ -33,3 +33,8 @@ Gemfile.lock
|
||||||
|
|
||||||
## YARD output
|
## YARD output
|
||||||
/doc/
|
/doc/
|
||||||
|
|
||||||
|
## Acceptance test artifacts
|
||||||
|
/log/
|
||||||
|
/*.gem
|
||||||
|
/spec/acceptance/nodesets/
|
||||||
|
|
12
.rubocop.yml
12
.rubocop.yml
|
@ -83,12 +83,12 @@ Metrics/ModuleLength:
|
||||||
Style/WhileUntilModifier:
|
Style/WhileUntilModifier:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# DISABLED - the offender is just haskell envy
|
# DISABLED
|
||||||
Lint/AmbiguousRegexpLiteral:
|
Security/Eval:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# DISABLED
|
# DISABLED - the offender is just haskell envy
|
||||||
Lint/Eval:
|
Lint/AmbiguousRegexpLiteral:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# DISABLED
|
# DISABLED
|
||||||
|
@ -304,10 +304,10 @@ Style/IndentHash:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
Style/IndentationConsistency:
|
Style/IndentationConsistency:
|
||||||
Enabled: false
|
Enabled: true
|
||||||
|
|
||||||
Style/IndentationWidth:
|
Style/IndentationWidth:
|
||||||
Enabled: false
|
Enabled: true
|
||||||
|
|
||||||
Style/EmptyLines:
|
Style/EmptyLines:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
|
@ -5,7 +5,7 @@ require 'json'
|
||||||
include PuppetStrings::Acceptance::Util
|
include PuppetStrings::Acceptance::Util
|
||||||
|
|
||||||
describe 'Emitting JSON' do
|
describe 'Emitting JSON' do
|
||||||
expected = {
|
expected = {
|
||||||
"puppet_classes" => [],
|
"puppet_classes" => [],
|
||||||
"defined_types" => [],
|
"defined_types" => [],
|
||||||
"resource_types" => [],
|
"resource_types" => [],
|
||||||
|
@ -35,7 +35,7 @@ expected = {
|
||||||
"tags" => ["tag_name" => "return", "text" => "", "types" => ["Any"]]},
|
"tags" => ["tag_name" => "return", "text" => "", "types" => ["Any"]]},
|
||||||
"source" => "Puppet::Parser::Functions.newfunction(:function3x, :doc => \"This is the function documentation for `function3x`\") do |args|\nend"
|
"source" => "Puppet::Parser::Functions.newfunction(:function3x, :doc => \"This is the function documentation for `function3x`\") do |args|\nend"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
it 'should emit JSON to stdout when using the --emit-json-stdout option' do
|
it 'should emit JSON to stdout when using the --emit-json-stdout option' do
|
||||||
test_module_path = get_test_module_path(master, /Module test/)
|
test_module_path = get_test_module_path(master, /Module test/)
|
||||||
|
|
|
@ -75,7 +75,7 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
|
||||||
-----END CERTIFICATE-----
|
-----END CERTIFICATE-----
|
||||||
EOM
|
EOM
|
||||||
|
|
||||||
GLOBALSIGN_CA = <<-EOM
|
GLOBALSIGN_CA = <<-EOM
|
||||||
-----BEGIN CERTIFICATE-----
|
-----BEGIN CERTIFICATE-----
|
||||||
MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
|
MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
|
||||||
A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
|
A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
|
||||||
|
|
Loading…
Reference in New Issue