X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fdirname_spec.rb;h=c494915ed2e37c4bfbd28eedfbb3042de846a260;hb=6963202b4b62c2816655ac9532521b018fdf83bd;hp=4261144ec7ee549159c3f19eb6d515e545fbc766;hpb=a69999e580f8b3abd12446c2d6ad59e517651813;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/dirname_spec.rb b/3rdparty/modules/stdlib/spec/functions/dirname_spec.rb
index 4261144ec..c494915ed 100755
--- a/3rdparty/modules/stdlib/spec/functions/dirname_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/dirname_spec.rb
@@ -1,38 +1,18 @@
-#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-describe "the dirname function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+describe 'dirname' do
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params('/path/to/a/file.ext', []).and_raise_error(Puppet::ParseError) }
+  it { is_expected.to run.with_params('/path/to/a/file.ext').and_return('/path/to/a') }
+  it { is_expected.to run.with_params('relative_path/to/a/file.ext').and_return('relative_path/to/a') }
 
-  it "should exist" do
-    expect(Puppet::Parser::Functions.function("dirname")).to eq("function_dirname")
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_dirname([]) }.to( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is more than 1 argument" do
-    expect { scope.function_dirname(['a', 'b']) }.to( raise_error(Puppet::ParseError))
-  end
-
-  it "should return dirname for an absolute path" do
-    result = scope.function_dirname(['/path/to/a/file.ext'])
-    expect(result).to(eq('/path/to/a'))
-  end
-
-  it "should return dirname for a relative path" do
-    result = scope.function_dirname(['path/to/a/file.ext'])
-    expect(result).to(eq('path/to/a'))
-  end
-
-  it "should complain about hash argument" do
-    expect { scope.function_dirname([{}]) }.to( raise_error(Puppet::ParseError))
-  end
-  it "should complain about list argument" do
-    expect { scope.function_dirname([[]]) }.to( raise_error(Puppet::ParseError))
-  end
-  it "should complain about numeric argument" do
-    expect { scope.function_dirname([2112]) }.to( raise_error(Puppet::ParseError))
+  context 'should run with UTF8 and double byte characters' do
+    it { is_expected.to run.with_params('scheme:///√ạĺűē/竹.ext').and_return('scheme:///√ạĺűē') }
+    it { is_expected.to run.with_params('ҝẽγ:/√ạĺűē/竹.ㄘ').and_return('ҝẽγ:/√ạĺűē') }
   end
 end