Merge pull request #66 from ekohl/fix-plugin-spec-testing

Fix plugin regressions introduced in 3.0.0
puppetlabs · Oct 20, 2022 · 51511a5 · 51511a5
2 parents 47ffa8a + a97f52d
commit 51511a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/lib/puppet-lint/plugins.rb b/lib/puppet-lint/plugins.rb
@@ -10,16 +10,13 @@ class PuppetLint::Plugins
   #
   # Returns nothing.
   def self.load_from_gems
-    plugins_directories = gem_directories.select do |directory|
-      (directory + 'puppet-lint/plugins').to_s if (directory + 'puppet-lint/plugins').directory?
-    end
-
-    plugin_files = plugins_directories.each do |directory|
-      Dir["#{directory}/**/*.rb"]
-    end
+    gem_directories.each do |directory|
+      path = directory + 'puppet-lint/plugins'
+      next unless path.directory?
 
-    plugin_files.each do |file|
-      load(file)
+      Dir["#{path}/**/*.rb"].each do |file|
+        load(file)
+      end
     end
   end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -134,7 +134,7 @@ def subject
   config.include(
     RSpec::LintExampleGroup,
     type: :lint,
-    file_path: Regexp.compile(['spec', 'unit', 'puppet-lint', 'plugins'].join('[\\\/]')),
+    file_path: Regexp.new('spec[\\\/](unit[\\\/])?puppet-lint[\\\/]plugins'),
   )
 
   config.expect_with(:rspec) do |c|