From a837da8051c09ac77d84dd09175a03b6c3fd885e Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Tue, 24 Feb 2015 16:54:22 +0100 Subject: [PATCH] Pass the package name in the resource name instead of the argument The reason is that the name argument can not be an array --- manifests/init.pp | 9 +++------ spec/classes/init_spec.rb | 8 ++++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 1baa1d3..6e2aeb6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -50,19 +50,16 @@ } } - package{'git': + package{ $package: ensure => $ensure, - name => $package, } - package{'git-svn': + package{ $git::params::svn_package: ensure => $ensure_svn, - name => $git::params::svn_package, } - package{'git-gui': + package{ $git::params::gui_package: ensure => $ensure_gui, - name => $git::params::gui_package, } # Need to consider if this should happen or not. diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 98faaa9..dfc2069 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -90,7 +90,7 @@ end describe "with no parameters" do it { should contain_class('git::params') } - it { should contain_package('git').with( + it { should contain_package('git-core').with( 'ensure' => 'installed', 'name' => 'git-core' ) } @@ -137,7 +137,11 @@ it { should contain_class('git::params') } it { should contain_package('git').with( 'ensure' => 'installed', - 'name' => ['git', 'git-core'] + 'name' => 'git' + ) } + it { should contain_package('git-core').with( + 'ensure' => 'installed', + 'name' => 'git-core' ) } end end