Merge pull request #548 from rodjek/issue-547

Don't clobber the existing networking facts hash

Author: rodjek

lib/rspec-puppet/support.rb

@@ -214,11 +214,12 @@ def facts_hash(node)
         'fqdn'          => node,
         'domain'        => node.split('.', 2).last,
         'clientcert'    => node,
-        'networking'    => {
-          'fqdn'          => node,
-          'domain'        => node.split('.', 2).last,
-          'hostname'      => node.split('.').first
-        }
+      }
+
+      networking_facts = {
+        'hostname' => node_facts['hostname'],
+        'fqdn'     => node_facts['fqdn'],
+        'domain'   => node_facts['domain'],
       }
 
       result_facts = if RSpec.configuration.default_facts.any?
@@ -231,6 +232,8 @@ def facts_hash(node)
       result_facts.merge!(munge_facts(facts)) if self.respond_to?(:facts)
       result_facts.merge!(munge_facts(node_facts))
 
+      (result_facts['networking'] ||= {}).merge!(networking_facts)
+
       # Facter currently supports lower case facts.  Bug FACT-777 has been submitted to support case sensitive
       # facts.
       downcase_facts = Hash[result_facts.map { |k, v| [k.downcase, v] }]

spec/classes/test_basic_spec.rb

@@ -8,11 +8,21 @@
     let(:node) { 'test123.test.com' }
     let(:facts) do
       {
-        :fqdn => 'notthis.test.com',
+        :fqdn       => 'notthis.test.com',
+        :networking => {
+          :primary => 'eth0',
+        },
       }
     end
 
     it { should contain_notify('test123.test.com') }
     it { should_not contain_notify('notthis.test.com') }
+
+    context 'existing networking facts should not be clobbered', :if => Puppet.version.to_f >= 4.0 do
+      let(:pre_condition) { 'notify { [$facts["networking"]["primary"], $facts["networking"]["hostname"]]: }' }
+
+      it { should contain_notify('eth0') }
+      it { should contain_notify('test123') }
+    end
   end
 end