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, 10 insertions, 9 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3fdcbbc..e269b90 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,12 +1,13 @@
-require 'puppetlabs_spec_helper/puppet_spec_helper'
+dir = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift File.join(dir, 'lib')
 
-RSpec.configure do |config|
+# Don't want puppet getting the command line arguments for rake or autotest
+ARGV.clear
 
-  config.before :each do
-    GC.disable
-  end
+require 'puppet'
+require 'facter'
+require 'mocha'
+gem 'rspec', '>=2.0.0'
+require 'rspec/expectations'
 
-  config.after :each do
-    GC.enable
-  end
-end
+require 'puppetlabs_spec_helper/module_spec_helper'