X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fdeprecation_spec.rb;h=9f25449406a2cba893f9d8e1d0a8362919983c7e;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=7a0b34c467f0dcf7a3766865e9d7f889b50503c5;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/deprecation_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/deprecation_spec.rb
index 7a0b34c46..9f2544940 100644
--- a/3rdparty/modules/stdlib/spec/acceptance/deprecation_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/deprecation_spec.rb
@@ -1,13 +1,11 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
 describe 'deprecation function' do
-
-  if fact('operatingsystem') == 'windows'
-    test_file = 'C:/deprecation'
-    else
-    test_file = "/tmp/deprecation"
-  end
+  test_file = if fact('operatingsystem') == 'windows'
+                'C:/deprecation'
+              else
+                '/tmp/deprecation'
+              end
 
   # It seems that Windows needs everything to be on one line when using puppet apply -e, otherwise the manifests would be in an easier format
   add_file_manifest = "\"deprecation('key', 'message') file { '#{test_file}': ensure => present, content => 'test', }\""
@@ -17,86 +15,78 @@ describe 'deprecation function' do
     apply_manifest(remove_file_manifest)
   end
 
-  context 'with --strict=error', if: get_puppet_version =~ /^4/ do
-    before :all do
-      @result = on(default, puppet('apply', '--strict=error', '-e', add_file_manifest), acceptable_exit_codes: (0...256))
-    end
+  context 'with --strict=error', :if => return_puppet_version =~ %r{^4} do
+    let(:result) { on(default, puppet('apply', '--strict=error', '-e', add_file_manifest), :acceptable_exit_codes => (0...256)) }
 
     after :all do
       apply_manifest(remove_file_manifest)
     end
 
-    it "should return an error" do
-      expect(@result.exit_code).to eq(1)
+    it 'returns an error' do
+      expect(result.exit_code).to eq(1)
     end
 
-    it "should show the error message" do
-      expect(@result.stderr).to match(/deprecation. key. message/)
+    it 'shows the error message' do
+      expect(result.stderr).to match(%r{deprecation. key. message})
     end
 
-    describe file("#{test_file}") do
+    describe file(test_file.to_s) do
       it { is_expected.not_to be_file }
     end
   end
 
-  context 'with --strict=warning', if: get_puppet_version =~ /^4/ do
-    before :all do
-      @result = on(default, puppet('apply', '--strict=warning', '-e', add_file_manifest), acceptable_exit_codes: (0...256))
-    end
+  context 'with --strict=warning', :if => return_puppet_version =~ %r{^4} do
+    let(:result) { on(default, puppet('apply', '--strict=warning', '-e', add_file_manifest), :acceptable_exit_codes => (0...256)) }
 
     after :all do
       apply_manifest(remove_file_manifest)
     end
 
-    it "should not return an error" do
-      expect(@result.exit_code).to eq(0)
+    it 'does not return an error' do
+      expect(result.exit_code).to eq(0)
     end
 
-    it "should show the error message" do
-      expect(@result.stderr).to match(/Warning: message/)
+    it 'shows the error message' do
+      expect(result.stderr).to match(%r{Warning: message})
     end
 
-    describe file("#{test_file}") do
+    describe file(test_file.to_s) do
       it { is_expected.to be_file }
     end
   end
 
-  context 'with --strict=off', if: get_puppet_version =~ /^4/ do
-    before :all do
-      @result = on(default, puppet('apply', '--strict=off', '-e', add_file_manifest), acceptable_exit_codes: (0...256))
-    end
+  context 'with --strict=off', :if => return_puppet_version =~ %r{^4} do
+    let(:result) { on(default, puppet('apply', '--strict=off', '-e', add_file_manifest), :acceptable_exit_codes => (0...256)) }
 
     after :all do
       apply_manifest(remove_file_manifest)
     end
 
-    it "should not return an error" do
-      expect(@result.exit_code).to eq(0)
+    it 'does not return an error' do
+      expect(result.exit_code).to eq(0)
     end
 
-    it "should not show the error message" do
-      expect(@result.stderr).not_to match(/Warning: message/)
+    it 'does not show the error message' do
+      expect(result.stderr).not_to match(%r{Warning: message})
     end
 
-    describe file("#{test_file}") do
+    describe file(test_file.to_s) do
       it { is_expected.to be_file }
     end
   end
 
-  context 'puppet 3 test', if: get_puppet_version =~ /^3/ do
-    before :all do
-      @result = on(default, puppet('apply', '--parser=future', '-e', add_file_manifest), acceptable_exit_codes: (0...256))
-    end
+  context 'puppet 3 test', :if => return_puppet_version =~ %r{^3} do
+    let(:result) { on(default, puppet('apply', '--parser=future', '-e', add_file_manifest), :acceptable_exit_codes => (0...256)) }
+
     after :all do
       apply_manifest(remove_file_manifest)
     end
 
-    it "should return a deprecation error" do
-      expect(@result.stderr).to match(/Warning: message/)
+    it 'returns a deprecation error' do
+      expect(result.stderr).to match(%r{Warning: message})
     end
-    it "should pass without error" do
-      expect(@result.exit_code).to eq(0)
+    it 'passes without error' do
+      expect(result.exit_code).to eq(0)
     end
   end
-
 end