Merge pull request #24 from alexjfisher/MODULES_10357

(MODULES-10357) Fix `proxy => absent`

Author: gimmyxd

lib/puppet/type/yumrepo.rb

@@ -321,7 +321,7 @@
 
     munge do |value|
       return '' if Facter.value(:operatingsystemmajrelease).to_i >= 8 && value.to_s == '_none_'
-      value.to_s
+      super(value)
     end
   end
 

spec/acceptance/tests/yumrepo_spec.rb

@@ -90,5 +90,65 @@ def resource(host, type, name)
         assert_match(res['descr'], 'Puppet Labs Products El 7 - $basearch')
       end
     end
+
+    describe '`proxy` property' do
+      context 'when set to a URL' do
+        it 'applies idempotently' do
+          pp = <<-MANIFEST
+          yumrepo {'proxied-repo':
+            baseurl => 'http://myownmirror',
+            proxy   => 'http://proxy.example.com:3128',
+          }
+          MANIFEST
+
+          apply_manifest(pp, catch_failures: true)
+          apply_manifest(pp, catch_changes: true)
+        end
+
+        describe file('/etc/yum.repos.d/proxied-repo.repo') do
+          its(:content) { is_expected.to contain('proxy=http://proxy.example.com:3128') }
+        end
+      end
+      context 'when set to `absent`' do
+        it 'applies idempotently' do
+          pp = <<-MANIFEST
+          yumrepo {'proxied-repo':
+            baseurl => 'http://myownmirror',
+            proxy   => absent,
+          }
+          MANIFEST
+
+          apply_manifest(pp, catch_failures: true)
+          apply_manifest(pp, catch_changes: true)
+        end
+
+        describe file('/etc/yum.repos.d/proxied-repo.repo') do
+          its(:content) { is_expected.not_to contain('proxy') }
+        end
+      end
+      context 'when set to `_none_`' do
+        it 'applies idempotently' do
+          pp = <<-MANIFEST
+          yumrepo {'proxied-repo':
+            baseurl => 'http://myownmirror',
+            proxy   => '_none_',
+          }
+          MANIFEST
+
+          apply_manifest(pp, catch_failures: true)
+          apply_manifest(pp, catch_changes: true)
+        end
+
+        if fact('os.release.major') == '8'
+          describe file('/etc/yum.repos.d/proxied-repo.repo') do
+            its(:content) { is_expected.to match(%r{^proxy=$}) }
+          end
+        else
+          describe file('/etc/yum.repos.d/proxied-repo.repo') do
+            its(:content) { is_expected.to match(%r{^proxy=_none_$}) }
+          end
+        end
+      end
+    end
   end
 end

spec/spec_helper_acceptance.rb

@@ -4,12 +4,11 @@
 
 $LOAD_PATH << File.join(__dir__, 'acceptance/lib')
 
+run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
+
 RSpec.configure do |c|
   c.before :suite do
-    unless ENV['BEAKER_provision'] == 'no'
-      run_puppet_install_helper
-      install_module_on(hosts)
-      install_module_dependencies_on(hosts)
-    end
+    install_module
+    install_module_dependencies
   end
 end