fix the rspec failure in verify #4121
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Rishi Kumar Chawda <[email protected]>
we don't need this here Signed-off-by: Rishi Kumar Chawda <[email protected]>
activesupport concern implementation https://github.com/rails/rails/blob/v7.2.3/activesupport/lib/active_support/concern.rb calls class_eval and not instance_exec. also updated the included method to match activesupport impl so that if base is not nil, it will always call super. this fixes the rspec error that made it return exit 1 even if there were no actual failures. Signed-off-by: Rishi Kumar Chawda <[email protected]>
rishichawda
changed the title
|
neha-p6
approved these changes
Nov 12, 2025
rishichawda
merged commit 1eb196e
into
jfm/chef19-remove-activesupport-take-2
7 of 8 checks passed
rishichawda
deleted the
rishichawda/jfm/chef19-remove-activesupport-take-2
branch
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.
Description
the replacement implementation for concern module was not aligned with the actual active support concern implementation at https://github.com/rails/rails/blob/v7.2.3/activesupport/lib/active_support/concern.rb. This PR updates our implementation so that it correctly calls
class_evalinstead ofinstance_execon included block. Additionally, this change matches theincludedmethod implementation in the original active support concern module to always call super is base is provided. If not, only then process the block parameter.This PR also takes care of removing the lockfile and patch file that were probably not intended to be part of git history.
Issues Resolved
[List any existing issues this PR resolves, or any Discourse or
StackOverflow discussions that are relevant]
Check List