X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Facceptance%2Ftype_spec.rb;h=7b6e1fbb8560d621504b5cc899b0b87b6b094d79;hb=1dee729d00307f93d600b5bb6902494bd30a4484;hp=67e32480349275d7057501c9a1aae1e9961a0706;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/acceptance/type_spec.rb b/3rdparty/modules/stdlib/spec/acceptance/type_spec.rb
old mode 100755
new mode 100644
index 67e324803..7b6e1fbb8
--- a/3rdparty/modules/stdlib/spec/acceptance/type_spec.rb
+++ b/3rdparty/modules/stdlib/spec/acceptance/type_spec.rb
@@ -1,29 +1,27 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'type function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) || is_future_parser_enabled?) do
+describe 'type function' do
   describe 'success' do
-    it 'types arrays' do
-      pp = <<-EOS
+    pp1 = <<-DOC
       $a = ["the","public","art","galleries"]
       # Anagram: Large picture halls, I bet
       $o = type($a)
-      notice(inline_template('type is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/type is "array"/)
+      notice(inline_template('type is <%= @o.to_s %>'))
+    DOC
+    it 'types arrays' do
+      apply_manifest(pp1, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{type is Tuple\[String.*, String.*, String.*, String.*\]})
       end
     end
-    it 'types strings' do
-      pp = <<-EOS
+
+    pp2 = <<-DOC
       $a = "blowzy night-frumps vex'd jack q"
       $o = type($a)
-      notice(inline_template('type is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/type is "string"/)
+      notice(inline_template('type is <%= @o.to_s %>'))
+    DOC
+    it 'types strings' do
+      apply_manifest(pp2, :catch_failures => true) do |r|
+        expect(r.stdout).to match(%r{type is String})
       end
     end
     it 'types hashes'