X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fpick_default_spec.rb;h=29d78965867baf96285fbfecfff5d4eef74b9c70;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=db10cc3547b11c8464219323c7b9033bb7def759;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/pick_default_spec.rb b/3rdparty/modules/stdlib/spec/functions/pick_default_spec.rb
old mode 100755
new mode 100644
index db10cc354..29d789658
--- a/3rdparty/modules/stdlib/spec/functions/pick_default_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/pick_default_spec.rb
@@ -1,58 +1,40 @@
-#!/usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-describe "the pick_default function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("pick_default")).to eq("function_pick_default")
-  end
-
-  it 'should return the correct value' do
-    expect(scope.function_pick_default(['first', 'second'])).to eq('first')
-  end
-
-  it 'should return the correct value if the first value is empty' do
-    expect(scope.function_pick_default(['', 'second'])).to eq('second')
-  end
-
-  it 'should skip empty string values' do
-    expect(scope.function_pick_default(['', 'first'])).to eq('first')
-  end
-
-  it 'should skip :undef values' do
-    expect(scope.function_pick_default([:undef, 'first'])).to eq('first')
-  end
-
-  it 'should skip :undefined values' do
-    expect(scope.function_pick_default([:undefined, 'first'])).to eq('first')
-  end
-
-  it 'should return the empty string if it is the last possibility' do
-    expect(scope.function_pick_default([:undef, :undefined, ''])).to eq('')
-  end
-
-  it 'should return :undef if it is the last possibility' do
-    expect(scope.function_pick_default(['', :undefined, :undef])).to eq(:undef)
-  end
-
-  it 'should return :undefined if it is the last possibility' do
-    expect(scope.function_pick_default([:undef, '', :undefined])).to eq(:undefined)
-  end
-
-  it 'should return the empty string if it is the only possibility' do
-    expect(scope.function_pick_default([''])).to eq('')
-  end
-
-  it 'should return :undef if it is the only possibility' do
-    expect(scope.function_pick_default([:undef])).to eq(:undef)
-  end
-
-  it 'should return :undefined if it is the only possibility' do
-    expect(scope.function_pick_default([:undefined])).to eq(:undefined)
-  end
-
-  it 'should error if no values are passed' do
-    expect { scope.function_pick_default([]) }.to raise_error(Puppet::Error, /Must receive at least one argument./)
+describe 'pick_default' do
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_raise_error(RuntimeError, %r{Must receive at least one argument}) }
+
+  it { is_expected.to run.with_params('one', 'two').and_return('one') }
+  it { is_expected.to run.with_params('ớņệ', 'ťωơ').and_return('ớņệ') }
+  it { is_expected.to run.with_params('', 'two').and_return('two') }
+  it { is_expected.to run.with_params(:undef, 'two').and_return('two') }
+  it { is_expected.to run.with_params(:undefined, 'two').and_return('two') }
+  it { is_expected.to run.with_params(nil, 'two').and_return('two') }
+
+  ['', :undef, :undefined, nil, {}, [], 1, 'default'].each do |value|
+    describe "when providing #{value.inspect} as default" do
+      it { is_expected.to run.with_params('one', value).and_return('one') }
+      it { is_expected.to run.with_params('ớņệ', value).and_return('ớņệ') }
+      it { is_expected.to run.with_params([], value).and_return([]) }
+      it { is_expected.to run.with_params({}, value).and_return({}) }
+      it { is_expected.to run.with_params(value, value).and_return(mapped_value(value)) }
+      it { is_expected.to run.with_params(:undef, value).and_return(mapped_value(value)) }
+      it { is_expected.to run.with_params(:undefined, value).and_return(mapped_value(value)) }
+      it { is_expected.to run.with_params(nil, value).and_return(mapped_value(value)) }
+    end
+  end
+
+  if Puppet::Util::Package.versioncmp(Puppet.version, '6.0.0') < 0 ||
+     Puppet::Util::Package.versioncmp(Puppet.version, '5.5.7') == 0
+    def mapped_value(v)
+      v
+    end
+  else
+    def mapped_value(v)
+      # Puppet 6.0.0 will always map arguments the same way as the Puppet Language
+      # even if function is called from Ruby via call_function
+      # The 3x function API expects nil and :undef to be represented as empty string
+      (v.nil? || v == :undef) ? '' : v
+    end
   end
 end