X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Frabbitmq%2Fspec%2Facceptance%2Fserver_spec.rb;h=5ac29bfee04fee506e521dee52d0405ed3dbd264;hb=921e69100a563cf143f56a3905d8362336d939ff;hp=d99f995db53fc4ff8f4f8b91ac7a570ab9a444ee;hpb=b54f52d2899c5785923c804fdfbba0782c147da4;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/spec/acceptance/server_spec.rb b/3rdparty/modules/rabbitmq/spec/acceptance/server_spec.rb
index d99f995db..5ac29bfee 100644
--- a/3rdparty/modules/rabbitmq/spec/acceptance/server_spec.rb
+++ b/3rdparty/modules/rabbitmq/spec/acceptance/server_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper_acceptance'
 
 describe 'rabbitmq server:' do
-  case fact('osfamily')
+  case fact('os.family')
   when 'RedHat'
     package_name = 'rabbitmq-server'
     service_name = 'rabbitmq-server'
@@ -16,57 +16,57 @@ describe 'rabbitmq server:' do
     service_name = 'rabbitmq'
   end
 
-  context "default class inclusion" do
-    it 'should run successfully' do
+  context 'default class inclusion' do
+    it 'runs successfully' do
       pp = <<-EOS
       class { 'rabbitmq::server': }
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         class { 'erlang': epel_enable => true}
         Class['erlang'] -> Class['rabbitmq::server']
       }
       EOS
 
       # Apply twice to ensure no errors the second time.
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_changes => true).exit_code).to be_zero
+      apply_manifest(pp, catch_failures: true)
+      expect(apply_manifest(pp, catch_changes: true).exit_code).to be_zero
     end
 
     describe package(package_name) do
-      it { should be_installed }      
+      it { is_expected.to be_installed }
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
   end
 
-  context "disable and stop service" do
-    it 'should run successfully' do
+  context 'disable and stop service' do
+    it 'runs successfully' do
       pp = <<-EOS
       class { 'rabbitmq::server':
         service_ensure => 'stopped',
       }
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         class { 'erlang': epel_enable => true}
         Class['erlang'] -> Class['rabbitmq::server']
       }
       EOS
 
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service(service_name) do
-      it { should_not be_enabled }
-      it { should_not be_running }
+      it { is_expected.not_to be_enabled }
+      it { is_expected.not_to be_running }
     end
   end
 
-  context "service is unmanaged" do
-    it 'should run successfully' do
+  context 'service is unmanaged' do
+    it 'runs successfully' do
       pp_pre = <<-EOS
       class { 'rabbitmq::server': }
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         class { 'erlang': epel_enable => true}
         Class['erlang'] -> Class['rabbitmq::server']
       }
@@ -77,20 +77,19 @@ describe 'rabbitmq server:' do
         service_manage => false,
         service_ensure  => 'stopped',
       }
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         class { 'erlang': epel_enable => true}
         Class['erlang'] -> Class['rabbitmq::server']
       }
       EOS
 
-      
-      apply_manifest(pp_pre, :catch_failures => true)
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp_pre, catch_failures: true)
+      apply_manifest(pp, catch_failures: true)
     end
 
     describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
     end
   end
 end