Fix skip_system_test not being preserved in update #45648
Merged
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
Previously running app:update always would template an application.rb file without the `config.generators.system_tests = nil` set, even for applications that previously had it set.
jonathanhefner
approved these changes
Jul 24, 2022
| @@ -29,6 +29,7 @@ def generator_options | |||
| options[:skip_action_text] = !defined?(ActionText::Engine) | |||
| options[:skip_action_cable] = !defined?(ActionCable::Engine) | |||
| options[:skip_test] = !defined?(Rails::TestUnitRailtie) | |||
| options[:skip_system_test] = Rails.application.config.generators.system_tests.nil? | |||
There was a problem hiding this comment.
For reference, options[:skip_system_test] triggers !depends_on_system_test?:
rails/railties/lib/rails/generators/app_base.rb
Lines 479 to 481 in 8892100
which triggers config.generators.system_tests = nil:
|
Thank you, @skipkayhil! ✔️ ✔️ |
jonathanhefner
added a commit
that referenced
this pull request
Jul 24, 2022
Fix skip_system_test not being preserved in update (cherry picked from commit 7548d76)
|
Backported to @skipkayhil By the way, should we add a regression test, similar to this one? |
Definitely, thanks for the pointer as well! |
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.
Summary
Previously running app:update always would template an application.rb
file without the
config.generators.system_tests = nilset, even forapplications that previously had it set.