Skip to content

Commit 5745b70

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 5745b70

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.rubocop_todo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2024-01-22 15:48:54 UTC using RuboCop version 1.50.2.
3+
# on 2024-02-01 17:06:08 UTC using RuboCop version 1.50.2.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
@@ -17,7 +17,7 @@ Gemspec/RequireMFA:
1717
# Offense count: 5
1818
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
1919
Metrics/AbcSize:
20-
Max: 55
20+
Max: 58
2121

2222
# Offense count: 3
2323
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.

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)