From 43b1fb32ca45eca3494fa802300153ff1c1c63e8 Mon Sep 17 00:00:00 2001 From: Branan Purvine-Riley Date: Thu, 31 May 2012 16:48:44 -0700 Subject: Update module for the puppetlabs_spec_helper gem * Use `rake spec` in the travis config * Load Rakefile and spec_helper from the common code in the gem --- spec/spec_helper.rb | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index efff5b4..2c6f566 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,21 +1 @@ -require 'rubygems' -require 'puppet' -require 'rspec-puppet' -require 'mocha' -require 'puppetlabs_spec_helper' - -def param_value(subject, type, title, param) - subject.resource(type, title).send(:parameters)[param.to_sym] -end - -Puppet.parse_config -puppet_module_path = Puppet[:modulepath] - -fixture_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures')) - -RSpec.configure do |c| - fixture_module_path = File.join(fixture_path, 'modules') - c.module_path = [fixture_module_path, puppet_module_path].join(":") - c.manifest_dir = File.join(fixture_path, 'manifests') - c.mock_with :mocha -end +require 'puppetlabs_spec_helper/module_spec_helper' -- cgit v1.2.3