summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Carlisle <patrick@puppetlabs.com>2012-08-09 15:22:13 -0700
committerPatrick Carlisle <patrick@puppetlabs.com>2012-08-09 15:22:13 -0700
commit659704831ee9a4d3c83410010884405bdfde7e89 (patch)
tree0f9ba027b4f363b23ac3178120b40db567619ec8
parent15e13fb6b93347003aa3d3666baf531be0472418 (diff)
parentcdd45298337df80aad757e81eb7457317219c1b7 (diff)
downloadpuppet-stdlib-659704831ee9a4d3c83410010884405bdfde7e89.tar.gz
puppet-stdlib-659704831ee9a4d3c83410010884405bdfde7e89.tar.bz2
Merge branch '2.4.x'
* 2.4.x: Make sure functions are loaded for each test Use rvalue functions correctly (#2157) Make facts_dot_d compatible with external facts Conflicts: lib/facter/facter_dot_d.rb
-rw-r--r--spec/unit/puppet/parser/functions/getvar_spec.rb14
-rw-r--r--spec/unit/puppet/parser/functions/has_key_spec.rb22
-rw-r--r--spec/unit/puppet/parser/functions/merge_spec.rb12
-rw-r--r--spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb8
-rw-r--r--spec/unit/puppet/parser/functions/validate_re_spec.rb4
5 files changed, 42 insertions, 18 deletions
diff --git a/spec/unit/puppet/parser/functions/getvar_spec.rb b/spec/unit/puppet/parser/functions/getvar_spec.rb
index 62ad192..a8aeec1 100644
--- a/spec/unit/puppet/parser/functions/getvar_spec.rb
+++ b/spec/unit/puppet/parser/functions/getvar_spec.rb
@@ -6,16 +6,20 @@ describe Puppet::Parser::Functions.function(:getvar) do
describe 'when calling getvar from puppet' do
it "should not compile when no arguments are passed" do
- Puppet[:code] = 'getvar()'
- expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+ Puppet[:code] = '$foo = getvar()'
+ expect {
+ scope.compiler.compile
+ }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
end
+
it "should not compile when too many arguments are passed" do
- Puppet[:code] = 'getvar("foo::bar", "baz")'
- expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+ Puppet[:code] = '$foo = getvar("foo::bar", "baz")'
+ expect {
+ scope.compiler.compile
+ }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
end
it "should lookup variables in other namespaces" do
- pending "Puppet doesn't appear to think getvar is an rvalue function... BUG?"
Puppet[:code] = <<-'ENDofPUPPETcode'
class site::data { $foo = 'baz' }
include site::data
diff --git a/spec/unit/puppet/parser/functions/has_key_spec.rb b/spec/unit/puppet/parser/functions/has_key_spec.rb
index ae5baf7..b1eb0ff 100644
--- a/spec/unit/puppet/parser/functions/has_key_spec.rb
+++ b/spec/unit/puppet/parser/functions/has_key_spec.rb
@@ -6,22 +6,32 @@ 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
- Puppet[:code] = 'has_key()'
- expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+ Puppet[:code] = '$x = has_key()'
+ expect {
+ scope.compiler.compile
+ }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
end
+
it "should not compile when 1 argument is passed" do
- Puppet[:code] = "has_key('foo')"
- expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+ Puppet[:code] = "$x = has_key('foo')"
+ expect {
+ scope.compiler.compile
+ }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
end
+
it "should require the first value to be a Hash" do
- Puppet[:code] = "has_key('foo', 'bar')"
- expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /expects the first argument to be a hash/)
+ Puppet[:code] = "$x = has_key('foo', 'bar')"
+ expect {
+ scope.compiler.compile
+ }.to raise_error(Puppet::ParseError, /expects the first argument to be a hash/)
end
end
+
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
end
+
it 'should detect existing keys' do
scope.function_has_key([{'one' => 1}, 'two']).should be_false
end
diff --git a/spec/unit/puppet/parser/functions/merge_spec.rb b/spec/unit/puppet/parser/functions/merge_spec.rb
index 9e8a619..192da4c 100644
--- a/spec/unit/puppet/parser/functions/merge_spec.rb
+++ b/spec/unit/puppet/parser/functions/merge_spec.rb
@@ -7,12 +7,16 @@ describe Puppet::Parser::Functions.function(:merge) do
describe 'when calling merge from puppet' do
it "should not compile when no arguments are passed" do
- Puppet[:code] = 'merge()'
- expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+ Puppet[:code] = '$x = merge()'
+ expect {
+ scope.compiler.compile
+ }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
end
it "should not compile when 1 argument is passed" do
- Puppet[:code] = "$my_hash={'one' => 1}\nmerge($my_hash)"
- expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+ Puppet[:code] = "$my_hash={'one' => 1}\n$x = merge($my_hash)"
+ expect {
+ scope.compiler.compile
+ }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
end
end
describe 'when calling merge on the scope instance' do
diff --git a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb
index 9d66fcb..08aaf78 100644
--- a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb
+++ b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb
@@ -3,8 +3,12 @@ require 'spec_helper'
describe Puppet::Parser::Functions.function(:validate_absolute_path) do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
- # The subject of these examplres is the method itself.
- subject() { scope.method(:function_validate_absolute_path) }
+ # The subject of these examples is the method itself.
+ subject do
+ # This makes sure the function is loaded within each test
+ function_name = Puppet::Parser::Functions.function(:validate_absolute_path)
+ scope.method(function_name)
+ end
describe "Valid Paths" do
def self.valid_paths
diff --git a/spec/unit/puppet/parser/functions/validate_re_spec.rb b/spec/unit/puppet/parser/functions/validate_re_spec.rb
index a07ad47..d189efb 100644
--- a/spec/unit/puppet/parser/functions/validate_re_spec.rb
+++ b/spec/unit/puppet/parser/functions/validate_re_spec.rb
@@ -5,7 +5,9 @@ describe Puppet::Parser::Functions.function(:validate_re) do
# The subject of these examplres is the method itself.
subject do
- scope.method :function_validate_re
+ # This makes sure the function is loaded within each test
+ function_name = Puppet::Parser::Functions.function(:validate_re)
+ scope.method(function_name)
end
context 'Using Puppet::Parser::Scope.new' do