(IAC-1143) Run Facter.clear before each test.

diff --git a/Gemfile b/Gemfile
index 902e0497058e795dea97de345abb7cd8005dc828..c65a5becca1b8be9b64bde4b1e6d40a99fd3641b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -34,18 +34,18 @@ group :development do
   gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
-puppet_version = ENV['PUPPET_GEM_VERSION']
-facter_version = ENV['FACTER_GEM_VERSION']
+# puppet_version = ENV['PUPPET_GEM_VERSION']
+# facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
 
 gems = {}
 
-gems['puppet'] = location_for(puppet_version)
+# gems['puppet'] = location_for(puppet_version)
 
 # If facter or hiera versions have been specified via the environment
 # variables
 
-gems['facter'] = location_for(facter_version) if facter_version
+# gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version
 
 if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
@@ -68,6 +68,12 @@ extra_gemfiles = [
   File.join(Dir.home, '.gemfile'),
 ]
 
+gem 'facter', path:"/Users/bogdan.irimie/projects/facter"
+gem 'puppet', path:"/Users/bogdan.irimie/projects/puppet"
+# gem 'facter'
+gem 'pry-byebug'
+
+
 extra_gemfiles.each do |gemfile|
   if File.file?(gemfile) && File.readable?(gemfile)
     eval(File.read(gemfile), binding)

diff --git a/spec/unit/facter/apt_dist_has_updates_spec.rb b/spec/unit/facter/apt_dist_has_updates_spec.rb
index 216050d035a93574f9a2fab27a4f12eacc745005..6130f27e6fbdfe02b848a14755c622c28270f38e 100644 (file)
--- a/spec/unit/facter/apt_dist_has_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_has_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_has_dist_updates fact' do
   subject { Facter.fact(:apt_has_dist_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'on non-Debian distro' do
     before(:each) do

diff --git a/spec/unit/facter/apt_dist_package_security_updates_spec.rb b/spec/unit/facter/apt_dist_package_security_updates_spec.rb
index 6355b793076ee5e522f0517e47c035900e92616d..4033a28ddec3d21bbd2c7e139755557ebdb75955 100644 (file)
--- a/spec/unit/facter/apt_dist_package_security_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_package_security_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_package_security_dist_updates fact' do
   subject { Facter.fact(:apt_package_security_dist_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do

diff --git a/spec/unit/facter/apt_dist_package_updates_spec.rb b/spec/unit/facter/apt_dist_package_updates_spec.rb
index bbe212e6ee2f7f25f2065ea0960977a2ab4a7de0..59e02b8c22a72d29ab4473a7aa33ed814cfbbedf 100644 (file)
--- a/spec/unit/facter/apt_dist_package_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_package_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_package_dist_updates fact' do
   subject { Facter.fact(:apt_package_dist_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do

diff --git a/spec/unit/facter/apt_dist_security_updates_spec.rb b/spec/unit/facter/apt_dist_security_updates_spec.rb
index 8035f1663d063170fe5b397de37d11d0dbaf7b85..895a36cccfaa5405ce6c65f4bc79cfbfddcec144 100644 (file)
--- a/spec/unit/facter/apt_dist_security_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_security_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_security_updates fact' do
   subject { Facter.fact(:apt_security_dist_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do

diff --git a/spec/unit/facter/apt_dist_updates_spec.rb b/spec/unit/facter/apt_dist_updates_spec.rb
index f9942afe9e29f3f304f6720003dad5a96b97693a..112dca8cb867d5df632b68ead6c29b3c97418b59 100644 (file)
--- a/spec/unit/facter/apt_dist_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_updates fact' do
   subject { Facter.fact(:apt_dist_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do

diff --git a/spec/unit/facter/apt_has_updates_spec.rb b/spec/unit/facter/apt_has_updates_spec.rb
index f7a1ca9dbd1209885a1fc5825139223e2e7dc433..ea3e0852b5b087d4eebedd64ee2cae38f8dafd66 100644 (file)
--- a/spec/unit/facter/apt_has_updates_spec.rb
+++ b/spec/unit/facter/apt_has_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_has_updates fact' do
   subject { Facter.fact(:apt_has_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'on non-Debian distro' do
     before(:each) do

diff --git a/spec/unit/facter/apt_package_security_updates_spec.rb b/spec/unit/facter/apt_package_security_updates_spec.rb
index 53b91bcaa06943ca7433019c06c1690527602142..958fd0092f73a7ecbe41495ab2cfa98a52dcd7b6 100644 (file)
--- a/spec/unit/facter/apt_package_security_updates_spec.rb
+++ b/spec/unit/facter/apt_package_security_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_package_security_updates fact' do
   subject { Facter.fact(:apt_package_security_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do

diff --git a/spec/unit/facter/apt_package_updates_spec.rb b/spec/unit/facter/apt_package_updates_spec.rb
index 4b3e749324927646ec9d76dfa3965c95e4d70dd2..4c81d0c0884900c048f48d801b830742d26b92b3 100644 (file)
--- a/spec/unit/facter/apt_package_updates_spec.rb
+++ b/spec/unit/facter/apt_package_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_package_updates fact' do
   subject { Facter.fact(:apt_package_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do

diff --git a/spec/unit/facter/apt_reboot_required_spec.rb b/spec/unit/facter/apt_reboot_required_spec.rb
index b15cb4c6076499b68fceb116776de086eb5af6bb..22f5617dbaed64e226a8584ddae477ef1db1b8f8 100644 (file)
--- a/spec/unit/facter/apt_reboot_required_spec.rb
+++ b/spec/unit/facter/apt_reboot_required_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_reboot_required fact' do
   subject { Facter.fact(:apt_reboot_required).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'if a reboot is required' do
     before(:each) do

diff --git a/spec/unit/facter/apt_security_updates_spec.rb b/spec/unit/facter/apt_security_updates_spec.rb
index cde0158ef0fa89c209ca248b14680ba99f51d295..4e4b54db315e5dad70e96eae5e6bee3252881cc4 100644 (file)
--- a/spec/unit/facter/apt_security_updates_spec.rb
+++ b/spec/unit/facter/apt_security_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_security_updates fact' do
   subject { Facter.fact(:apt_security_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do

diff --git a/spec/unit/facter/apt_update_last_success_spec.rb b/spec/unit/facter/apt_update_last_success_spec.rb
index dc0fc540b91c6c1ec98503ad3150e043e1d619e9..f4858dd16a0fb3d2133955ac75f5f0906b120bcc 100644 (file)
--- a/spec/unit/facter/apt_update_last_success_spec.rb
+++ b/spec/unit/facter/apt_update_last_success_spec.rb
@@ -4,7 +4,6 @@ describe 'apt_update_last_success fact' do
   subject { Facter.fact(:apt_update_last_success).value }
 
   before(:each) { Facter.clear }
-  after(:each) { Facter.clear }
 
   describe 'on Debian based distro which has not yet created the update-success-stamp file' do
     it 'has a value of -1' do

diff --git a/spec/unit/facter/apt_updates_spec.rb b/spec/unit/facter/apt_updates_spec.rb
index e9d4c0df176155b9b9c816d453fa8309cc1825f3..1f1c15bf431d7ba60057c7d7e32f32e8d2bb1279 100644 (file)
--- a/spec/unit/facter/apt_updates_spec.rb
+++ b/spec/unit/facter/apt_updates_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'apt_updates fact' do
   subject { Facter.fact(:apt_updates).value }
 
-  after(:each) { Facter.clear }
+  before(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
     before(:each) do