Merge branch '2.2.x' into 2.3.x

* 2.2.x:
  Use rvalue functions correctly

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()'
+      Puppet[:code] = '$foo = getvar()'
-      expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+      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")'
+      Puppet[:code] = '$foo = getvar("foo::bar", "baz")'
-      expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+      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

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()'
+      Puppet[:code] = '$x = has_key()'
-      expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+      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')"
+      Puppet[:code] = "$x = has_key('foo')"
-      expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+      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')"
+      Puppet[:code] = "$x = has_key('foo', 'bar')"
-      expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /expects the first argument to be a hash/)
+      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

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()'
+      Puppet[:code] = '$x = merge()'
-      expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+      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)"
+      Puppet[:code] = "$my_hash={'one' => 1}\n$x = merge($my_hash)"
-      expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/)
+      expect {
+        scope.compiler.compile
+      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
     end
   end
   describe 'when calling merge on the scope instance' do