Merge branch '2.3.x'

* 2.3.x:
  (Maint) Don't mock with mocha
  (Maint) Fix up the get_module_path parser function
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
  (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
  (Maint) Fix interpreter lines

Conflicts:
	spec/spec_helper.rb
	spec/unit/puppet/parser/functions/get_module_path_spec.rb

1 files changed, 2 insertions, 6 deletions

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 1e0b5ac..9d66fcb 100644
--- a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb
+++ b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb
@@ -1,14 +1,10 @@
 require 'spec_helper'
 
 describe Puppet::Parser::Functions.function(:validate_absolute_path) do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
   # The subject of these examplres is the method itself.
-  subject do
-    Puppet::Parser::Scope.new.method :function_validate_absolute_path
-  end
+  subject() { scope.method(:function_validate_absolute_path) }
 
   describe "Valid Paths" do
     def self.valid_paths