(IAC-1143) Remove temporary fix.

diff --git a/Gemfile b/Gemfile
index 3373f01763ea1b3d343658b868bfa5585670ff04..582e584673a2ca031057a1a1b7051446221859b0 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -32,18 +32,18 @@ group :development do
   gem "puppet-lint-i18n",                                        require: false
 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://)}
@@ -66,12 +66,6 @@ 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 8d188b0d407353f0c66d1027f91297e32e27aa28..6130f27e6fbdfe02b848a14755c622c28270f38e 100644 (file)
--- a/spec/unit/facter/apt_dist_has_updates_spec.rb
+++ b/spec/unit/facter/apt_dist_has_updates_spec.rb
@@ -7,8 +7,6 @@ describe 'apt_has_dist_updates fact' do
 
   describe 'on non-Debian distro' do
     before(:each) do
-      # Adding temporary workaround for this ticket https://tickets.puppetlabs.com/browse/IAC-1143
-      Facter.clear
       allow(Facter.fact(:osfamily)).to receive(:value).once.and_return('Redhat')
     end
     it { is_expected.to be_nil }