Merge pull request #431 from puppetlabs/gh-397-honour_default_symlink

(GH-397) - Honour default symlink when additional symlinks delcared

Author: LukasAud

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-01-22 15:48:54 UTC using RuboCop version 1.50.2.
+# on 2024-02-01 17:06:08 UTC using RuboCop version 1.50.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -17,7 +17,7 @@ Gemspec/RequireMFA:
 # Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 55
+  Max: 58
 
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.

lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -107,7 +107,7 @@ def fixtures(category)
 
         fixtures = fixtures['fixtures']
 
-        fixtures['symlinks'] = auto_symlink if fixtures['symlinks'].nil?
+        fixtures['symlinks'] = fixtures['symlinks'].nil? ? auto_symlink : auto_symlink.merge!(fixtures['symlinks'])
 
         result = {}
         if fixtures.include?(category) && !fixtures[category].nil?