X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Funit%2Ffacter%2Fpe_version_spec.rb;h=d74a5c385132b37877ec2dfa9963c132d0bb1a52;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=c11a1cd096965f8f60ada630186cbc24e78b1f76;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/unit/facter/pe_version_spec.rb b/3rdparty/modules/stdlib/spec/unit/facter/pe_version_spec.rb
old mode 100755
new mode 100644
index c11a1cd09..d74a5c385
--- a/3rdparty/modules/stdlib/spec/unit/facter/pe_version_spec.rb
+++ b/3rdparty/modules/stdlib/spec/unit/facter/pe_version_spec.rb
@@ -1,8 +1,6 @@
-#!/usr/bin/env rspec
-
 require 'spec_helper'
 
-describe "PE Version specs" do
+describe 'PE Version specs' do
   before :each do
     # Explicitly load the pe_version.rb file which contains generated facts
     # that cannot be automatically loaded.  Puppet 2.x implements
@@ -14,29 +12,32 @@ describe "PE Version specs" do
       Facter.collection.loader.load(:pe_version)
     end
   end
-  
-  context "When puppetversion is nil" do
+
+  context 'when puppetversion is nil' do
     before :each do
-      Facter.fact(:puppetversion).stubs(:value).returns(nil)
+      allow(Facter.fact(:puppetversion)).to receive(:value).and_return(nil)
     end
-    
-    it "pe_version is nil" do
+
+    it 'puppetversion is nil' do
       expect(Facter.fact(:puppetversion).value).to be_nil
+    end
+
+    it 'pe_version is nil' do
       expect(Facter.fact(:pe_version).value).to be_nil
     end
   end
 
-  context "If PE is installed" do
-    %w{ 2.6.1 2.10.300 }.each do |version|
+  context 'when PE is installed' do
+    ['2.6.1', '2.10.300'].each do |version|
       puppetversion = "2.7.19 (Puppet Enterprise #{version})"
       context "puppetversion => #{puppetversion}" do
         before :each do
-          Facter.fact(:puppetversion).stubs(:value).returns(puppetversion)
+          allow(Facter.fact(:puppetversion)).to receive(:value).and_return(puppetversion)
         end
 
-        (major,minor,patch) = version.split(".")
+        (major, minor, patch) = version.split('.')
 
-        it "Should return true" do
+        it 'returns true' do
           expect(Facter.fact(:is_pe).value).to eq(true)
         end
 
@@ -59,30 +60,29 @@ describe "PE Version specs" do
     end
   end
 
-  context "When PE is not installed" do
+  context 'when PE is not installed' do
     before :each do
-      Facter.fact(:puppetversion).stubs(:value).returns("2.7.19")
+      allow(Facter.fact(:puppetversion)).to receive(:value).and_return('2.7.19')
     end
 
-    it "is_pe is false" do
+    it 'is_pe is false' do
       expect(Facter.fact(:is_pe).value).to eq(false)
     end
 
-    it "pe_version is nil" do
+    it 'pe_version is nil' do
       expect(Facter.fact(:pe_version).value).to be_nil
     end
 
-    it "pe_major_version is nil" do
+    it 'pe_major_version is nil' do
       expect(Facter.fact(:pe_major_version).value).to be_nil
     end
 
-    it "pe_minor_version is nil" do
+    it 'pe_minor_version is nil' do
       expect(Facter.fact(:pe_minor_version).value).to be_nil
     end
 
-    it "Should have a patch version" do
+    it 'has a patch version' do
       expect(Facter.fact(:pe_patch_version).value).to be_nil
     end
   end
-
 end