aboutsummaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorBranan Purvine-Riley <branan@puppetlabs.com>2012-05-31 16:48:44 -0700
committerBranan Purvine-Riley <branan@puppetlabs.com>2012-05-31 16:48:44 -0700
commit43b1fb32ca45eca3494fa802300153ff1c1c63e8 (patch)
tree9909c26948e85ea61f0a7321e82fc16739ccdfef /spec
parent097a1ae83a3f43b639eb3608d3ae83aa33f7b43e (diff)
downloadpuppet-tftp-43b1fb32ca45eca3494fa802300153ff1c1c63e8.tar.gz
puppet-tftp-43b1fb32ca45eca3494fa802300153ff1c1c63e8.tar.bz2
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
Diffstat (limited to 'spec')
-rw-r--r--spec/spec_helper.rb22
1 files changed, 1 insertions, 21 deletions
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'