Fix spec tests for RSpec 3.x and Puppet 4.x

Remove value testing (we only check the key here), the value is nil or undef
and fix resource array, according[1].

[1]https://github.com/puppetlabs/puppet/blob/3.7.5/lib/puppet/resource.rb#L446-L453

Change-Id: Ic7a9b9d1e6d6b6b1c40fbce40d0bf9ff913f191e
Closes-bug: #1447620

spec/classes/swift_keystone_auth_spec.rb

@@ -93,7 +93,7 @@ describe 'swift::keystone::auth' do
 
     it { is_expected.to contain_keystone_user_role("#{p[:auth_name]}@#{p[:tenant]}").with(
       :ensure  => 'present',
-      :roles   => 'admin',
+      :roles   => ['admin'],
     )}
 
     it { is_expected.to contain_keystone_service(p[:auth_name]).with(

spec/classes/swift_proxy_ceilometer_spec.rb

@@ -22,7 +22,11 @@ describe 'swift::proxy::ceilometer' do
 
   it { is_expected.to contain_file(fragment_file).with_content(/[filter:ceilometer]/) }
   it { is_expected.to contain_file(fragment_file).with_content(/use = egg:ceilometer#swift/) }
-  it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[::Ceilometer]') }
+  if Puppet.version.to_f < 4.0
+    it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[::Ceilometer]')}
+  else
+    it { is_expected.to contain_concat__fragment('swift_ceilometer').with_require('Class[Ceilometer]')}
+  end
   it { is_expected.to contain_user('swift').with_groups('ceilometer') }
   it { is_expected.to contain_file('/var/log/ceilometer/swift-proxy-server.log').with(:owner => 'swift', :group => 'swift', :mode => '0664') }
 

spec/classes/swift_proxy_spec.rb

@@ -125,9 +125,11 @@ describe 'swift::proxy' do
             ]
           )
         end
-        it { is_expected.to contain_concat__fragment('swift_proxy').with_before(
+        if Puppet.version.to_f < 4.0
-          'Class[Swift::Proxy::Swauth]'
+          it { is_expected.to contain_concat__fragment('swift_proxy').with_before('Class[Swift::Proxy::Swauth]')}
-        )}
+        else
+          it { is_expected.to contain_concat__fragment('swift_proxy').with_before(['Class[Swift::Proxy::Swauth]'])}
+        end
        end
       describe "when log udp port is set" do
         context 'and log_udp_host is not set' do

spec/classes/swift_ringbuilder_spec.rb

@@ -76,22 +76,22 @@ describe 'swift::ringbuilder' do
 
       it 'should set up all of the correct dependencies' do
         is_expected.to contain_swift__ringbuilder__create('object').with(
-          {:before => 'Ring_object_device[127.0.0.1:6000/1]'}
+          {:before => ['Ring_object_device[127.0.0.1:6000/1]']}
         )
         is_expected.to contain_swift__ringbuilder__create('container').with(
-        {:before => 'Ring_container_device[127.0.0.1:6001/1]'}
+        {:before => ['Ring_container_device[127.0.0.1:6001/1]']}
         )
         is_expected.to contain_swift__ringbuilder__create('account').with(
-        {:before => 'Ring_account_device[127.0.0.1:6002/1]'}
+        {:before => ['Ring_account_device[127.0.0.1:6002/1]']}
         )
         is_expected.to contain_ring_object_device('127.0.0.1:6000/1').with(
-        {:notify => 'Swift::Ringbuilder::Rebalance[object]'}
+        {:notify => ['Swift::Ringbuilder::Rebalance[object]']}
         )
         is_expected.to contain_ring_container_device('127.0.0.1:6001/1').with(
-        {:notify => 'Swift::Ringbuilder::Rebalance[container]'}
+        {:notify => ['Swift::Ringbuilder::Rebalance[container]']}
         )
         is_expected.to contain_ring_account_device('127.0.0.1:6002/1').with(
-        {:notify => 'Swift::Ringbuilder::Rebalance[account]'}
+        {:notify => ['Swift::Ringbuilder::Rebalance[account]']}
         )
       end
     end

spec/classes/swift_storage_all_spec.rb

@@ -84,17 +84,17 @@ describe 'swift::storage::all' do
       it { is_expected.to contain_swift__storage__server(param_hash[:account_port]).with(
         {:type => 'account',
          :config_file_path => 'account-server.conf',
-         :pipeline => param_hash[:account_pipeline] || 'account-server' }.merge(storage_server_defaults)
+         :pipeline => param_hash[:account_pipeline] || ['account-server'] }.merge(storage_server_defaults)
       )}
       it { is_expected.to contain_swift__storage__server(param_hash[:object_port]).with(
         {:type => 'object',
          :config_file_path => 'object-server.conf',
-         :pipeline => param_hash[:object_pipeline] || 'object-server' }.merge(storage_server_defaults)
+         :pipeline => param_hash[:object_pipeline] || ['object-server'] }.merge(storage_server_defaults)
       )}
       it { is_expected.to contain_swift__storage__server(param_hash[:container_port]).with(
         {:type => 'container',
          :config_file_path => 'container-server.conf',
-         :pipeline => param_hash[:container_pipeline] || 'container-server',
+         :pipeline => param_hash[:container_pipeline] || ['container-server'],
          :allow_versions => param_hash[:allow_versions] || false }.merge(storage_server_defaults)
       )}
 

spec/defines/swift_ringbuilder_create_spec.rb

@@ -31,7 +31,7 @@ describe 'swift::ringbuilder::create' do
 
             it { is_expected.to 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 { is_expected.to contain_exec("rebalance_#{type}").with(
           {:command     => "swift-ring-builder /etc/swift/#{type}.builder rebalance",
-           :path        => '/usr/bin',
+           :path        => ['/usr/bin'],
            :refreshonly => true}
         )}
       end
@@ -23,7 +23,7 @@ describe 'swift::ringbuilder::rebalance' do
     end
     it { is_expected.to contain_exec("rebalance_object").with(
       {:command     => "swift-ring-builder /etc/swift/object.builder rebalance 999",
-       :path        => '/usr/bin',
+       :path        => ['/usr/bin'],
        :refreshonly => true}
     )}
   end