Merge pull request #19 from branan/fix_spec_tests

Fix spec tests

spec/classes/swift_proxy_cache_spec.rb

@@ -6,7 +6,8 @@ describe 'swift::proxy::cache' do
     {
       :operatingsystem => 'Ubuntu',
       :osfamily        => 'Debian',
-      :processorcount  => 1
+      :processorcount  => 1,
+      :concat_basedir  => '/var/lib/puppet/concat',
     }
   end
 

spec/classes/swift_proxy_healthcheck_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe 'swift::proxy::healthcheck' do
 
+  let :facts do
+    {
+      :concat_basedir => '/var/lib/puppet/concat'
+    }
+  end
+
   let :pre_condition do
     'class { "concat::setup": }
      concat { "/etc/swift/proxy-server.conf": }'

spec/classes/swift_proxy_keystone_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe 'swift::proxy::keystone' do
 
+  let :facts do
+    {
+      :concat_basedir => '/var/lib/puppet/concat',
+    }
+  end
+
   let :fragment_file do
     '/var/lib/puppet/concat/_etc_swift_proxy-server.conf/fragments/79_swift_keystone'
   end

spec/classes/swift_proxy_spec.rb

@@ -14,7 +14,8 @@ describe 'swift::proxy' do
   let :facts do
     {:operatingsystem => 'Ubuntu',
      :osfamily        => 'Debian',
-     :processorcount  => 1
+     :processorcount  => 1,
+     :concat_basedir  => '/var/lib/puppet/concat',
     }
   end
 

spec/classes/swift_proxy_swauth_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe 'swift::proxy::swauth' do
 
+  let :facts do
+    {
+      :concat_basedir => '/var/lib/puppet/concat'
+    }
+  end
+
   let :pre_condition do
     'class { "concat::setup": }
      concat { "/etc/swift/proxy-server.conf": }'

spec/defines/swift_ringbuilder_create_spec.rb

@@ -31,7 +31,7 @@ describe 'swift::ringbuilder::create' do
 
             it { should contain_exec("create_#{type}").with(
               {:command => "swift-ring-builder /etc/swift/#{type}.builder create #{param_hash[:part_power]} #{param_hash[:replicas]} #{param_hash[:min_part_hours]}",
-               :path    => ['/usr/bin'],
+               :path    => '/usr/bin',
                :creates => "/etc/swift/#{type}.builder" }
             )}
           end

spec/defines/swift_ringbuilder_rebalance_spec.rb

@@ -8,7 +8,7 @@ describe 'swift::ringbuilder::rebalance' do
         end
         it { should contain_exec("rebalance_#{type}").with(
           {:command     => "swift-ring-builder /etc/swift/#{type}.builder rebalance",
-           :path        => ['/usr/bin'],
+           :path        => '/usr/bin',
            :refreshonly => true}
         )}
       end

spec/defines/swift_storage_server_spec.rb

@@ -5,7 +5,8 @@ describe 'swift::storage::server' do
     {
       :operatingsystem => 'Ubuntu',
       :osfamily        => 'Debian',
-      :processorcount  => 1
+      :processorcount  => 1,
+      :concat_basedir  => '/var/lib/puppet/concat',
     }
 
   end

spec/defines/swift_storage_xfs_spec.rb

@@ -35,7 +35,7 @@ describe 'swift::storage::xfs' do
 
         it { should contain_exec("mkfs-foo").with(
           :command     => "mkfs.xfs -i size=#{param_hash[:byte_size]} #{param_hash[:device]}",
-          :path        => ['/sbin/'],
+          :path        => '/sbin/',
           :refreshonly => true,
           :require     => 'Package[xfsprogs]'
         )}