From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 30 Sep 2016 19:16:25 +0000 (-0600)
Subject: Move rspec-puppet-facts to spec helper
X-Git-Tag: 10.0.0~16
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aefbf40c136f9da5231b467ae6f4278a7b34df06;p=puppet-modules%2Fpuppet-ceilometer.git

Move rspec-puppet-facts to spec helper

This change updates the module to use the rspec-puppet-facts as defined
in the puppet-openstack_spec_helper.

Change-Id: I2d2230f46cd5e7b29a0d1a38303619798f9394ad
---

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index be3811c..cad00b1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,18 +1,10 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'shared_examples'
-
-require 'puppet-openstack_spec_helper/defaults'
-require 'rspec-puppet-facts'
-include RspecPuppetFacts
+require 'puppet-openstack_spec_helper/facts'
 
 RSpec.configure do |c|
   c.alias_it_should_behave_like_to :it_configures, 'configures'
   c.alias_it_should_behave_like_to :it_raises, 'raises'
-  # TODO(aschultz): remove this after all tests converted to use OSDefaults
-  # instead of referencing @default_facts
-  c.before :each do
-    @default_facts = OSDefaults.get_facts
-  end
 end
 
 at_exit { RSpec::Puppet::Coverage.report! }