Refs #34385 - use Foreman::Plugin.installed? instead of defined?
#526
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ezr-ondrej
reviewed
Feb 3, 2022
lib/foreman_openscap/engine.rb
Outdated
| @@ -1,6 +1,6 @@ | |||
| module ForemanOpenscap | |||
| def self.with_katello? | |||
| defined?(::Katello) | |||
| Foreman::Plugin.installed?("Katello") | |||
There was a problem hiding this comment.
Is the plugin really named 'Katello'? 🤔
There was a problem hiding this comment.
There was a problem hiding this comment.
just katello lowered case though :O
ezr-ondrej
reviewed
Feb 3, 2022
test/test_plugin_helper.rb
Outdated
| @@ -5,14 +5,14 @@ | |||
| FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories') | |||
| # Add factories from foreman_ansible | |||
| FactoryBot.definition_file_paths << File.join(ForemanAnsible::Engine.root, '/test/factories') | |||
| FactoryBot.definition_file_paths << File.join(ForemanPuppet::Engine.root, '/test/factories') if defined?(ForemanPuppet) | |||
| FactoryBot.definition_file_paths << File.join(ForemanPuppet::Engine.root, '/test/factories') if Foreman::Plugin.installed?("foreman_puppet") | |||
There was a problem hiding this comment.
this is quite soon in the init proces and just for tests, I'd go with defined?(ForemanPuppet::Engine)` here, but probably both will work, so I'm fine both ways ^_^
|
@lzap @adiabramovitch could you take a look? |
| @@ -5,14 +5,14 @@ | |||
| FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories') | |||
| # Add factories from foreman_ansible | |||
| FactoryBot.definition_file_paths << File.join(ForemanAnsible::Engine.root, '/test/factories') | |||
| FactoryBot.definition_file_paths << File.join(ForemanPuppet::Engine.root, '/test/factories') if defined?(ForemanPuppet) | |||
| FactoryBot.definition_file_paths << File.join(ForemanPuppet::Engine.root, '/test/factories') if defined?(ForemanPuppet::Engine) | |||
There was a problem hiding this comment.
Just out of curiosity, Why are these changes needed if you stayed with the defined? method?
There was a problem hiding this comment.
As @ezr-ondrej mentioned: #526 (comment)
|
Thanks @Ron-Lavi and all the reviewers, merging! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.