Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
(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.
  • Loading branch information
jordanbreen28 committed Feb 1, 2024
commit 5745b702ff377206db7d0a6a31c607873bc1acbc
4 changes: 2 additions & 2 deletions .rubocop_todo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/puppetlabs_spec_helper/tasks/fixtures.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down