X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fchomp_spec.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Fchomp_spec.rb;h=7fe9b1bb515c5206335eb6f9dbf1946b6c39f40c;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=56e0876dabc70efc7691521724283e05eb2ce7d7;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/chomp_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/chomp_spec.rb
old mode 100755
new mode 100644
index 56e0876da..7fe9b1bb5
--- a/3rdparty/modules/stdlib/spec/acceptance/chomp_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/chomp_spec.rb
@@ -1,10 +1,8 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'chomp function' do
+describe 'chomp function', :if => Puppet::Util::Package.versioncmp(return_puppet_version, '6.0.0') < 0 do
   describe 'success' do
-    it 'should eat the newline' do
-      pp = <<-EOS
+    pp = <<-DOC
       $input = "test\n"
       if size($input) != 5 {
         fail("Size of ${input} is not 5.")
@@ -13,8 +11,8 @@ describe 'chomp function' do
       if size($output) != 4 {
         fail("Size of ${input} is not 4.")
       }
-      EOS
-
+    DOC
+    it 'eats the newline' do
       apply_manifest(pp, :catch_failures => true)
     end
   end