Merge pull request #157 from jordanbreen28/bug-fix_merging_custom_facts

Use facterdb_string_keys configuration option for custom facts

lib/rspec-puppet-facts.rb

@@ -210,7 +210,8 @@ def add_custom_fact(name, value, options = {})
   # @api private
   def self.register_custom_fact(name, value, options)
     @custom_facts ||= {}
-    @custom_facts[name.to_s] = {:options => options, :value => value}
+    name = RSpec.configuration.facterdb_string_keys ? name.to_s : name.to_sym
+    @custom_facts[name] = {:options => options, :value => value}
   end
 
   # Adds any custom facts according to the rules defined for the operating

spec/rspec_puppet_facts_spec.rb

@@ -899,24 +899,29 @@
 
     it 'adds a simple fact and value' do
       add_custom_fact 'root_home', '/root'
-      expect(subject['redhat-7-x86_64']['root_home']).to eq '/root'
+      expect(subject['redhat-7-x86_64'][:root_home]).to eq '/root'
     end
 
     it 'confines a fact to a particular operating system' do
       add_custom_fact 'root_home', '/root', :confine => 'redhat-7-x86_64'
-      expect(subject['redhat-7-x86_64']['root_home']).to eq '/root'
-      expect(subject['redhat-6-x86_64']['root_home']).to be_nil
+      expect(subject['redhat-7-x86_64'][:root_home]).to eq '/root'
+      expect(subject['redhat-6-x86_64'][:root_home]).to be_nil
     end
 
     it 'excludes a fact from a particular operating system' do
       add_custom_fact 'root_home', '/root', :exclude => 'redhat-7-x86_64'
-      expect(subject['redhat-7-x86_64']['root_home']).to be_nil
-      expect(subject['redhat-6-x86_64']['root_home']).to eq '/root'
+      expect(subject['redhat-7-x86_64'][:root_home]).to be_nil
+      expect(subject['redhat-6-x86_64'][:root_home]).to eq '/root'
     end
 
     it 'takes a proc as a value' do
       add_custom_fact 'root_home', ->(_os, _facts) { '/root' }
-      expect(subject['redhat-7-x86_64']['root_home']).to eq '/root'
+      expect(subject['redhat-7-x86_64'][:root_home]).to eq '/root'
+    end
+
+    it 'accepts sym fact key and stores fact key as sym' do
+      add_custom_fact :root_home, ->(_os, _facts) { '/root' }
+      expect(subject['redhat-7-x86_64'][:root_home]).to eq '/root'
     end
   end