diff --git a/spec/classes/create_multiple_ini_settings_spec.rb b/spec/classes/create_multiple_ini_settings_spec.rb index a911651..1dcbfa1 100644 --- a/spec/classes/create_multiple_ini_settings_spec.rb +++ b/spec/classes/create_multiple_ini_settings_spec.rb @@ -1,41 +1,41 @@ require 'spec_helper' describe 'create_multiple_ini_settings' do context 'on a non-Windows platform', if: !Puppet::Util::Platform.windows? do let(:facts) do { 'os' => { 'family' => 'RedHat', 'release' => { 'major' => '7', 'minor' => '1', 'full' => '7.1.1503' } } } end it { is_expected.to compile } it { is_expected.to have_ini_setting_resource_count(2) } it { is_expected.to contain_ini_setting('/tmp/foo.ini [section1] setting1').with( ensure: 'present', section: 'section1', setting: 'setting1', value: 'value1', path: '/tmp/foo.ini', ) } it { is_expected.to contain_ini_setting('/tmp/foo.ini [section1] setting2').with( ensure: 'absent', section: 'section1', setting: 'setting2', path: '/tmp/foo.ini', ) } end context 'on a Windows platform', if: Puppet::Util::Platform.windows? do let(:facts) do - { 'osfamily' => 'windows' } + { 'os' => { 'family' => 'windows' } end it { is_expected.to compile } end end diff --git a/spec/fixtures/create_ini_settings_test/manifests/init.pp b/spec/fixtures/create_ini_settings_test/manifests/init.pp index 8e6daf9..9741eb8 100644 --- a/spec/fixtures/create_ini_settings_test/manifests/init.pp +++ b/spec/fixtures/create_ini_settings_test/manifests/init.pp @@ -1,17 +1,17 @@ # simple test class class create_ini_settings_test { - $settings = { section1 => { - setting1 => val1 + $settings = { section1 => { + setting1 => val1, }, section2 => { setting2 => val2, setting3 => { - ensure => absent - } - } + ensure => absent, + }, + }, } $defaults = { - path => '/tmp/foo.ini' + path => '/tmp/foo.ini', } create_ini_settings($settings,$defaults) } diff --git a/spec/fixtures/create_multiple_ini_settings/manifests/init.pp b/spec/fixtures/create_multiple_ini_settings/manifests/init.pp index 25f553d..890a75f 100644 --- a/spec/fixtures/create_multiple_ini_settings/manifests/init.pp +++ b/spec/fixtures/create_multiple_ini_settings/manifests/init.pp @@ -1,19 +1,19 @@ # Manifest creating multiple ini_settings class create_multiple_ini_settings { - if $facts['osfamily'] == 'windows' { + if $facts['os']['family'] == 'windows' { $defaults = { 'path' => 'C:/tmp/foo.ini' } } else { $defaults = { 'path' => '/tmp/foo.ini' } } $example = { 'section1' => { 'setting1' => 'value1', 'setting2' => { - 'ensure' => 'absent' - } - } + 'ensure' => 'absent', + }, + }, } inifile::create_ini_settings($example, $defaults) }