Merge pull request #93 from apenney/coverage

Move from rspec1 to rspec2

1 files changed, 9 insertions, 21 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3bac650..acfae0c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,25 +1,13 @@
-require 'pathname'
-dir = Pathname.new(__FILE__).parent
-$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
+require 'puppetlabs_spec_helper/module_spec_helper'
+require 'simplecov'
+require 'support/filesystem_helpers'
+require 'support/fixture_helpers'
 
-require 'test/unit'
-require 'mocha'
-require 'puppet'
-gem 'rspec', '>= 1.2.9'
-require 'spec/autorun'
-
-Dir[File.join(File.dirname(__FILE__), 'support', '*.rb')].each do |support_file|
-  require support_file
-end
-
-Spec::Runner.configure do |config|
-  config.mock_with :mocha
-  config.include(FixtureHelpers)
-  config.include(FilesystemHelpers)
+SimpleCov.start do
+    add_filter "/spec/"
 end
 
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
+RSpec.configure do |c|
+  c.include FilesystemHelpers
+  c.include FixtureHelpers
 end