From 6bdc09719a58e83c9f4fd17832540807f446838a Mon Sep 17 00:00:00 2001 From: Branan Purvine-Riley Date: Fri, 25 May 2012 12:07:36 -0700 Subject: Update for the new module template * Add `rake spec_full` and friends * Remove recursive symlink * Prepend fixtures modulepath instead of overriding * Update travis config to use spec_full --- spec/fixtures/modules/tftp | 1 - spec/spec_helper.rb | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 120000 spec/fixtures/modules/tftp (limited to 'spec') diff --git a/spec/fixtures/modules/tftp b/spec/fixtures/modules/tftp deleted file mode 120000 index 1b20c9f..0000000 --- a/spec/fixtures/modules/tftp +++ /dev/null @@ -1 +0,0 @@ -../../../ \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b47eaea..efff5b4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,20 +1,21 @@ +require 'rubygems' require 'puppet' -require 'mocha' -require 'rspec' require 'rspec-puppet' -require 'rspec/expectations' +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| - c.module_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures/modules')) - # Using an empty site.pp file to avoid: https://github.com/rodjek/rspec-puppet/issues/15 - c.manifest_dir = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures/manifests')) - # Use fixtures for config file mainly to support using our own hiera.yaml settings. - # Pending: https://github.com/rodjek/rspec-puppet/pull/21 - # c.config = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures/puppet.conf')) + 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 -- cgit v1.2.3