Skip to content

Commit 033e2d9

Browse files
committed
(GH-397) - Honour default symlink when additional symlinks delcared
Before, declaring a symlink would overwrite the symlink to the current module. This is not what we would want for testing, and we should be able to declare additional symlinks to the default one. Now, we extra symlinks declared, we merge into the auto_symlink, if not operate as before.
1 parent 157ed92 commit 033e2d9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/puppetlabs_spec_helper/tasks/fixtures.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def fixtures(category)
107107

108108
fixtures = fixtures['fixtures']
109109

110-
fixtures['symlinks'] = auto_symlink if fixtures['symlinks'].nil?
110+
fixtures['symlinks'] = fixtures['symlinks'].nil? ? auto_symlink : auto_symlink.merge!(fixtures['symlinks'])
111111

112112
result = {}
113113
if fixtures.include?(category) && !fixtures[category].nil?

0 commit comments

Comments
 (0)