X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fspec%2Facceptance%2Fclustering_spec.rb;fp=3rdparty%2Fmodules%2Frabbitmq%2Fspec%2Facceptance%2Fclustering_spec.rb;h=204eef0524758aa252acad51fba0d1299ee04ea3;hb=94a8783f522bbf2996cb8a59b977dea583e8b0c7;hp=438c65ba1a1a67979457a07b5b3b4745b899e6dc;hpb=e107504bce7d9b21cc301124fc7c39fdb0762374;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/spec/acceptance/clustering_spec.rb b/3rdparty/modules/rabbitmq/spec/acceptance/clustering_spec.rb
index 438c65ba1..204eef052 100644
--- a/3rdparty/modules/rabbitmq/spec/acceptance/clustering_spec.rb
+++ b/3rdparty/modules/rabbitmq/spec/acceptance/clustering_spec.rb
@@ -2,59 +2,58 @@ require 'spec_helper_acceptance'
 
 describe 'rabbitmq clustering' do
   context 'rabbitmq::wipe_db_on_cookie_change => false' do
-    it 'should run successfully' do
+    it 'runs successfully' do
       pp = <<-EOS
-      class { 'rabbitmq': 
+      class { 'rabbitmq':
         config_cluster           => true,
         cluster_nodes            => ['rabbit1', 'rabbit2'],
         cluster_node_type        => 'ram',
         erlang_cookie            => 'TESTCOOKIE',
         wipe_db_on_cookie_change => false,
       }
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         class { 'erlang': epel_enable => true}
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
 
-      apply_manifest(pp, :expect_failures => true)
+      apply_manifest(pp, expect_failures: true)
     end
 
     describe file('/var/lib/rabbitmq/.erlang.cookie') do
-      it { should_not contain 'TESTCOOKIE' }
+      it { is_expected.not_to contain 'TESTCOOKIE' }
     end
-
   end
   context 'rabbitmq::wipe_db_on_cookie_change => true' do
-    it 'should run successfully' do
+    it 'runs successfully' do
       pp = <<-EOS
-      class { 'rabbitmq': 
+      class { 'rabbitmq':
         config_cluster           => true,
         cluster_nodes            => ['rabbit1', 'rabbit2'],
         cluster_node_type        => 'ram',
         erlang_cookie            => 'TESTCOOKIE',
         wipe_db_on_cookie_change => true,
       }
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         class { 'erlang': epel_enable => true}
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
 
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe file('/etc/rabbitmq/rabbitmq.config') do
-      it { should be_file }
-      it { should contain 'cluster_nodes' }
-      it { should contain 'rabbit@rabbit1' }
-      it { should contain 'rabbit@rabbit2' }
-      it { should contain 'ram' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'cluster_nodes' }
+      it { is_expected.to contain 'rabbit@rabbit1' }
+      it { is_expected.to contain 'rabbit@rabbit2' }
+      it { is_expected.to contain 'ram' }
     end
 
     describe file('/var/lib/rabbitmq/.erlang.cookie') do
-      it { should be_file }
-      it { should contain 'TESTCOOKIE' }
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'TESTCOOKIE' }
     end
   end
 end