Feat: Allow non conflicting path methods to merge #78
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
|
This also includes my previous MR for deep merging security schemes |
dbryar
commented
Sep 3, 2022
|
|
||
| export function expectErrorType(result: MergeResult, type: ErrorType): void { | ||
| if (isErrorResult(result)) { | ||
| expect(result.type).toEqual(type); | ||
| } else { | ||
| fail(`Expected an error, but instead got: ${JSON.stringify(result, null, 2)}`); |
There was a problem hiding this comment.
Fail no longer exists in Jest v27+
dbryar
commented
Sep 3, 2022
| } | ||
| } | ||
|
|
||
| export function expectMergeResult(actual: MergeResult, expected: MergeResult): void { | ||
| if(isErrorResult(actual)) { | ||
| fail(`We expected to have a successful merge and instead got: ${JSON.stringify(actual, null, 2)}`); |
|
Hi, did you find any issue to not merge this PR ? |
|
@robertmassaioli Can this be merge? |
|
any chance this could be merged ? |
|
@robertmassaioli Would be great if we could merge this |
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.
There is an open TODO in the queue to allow non-conflicting methods to merge in to the same path, so I've completed it.
The code may not be entirely the neatest (its a little bit of a hack), but open to suggestions.