Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7b633857
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
7b633857
编写于
2月 20, 2017
作者:
E
Erol Fornoles
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make the order of Hash#reverse_merge! consistent with HashWithIndifferentAccess
上级
d731d636
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
4 deletion
+6
-4
activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
...support/lib/active_support/core_ext/hash/reverse_merge.rb
+1
-2
activesupport/test/core_ext/hash_ext_test.rb
activesupport/test/core_ext/hash_ext_test.rb
+5
-2
未找到文件。
activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
浏览文件 @
7b633857
...
...
@@ -15,8 +15,7 @@ def reverse_merge(other_hash)
# Destructive +reverse_merge+.
def
reverse_merge!
(
other_hash
)
# right wins if there is no left
merge!
(
other_hash
)
{
|
key
,
left
,
right
|
left
}
replace
(
reverse_merge
(
other_hash
))
end
alias_method
:reverse_update
,
:reverse_merge!
end
activesupport/test/core_ext/hash_ext_test.rb
浏览文件 @
7b633857
...
...
@@ -829,9 +829,9 @@ def test_constructor_on_indifferent_access
end
def
test_reverse_merge
defaults
=
{
a:
"x"
,
b:
"y"
,
c:
10
}.
freeze
defaults
=
{
d:
0
,
a:
"x"
,
b:
"y"
,
c:
10
}.
freeze
options
=
{
a:
1
,
b:
2
}
expected
=
{
a:
1
,
b:
2
,
c:
10
}
expected
=
{
d:
0
,
a:
1
,
b:
2
,
c:
10
}
# Should merge defaults into options, creating a new hash.
assert_equal
expected
,
options
.
reverse_merge
(
defaults
)
...
...
@@ -842,6 +842,9 @@ def test_reverse_merge
assert_equal
expected
,
merged
.
reverse_merge!
(
defaults
)
assert_equal
expected
,
merged
# Make the order consistent with the non-overwriting reverse merge.
assert_equal
expected
.
keys
,
merged
.
keys
# Should be an alias for reverse_merge!
merged
=
options
.
dup
assert_equal
expected
,
merged
.
reverse_update
(
defaults
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录