Merge branch 'testing' into tweak/testing/file_fix_root_spec_failure

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/unit/parser/ast/in_operator_spec.rb b/spec/unit/parser/ast/in_operator_spec.rb
index df73645a2..9d3cab712 100644
--- a/spec/unit/parser/ast/in_operator_spec.rb
+++ b/spec/unit/parser/ast/in_operator_spec.rb
@@ -36,13 +36,13 @@ describe Puppet::Parser::AST::InOperator do
     end
 
     it "should raise an argument error if rval doesn't support the include? method" do
-        @rval.expects(:safeevaluate).with(@scope).returns(stub 'value')
+        @rval.expects(:safeevaluate).with(@scope).returns(stub('value'))
 
         lambda { @operator.evaluate(@scope) }.should raise_error
     end
 
     it "should not raise an argument error if rval supports the include? method" do
-        @rval.expects(:safeevaluate).with(@scope).returns(stub 'value', :include? => true)
+        @rval.expects(:safeevaluate).with(@scope).returns(stub('value', :include? => true))
 
         lambda { @operator.evaluate(@scope) }.should_not raise_error
     end
diff --git a/spec/unit/parser/scope_spec.rb b/spec/unit/parser/scope_spec.rb
index 37cf4bd8d..29dca38f4 100755
--- a/spec/unit/parser/scope_spec.rb
+++ b/spec/unit/parser/scope_spec.rb
@@ -63,7 +63,7 @@ describe Puppet::Parser::Scope do
             Puppet::Parser::Functions.expects(:environment_module).with(Puppet::Node::Environment.root).returns root_mod
             Puppet::Parser::Functions.expects(:environment_module).with(env).returns mod
 
-            Puppet::Parser::Scope.new(:compiler => compiler).metaclass.ancestors.should be_include(mod)
+            Puppet::Parser::Scope.new(:compiler => compiler).singleton_class.ancestors.should be_include(mod)
         end
 
         it "should extend itself with the default Functions module if it has no environment" do
@@ -72,7 +72,7 @@ describe Puppet::Parser::Scope do
 
             Puppet::Parser::Functions.expects(:environment_module).with(nil).returns mod
 
-            Puppet::Parser::Scope.new().metaclass.ancestors.should be_include(mod)
+            Puppet::Parser::Scope.new().singleton_class.ancestors.should be_include(mod)
         end
     end