summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-hash-ext/test/hash.rb
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-05-10 11:14:55 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-05-10 11:14:55 +0900
commite59c6a1100caeed7d656142094d413de6e2752fa (patch)
tree3e24569251a5f492dbf3a39de53a1c1bd44c7a93 /mrbgems/mruby-hash-ext/test/hash.rb
parent3e2c5da4437f593c6068599e9377d1fbfdfbbfb7 (diff)
parent658a00ba4927b433420c9b26dcbc2365fb657f2b (diff)
downloadmruby-e59c6a1100caeed7d656142094d413de6e2752fa.tar.gz
mruby-e59c6a1100caeed7d656142094d413de6e2752fa.zip
Merge pull request #2226 from yui-knk/hash-merge-error
Change to raise TypeError (Hash#merge, #merge!)
Diffstat (limited to 'mrbgems/mruby-hash-ext/test/hash.rb')
-rw-r--r--mrbgems/mruby-hash-ext/test/hash.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/mrbgems/mruby-hash-ext/test/hash.rb b/mrbgems/mruby-hash-ext/test/hash.rb
index b9992fa96..62cfc8856 100644
--- a/mrbgems/mruby-hash-ext/test/hash.rb
+++ b/mrbgems/mruby-hash-ext/test/hash.rb
@@ -16,6 +16,10 @@ assert('Hash#merge!') do
'xyz_key' => 'xyz_value' }, result_1)
assert_equal({'abc_key' => 'abc_value', 'cba_key' => 'cba_value',
'xyz_key' => 'xyz_value' }, result_2)
+
+ assert_raise(TypeError) do
+ { 'abc_key' => 'abc_value' }.merge! "a"
+ end
end
assert('Hash#values_at') do