saltstack-formulas/template-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/template-formula.git synced 2025-04-16 09:40:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(rubocop): fix remaining errors manually

Browse source
This commit is contained in:
Imran Iqbal 2019-10-05 16:15:29 +01:00
parent 484ce2459d
commit 9566b6fb63
No known key found for this signature in database
GPG key ID: 6D8629439D2B7819
4 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -8,3 +8,5 @@ Metrics/LineLength:
Max: 88 Max: 88
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
Metrics/BlockLength:
Max: 36

7
bin/kitchen
View file

@ -18,8 +18,11 @@ if File.file?(bundle_binstub)
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
load(bundle_binstub) load(bundle_binstub)
else else
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. abort(
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") 'Your `bin/bundle` was not generated by Bundler, '\
'so this binstub cannot run. Replace `bin/bundle` by running '\
'`bundle binstubs bundler --force`, then run this command again.'
)
end end
end end

16
test/integration/default/controls/config_spec.rb
View file

@ -8,7 +8,11 @@ control 'template configuration' do
it { should be_owned_by 'root' } it { should be_owned_by 'root' }
it { should be_grouped_into 'root' } it { should be_grouped_into 'root' }
its('mode') { should cmp '0644' } its('mode') { should cmp '0644' }
its('content') { should include 'This is another example file from SaltStack template-formula.' } its('content') do
should include(
'This is another example file from SaltStack template-formula.'
)
end
its('content') { should include '"added_in_pillar": "pillar_value"' } its('content') { should include '"added_in_pillar": "pillar_value"' }
its('content') { should include '"added_in_defaults": "defaults_value"' } its('content') { should include '"added_in_defaults": "defaults_value"' }
its('content') { should include '"added_in_lookup": "lookup_value"' } its('content') { should include '"added_in_lookup": "lookup_value"' }
@ -16,7 +20,15 @@ control 'template configuration' do
its('content') { should include '"lookup": {"added_in_lookup": "lookup_value",' } its('content') { should include '"lookup": {"added_in_lookup": "lookup_value",' }
its('content') { should include '"pkg": {"name": "' } its('content') { should include '"pkg": {"name": "' }
its('content') { should include '"service": {"name": "' } its('content') { should include '"service": {"name": "' }
its('content') { should include '"tofs": {"files_switch": ["any/path/can/be/used/here", "id", "roles", "osfinger", "os", "os_family"], "source_files": {"template-config-file-file-managed": ["example.tmpl.jinja"], "template-subcomponent-config-file-file-managed": ["subcomponent-example.tmpl.jinja"]}' } its('content') do
should include(
'"tofs": {"files_switch": ["any/path/can/be/used/here", "id", '\
'"roles", "osfinger", "os", "os_family"], "source_files": '\
'{"template-config-file-file-managed": ["example.tmpl.jinja"], '\
'"template-subcomponent-config-file-file-managed": '\
'["subcomponent-example.tmpl.jinja"]}'
)
end
its('content') { should include '"arch": "amd64"' } its('content') { should include '"arch": "amd64"' }
its('content') { should include '"winner": "pillar"}' } its('content') { should include '"winner": "pillar"}' }
its('content') { should include 'winner of the merge: pillar' } its('content') { should include 'winner of the merge: pillar' }

15
test/integration/default/controls/subcomponent_config_spec.rb
View file

@ -8,7 +8,18 @@ control 'template subcomponent configuration' do
it { should be_owned_by 'root' } it { should be_owned_by 'root' }
it { should be_grouped_into 'root' } it { should be_grouped_into 'root' }
its('mode') { should cmp '0644' } its('mode') { should cmp '0644' }
its('content') { should include '# File managed by Salt at <salt://template/subcomponent/config/files/default/subcomponent-example.tmpl.jinja>.' } its('content') do
its('content') { should include 'This is another subcomponent example file from SaltStack template-formula.' } should include(
'# File managed by Salt at '\
'<salt://template/subcomponent/config/files/default/'\
'subcomponent-example.tmpl.jinja>.'
)
end
its('content') do
should include(
'This is another subcomponent example file from SaltStack '\
'template-formula.'
)
end
end end
end end