Raise when given non-keyword-lists in Keyword.merge/3 #5479
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
josevalim
approved these changes
Nov 22, 2016
|
Can we get another pair of eyes on this one? |
|
Looking into it right now. |
whatyouhide
requested changes
Nov 24, 2016
| assert Keyword.merge([a: 1, b: 2, c: 3, c: 4], [c: 11, c: 50, d: 13], fun) == [a: 1, b: 2, c: 14, c: 54, d: 13] | ||
| end | ||
|
|
||
| test "merge/2 and merge/3 should work exactly the same way" do |
There was a problem hiding this comment.
Let's not use "should", wdyt? We can say "merge/2 and merge/3 behave in the same way" or something like that.
| Keyword.merge(arg1, arg2, fun) | ||
| end | ||
| end | ||
| end |
There was a problem hiding this comment.
As far as I understand, in this part we're testing that if merge/2 raises an ArgumentError, then merge/3 should raise that same error, right? If so, wdyt if we write it like this:
for {arg1, arg2} <- args_error do
error = assert_raise ArgumentError, ~r/expected a keyword list/, fn -> Keyword.merge(arg1, arg2) end
assert_raise ArgumentError, error.message, fn -> Keyword.merge(arg1, arg2, fun) end
endIt should work since all terms in args_error will error so the try feels superfluous.
There was a problem hiding this comment.
i didn't realize assert_raise would return the exception struct.
addressed!
Similar to elixir-lang#5466 It makes sure a valid keyword is given as both arguments. Additionally, it adds tests to make sure Keyword.merge/2 and /3 work exactly the same way. Related issue: elixir-lang#5395
|
suggestions addressed |
eksperimental
force-pushed
the
keyword_merge_3
branch
from
5f9da2d
to
b969582
Compare
whatyouhide
approved these changes
Nov 25, 2016
|
Thanks @eksperimental 💟 |
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.
Similar to
#5466
It makes sure a valid keyword is given as both arguments.
Additionally, it adds tests to make sure Keyword.merge/2 and /3
work exactly the same way.
Related issue:
#5395