Merge branch 'master' into 4.3.x

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/functions/has_key_spec.rb b/spec/functions/has_key_spec.rb
index 490daea..6b71800 100755
--- a/spec/functions/has_key_spec.rb
+++ b/spec/functions/has_key_spec.rb
@@ -6,7 +6,7 @@ describe Puppet::Parser::Functions.function(:has_key) do
 
   describe 'when calling has_key from puppet' do
     it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      skip("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
       Puppet[:code] = '$x = has_key()'
       expect {
         scope.compiler.compile
@@ -14,7 +14,7 @@ describe Puppet::Parser::Functions.function(:has_key) do
     end
 
     it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      skip("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
       Puppet[:code] = "$x = has_key('foo')"
       expect {
         scope.compiler.compile
@@ -22,7 +22,7 @@ describe Puppet::Parser::Functions.function(:has_key) do
     end
 
     it "should require the first value to be a Hash" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
+      skip("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
       Puppet[:code] = "$x = has_key('foo', 'bar')"
       expect {
         scope.compiler.compile
@@ -32,11 +32,11 @@ describe Puppet::Parser::Functions.function(:has_key) do
 
   describe 'when calling the function has_key from a scope instance' do
     it 'should detect existing keys' do
-      scope.function_has_key([{'one' => 1}, 'one']).should be_true
+      expect(scope.function_has_key([{'one' => 1}, 'one'])).to be_truthy
     end
 
     it 'should detect existing keys' do
-      scope.function_has_key([{'one' => 1}, 'two']).should be_false
+      expect(scope.function_has_key([{'one' => 1}, 'two'])).to be_falsey
     end
   end
 end