X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fempty_spec.rb;h=c6bf1e44aa8983a5a6c96cebd3f93e1fba5d45b9;hb=7c041353f4da829d409830eba2e95946952e817f;hp=6a97c4cd3ba073fab1fded6d2e3a6749a8e1ba18;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/empty_spec.rb b/3rdparty/modules/stdlib/spec/functions/empty_spec.rb
old mode 100755
new mode 100644
index 6a97c4cd3..c6bf1e44a
--- a/3rdparty/modules/stdlib/spec/functions/empty_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/empty_spec.rb
@@ -1,32 +1,22 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-describe "the empty function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("empty")).to eq("function_empty")
-  end
+describe 'empty', :if => Puppet::Util::Package.versioncmp(Puppet.version, '5.5.0') < 0 do
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError) }
+  it {
+    pending('Current implementation ignores parameters after the first.')
+    is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError)
+  }
+  it { is_expected.to run.with_params(0).and_return(false) }
+  it { is_expected.to run.with_params('').and_return(true) }
+  it { is_expected.to run.with_params('one').and_return(false) }
 
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_empty([]) }.to( raise_error(Puppet::ParseError))
-  end
+  it { is_expected.to run.with_params(AlsoString.new('')).and_return(true) }
+  it { is_expected.to run.with_params(AlsoString.new('one')).and_return(false) }
 
-  it "should return a true for an empty string" do
-    result = scope.function_empty([''])
-    expect(result).to(eq(true))
-  end
+  it { is_expected.to run.with_params([]).and_return(true) }
+  it { is_expected.to run.with_params(['one']).and_return(false) }
 
-  it "should return a false for a non-empty string" do
-    result = scope.function_empty(['asdf'])
-    expect(result).to(eq(false))
-  end
-
-  it "should accept objects which extend String" do
-    class AlsoString < String
-    end
-
-    value = AlsoString.new()
-    result = scope.function_empty([value])
-    result.should(eq(true))
-  end
+  it { is_expected.to run.with_params({}).and_return(true) }
+  it { is_expected.to run.with_params('key' => 'value').and_return(false) }
 end