(MODULES-11244) fix spec tests

adapt spec helpers to keep the existing setup

Author: Ciprian Badescu

spec/default_facts.yml

@@ -11,10 +11,7 @@
 
 include RspecPuppetFacts
 
-default_facts = {
-  puppetversion: Puppet.version,
-  facterversion: Facter.version,
-}
+default_facts = {}
 
 default_fact_files = [
   File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
@@ -31,9 +28,9 @@
   end
 end
 
-# read default_facts and merge them over what is provided by facterdb
-default_facts.each do |fact, value|
-  add_custom_fact fact, value
+# check if default_module_facts is defined and merge them if the case
+if @default_module_facts.is_a?(Hash)
+  default_facts.merge!(@default_module_facts)
 end
 
 RSpec.configure do |c|

spec/spec_helper.rb

@@ -1,56 +1,58 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet-facts'
-include RspecPuppetFacts
-
 location = File.expand_path('/dev/null')
 
-RSpec.configure do |c|
-  c.default_facts = {
-    :aio_agent_version           => '5.5.10',
-    :puppetversion               => '5.5.10',
-    :lsbdistrelease              => nil,
-    :is_pe                       => false,
-    :platform_tag                => nil,
-    :operatingsystem             => nil,
-    :operatingsystemmajrelease   => nil,
-    :kernelmajversion            => nil,
-    :macosx_productname          => nil,
-    :maxosx_productversion_major => nil,
-    :rubyplatform                => nil,
-    :puppet_master_server        => nil,
-    :puppet_client_datadir       => nil,
-    :path                        => nil,
-    :puppet_agent_appdata        => nil,
-    :system32                    => nil,
-    :fips_enabled                => false,
+@default_module_facts = {
+  :aio_agent_version           => '5.5.10',
+  :puppetversion               => '5.5.10',
+  :lsbdistrelease              => nil,
+  :is_pe                       => false,
+  :platform_tag                => nil,
+  :operatingsystem             => nil,
+  :operatingsystemmajrelease   => nil,
+  :kernelmajversion            => nil,
+  :macosx_productname          => nil,
+  :maxosx_productversion_major => nil,
+  :rubyplatform                => nil,
+  :puppet_master_server        => nil,
+  :puppet_client_datadir       => nil,
+  :path                        => nil,
+  :puppet_agent_appdata        => nil,
+  :system32                    => nil,
+  :fips_enabled                => false,
 
-    :puppet_ssldir   => "#{location}/ssl",
-    :puppet_config   => "#{location}/puppet.conf",
-    :puppet_sslpaths => {
-      'privatedir'    => {
-        'path'   => "#{location}/ssl/private",
-        'path_exists' => true,
-      },
-      'privatekeydir' => {
-        'path'   => "#{location}/ssl/private_keys",
-        'path_exists' => true,
-      },
-      'publickeydir'  => {
-        'path'   => "#{location}/ssl/public_keys",
-        'path_exists' => true,
-      },
-      'certdir'       => {
-        'path'   => "#{location}/ssl/certs",
-        'path_exists' => true,
-      },
-      'requestdir'    => {
-        'path'   => "#{location}/ssl/certificate_requests",
-        'path_exists' => true,
-      },
-      'hostcrl'       => {
-        'path'   => "#{location}/ssl/crl.pem",
-        'path_exists' => true,
-      },
+  :puppet_ssldir   => "#{location}/ssl",
+  :puppet_config   => "#{location}/puppet.conf",
+  :puppet_sslpaths => {
+    'privatedir'    => {
+      'path'   => "#{location}/ssl/private",
+      'path_exists' => true,
+    },
+    'privatekeydir' => {
+      'path'   => "#{location}/ssl/private_keys",
+      'path_exists' => true,
+    },
+    'publickeydir'  => {
+      'path'   => "#{location}/ssl/public_keys",
+      'path_exists' => true,
+    },
+    'certdir'       => {
+      'path'   => "#{location}/ssl/certs",
+      'path_exists' => true,
     },
-  }
+    'requestdir'    => {
+      'path'   => "#{location}/ssl/certificate_requests",
+      'path_exists' => true,
+    },
+    'hostcrl'       => {
+      'path'   => "#{location}/ssl/crl.pem",
+      'path_exists' => true,
+    },
+  },
+}
+
+RSpec.configure do |c|
+  c.before :each do
+    Puppet::Parser::Functions.newfunction(:pe_build_version, type: :rvalue, doc: '') do |args|
+      '2018.1.0'
+    end
+  end
 end