From 4e5dc348b44ddaccbba698372ca80678c4c385f6 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 6 Jan 2016 21:28:00 -0700 Subject: [PATCH] Add rspec-puppet-facts to the spec_helper This change adds the rspec-puppet-facts gem to the spec helper so that we can centralize the management of the base operating systems that we support. rspec-puppet-facts allows us to simplify our unit tests and provides a more complete list of Operating Systems and their associated facts for the unit tests. With this change we can now loop over and test CentOS, Debian, Fedora, RedHat, and Ubuntu by simply providing a list of supported os to rspec-puppet-facts. Additionally this change includes a central object for managing our supported os list for rspec-puppet-facts and providing our default facts like os_service_default. This central object should replace the usage of @default_facts within the unit tests for each module. Change-Id: Ie420cd2599fa3e88e6471bf3e9fce20d48f19805 --- Gemfile | 4 ++++ spec/spec_helper.rb | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fc221439..5ad0760c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :test do gem 'puppetlabs_spec_helper', :require => 'false' gem 'rspec-puppet', '~> 2.2.0', :require => 'false' + gem 'rspec-puppet-facts', :require => 'false' gem 'metadata-json-lint', :require => 'false' gem 'puppet-lint-param-docs', :require => 'false' gem 'puppet-lint-absolute_classname-check', :require => 'false' @@ -14,6 +15,9 @@ group :development, :test do gem 'puppet-lint-numericvariable', :require => 'false' gem 'json', :require => 'false' gem 'webmock', :require => 'false' + gem 'puppet-openstack_spec_helper', + :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper', + :require => false end group :system_tests do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9bc7bcf9..bd97904b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,11 +2,17 @@ require 'puppetlabs_spec_helper/module_spec_helper' require 'shared_examples' require 'webmock/rspec' +require 'puppet-openstack_spec_helper/defaults' +require 'rspec-puppet-facts' +include RspecPuppetFacts + 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 = { :os_service_default => '' } + @default_facts = OSDefaults.get_facts end end