diff options
author | Morgan Haskel <morgan@puppetlabs.com> | 2014-06-05 16:16:34 -0400 |
---|---|---|
committer | Morgan Haskel <morgan@puppetlabs.com> | 2014-06-05 16:16:34 -0400 |
commit | ffe21fc67491c4502114505c82142781d72720ab (patch) | |
tree | 7f0ee09079863a19f07e0bb999e387eedb32e17e /spec/functions/has_key_spec.rb | |
parent | f9f6e92dffa8364cfbbd92a6a65f4be4ef176d2c (diff) | |
parent | 6287a200af558d277f83b919e8409f6c798eef39 (diff) | |
download | puppet-stdlib-ffe21fc67491c4502114505c82142781d72720ab.tar.gz puppet-stdlib-ffe21fc67491c4502114505c82142781d72720ab.tar.bz2 |
Merge pull request #268 from apenney/rspec3
Rspec3 changes
Diffstat (limited to 'spec/functions/has_key_spec.rb')
-rwxr-xr-x | spec/functions/has_key_spec.rb | 10 |
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 |