This repository has been archived by the owner on Apr 12, 2024. It is now read-only.
fix(merge): regExp should not be treated as a objects when merging. #12419
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
|
|
||
| expect(dst.regexp).not.toBe(src.regexp); | ||
| expect(isRegExp(dst.regexp)).toBeTruthy(); | ||
| expect(dst.regexp.toString() === src.regexp.toString()).toBeTruthy(); |
There was a problem hiding this comment.
I think we just want toBeTrue here. Looks ok to me
There was a problem hiding this comment.
Thanks @caitp, i had updated with expect(dst.regexp.toString()).toBe(src.regexp.toString());
| merge(dst, src); | ||
|
|
||
| expect(dst.regexp).not.toBe(src.regexp); | ||
| expect(isRegExp(dst.regexp)).toBeTruthy(); |
There was a problem hiding this comment.
expect(isRegExp(dst.regexp)).toBeTrue();
|
i'll fix it myself, lgtm |
|
Thanks! |
|
Thanks @caitp |
netman92
pushed a commit
to netman92/angular.js
that referenced
this pull request
Aug 8, 2015
angular.merge({ key: /regexp/ }) now works the way you'd expect it to.
Horray!
Closes angular#12419
Closes angular#12409
ggershoni
pushed a commit
to ggershoni/angular.js
that referenced
this pull request
Sep 29, 2015
angular.merge({ key: /regexp/ }) now works the way you'd expect it to.
Horray!
Closes angular#12419
Closes angular#12409
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.
While merging two objects RegExp should not be treated same as the object.
Closes : #12409