This repository has been archived by the owner on Nov 30, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 394
Fix diff for compound when transforming actual [onto main] #1440
Merged
pirj
merged 4 commits into
rspec:main
from
henrahmagix:fix-compound-redefined-actual-diff-on-main
Dec 28, 2023
Merged
Fix diff for compound when transforming actual [onto main] #1440
pirj
merged 4 commits into
rspec:main
from
henrahmagix:fix-compound-redefined-actual-diff-on-main
Dec 28, 2023
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
There’s something fishy going on with the 1.8.7 build and the implicit expectation detection.
|
JonRowe
reviewed
Dec 20, 2023
.to output(/baz/).to_stdout | ||
.and output(/qux/).to_stderr | ||
} | ||
.to fail_including( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is what is breaking the built, it seems antiquated [because it is] but 1.8.7 required:
thing.
to(
over:
thing
.to(
JonRowe
reviewed
Dec 20, 2023
JonRowe
reviewed
Dec 20, 2023
JonRowe
reviewed
Dec 20, 2023
JonRowe
reviewed
Dec 20, 2023
pirj
approved these changes
Dec 21, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
With this, the 4.0 pr is redundant.
Jon, do you mind merging thus and handling ci for diff-lcs separately?
pirj
force-pushed
the
fix-compound-redefined-actual-diff-on-main
branch
from
December 28, 2023 19:38
0c6ae44
to
7e13447
Compare
Previously, we were passing the untransformed actual to the differ. Now, we take it from the matchers. fixes rspec#1317
More 1.8.7 fixes
pirj
force-pushed
the
fix-compound-redefined-actual-diff-on-main
branch
from
December 28, 2023 20:03
7e13447
to
9b44765
Compare
Thank you for pushing this to completion, @henrahmagix ! |
Thanks to you and Jon for fixing and finishing it! 🙌 |
JonRowe
pushed a commit
that referenced
this pull request
Feb 4, 2024
…al-diff-on-main Fix diff for compound when transforming actual
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fixes #1317
fixes #1406
resolves #1319
I cherry-picked the commits from #1319 onto 3-12-maintenance, they applied without conflicts, then I ran the scripts called in the test CI action and they all passed. I pushed this to 3-12-maintenance...henrahmagix:fix-compound-redefined-actual-diff-on-3-12 just for good measure =)
I did the same on main, bundle installed fine, but I wasn't able to run any of the tests locally because I kept getting the following error:
So I hope the tests pass similarly when run in CI because I can't confirm locally unfortunately☺️