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

diff --git a/3rdparty/modules/stdlib/spec/acceptance/zip_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/zip_spec.rb
old mode 100755
new mode 100644
index ae2289633..57adfa7a8
--- a/3rdparty/modules/stdlib/spec/acceptance/zip_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/zip_spec.rb
@@ -1,67 +1,71 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
 describe 'zip function' do
   describe 'success' do
-    it 'zips two arrays of numbers together' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $one = [1,2,3,4]
       $two = [5,6,7,8]
       $output = zip($one,$two)
       notice(inline_template('<%= @output.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, 5\], \[2, 6\], \[3, 7\], \[4, 8\]\]/)
+    DOC
+    it 'zips two arrays of numbers together' do
+      expect(apply_manifest(pp1, :catch_failures => true).stdout).to match(%r{\[\[1, 5\], \[2, 6\], \[3, 7\], \[4, 8\]\]})
     end
-    it 'zips two arrays of numbers & bools together' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $one = [1,2,"three",4]
       $two = [true,true,false,false]
       $output = zip($one,$two)
       notice(inline_template('<%= @output.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, true\], \[2, true\], \["three", false\], \[4, false\]\]/)
+    DOC
+    it 'zips two arrays of numbers & bools together' do
+      expect(apply_manifest(pp2, :catch_failures => true).stdout).to match(%r{\[\[1, true\], \[2, true\], \["three", false\], \[4, false\]\]})
     end
-    it 'zips two arrays of numbers together and flattens them' do
-      # XXX This only tests the argument `true`, even though the following are valid:
-      # 1 t y true yes
-      # 0 f n false no
-      # undef undefined
-      pp = <<-EOS
+
+    # XXX This only tests the argument `true`, even though the following are valid:
+    # 1 t y true yes
+    # 0 f n false no
+    # undef undefined
+    pp3 = <<-DOC
       $one = [1,2,3,4]
       $two = [5,6,7,8]
       $output = zip($one,$two,true)
       notice(inline_template('<%= @output.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[1, 5, 2, 6, 3, 7, 4, 8\]/)
+    DOC
+    it 'zips two arrays of numbers together and flattens them' do
+      expect(apply_manifest(pp3, :catch_failures => true).stdout).to match(%r{\[1, 5, 2, 6, 3, 7, 4, 8\]})
     end
-    it 'handles unmatched length' do
-      # XXX Is this expected behavior?
-      pp = <<-EOS
+
+    # XXX Is this expected behavior?
+    pp4 = <<-DOC
       $one = [1,2]
       $two = [5,6,7,8]
       $output = zip($one,$two)
       notice(inline_template('<%= @output.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, 5\], \[2, 6\]\]/)
+    DOC
+    it 'handles unmatched length' do
+      expect(apply_manifest(pp4, :catch_failures => true).stdout).to match(%r{\[\[1, 5\], \[2, 6\]\]})
     end
   end
+
   describe 'failure' do
-    it 'handles improper number of arguments' do
-      pp = <<-EOS
+    pp5 = <<-DOC
       $one = [1,2]
       $output = zip($one)
       notice(inline_template('<%= @output.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Wrong number of arguments/)
+    DOC
+    it 'handles improper number of arguments' do
+      expect(apply_manifest(pp5, :expect_failures => true).stderr).to match(%r{Wrong number of arguments})
     end
-    it 'handles improper argument types' do
-      pp = <<-EOS
+
+    pp6 = <<-DOC
       $one = "a string"
       $two = [5,6,7,8]
       $output = zip($one,$two)
       notice(inline_template('<%= @output.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Requires array/)
+    DOC
+    it 'handles improper argument types' do
+      expect(apply_manifest(pp6, :expect_failures => true).stderr).to match(%r{Requires array})
     end
   end
 end