archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-26 22:45:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix merge error on ruby_api_test.rb

Browse source
This commit is contained in:
Kevin Newton 2023-08-30 12:43:56 -04:00
parent c5c0a3cf17
commit 06f54c9a8c
No known key found for this signature in database
GPG key ID: 0EAD74C79EC73F26
1 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/yarp/ruby_api_test.rb
View file

@ -39,42 +39,18 @@ class YARPRubyAPITest < Test::Unit::TestCase
assert_equal 0, joined.start_offset
assert_equal 10, joined.length
<<<<<<< HEAD
<<<<<<< HEAD
e = assert_rais RuntimeError do
=======
assert_raises RuntimeError, "Incompatible locations" do
>>>>>>> 687213d2e38 (use a more idiomatic form of `assert_raises`)
=======
assert_raise RuntimeError, "Incompatible locations" do
>>>>>>> b85e01d77d2 (Use assert_raise)
arg.location.join(recv.location)
end
other_recv, other_args_node, _ = parse_expression("1234 + 567").child_nodes
other_arg = other_args_node.arguments[0]
<<<<<<< HEAD
<<<<<<< HEAD
e = assert_rais RuntimeError do
=======
assert_raises RuntimeError, "Incompatible sources" do
>>>>>>> 687213d2e38 (use a more idiomatic form of `assert_raises`)
other_arg.location.join(recv.location)
end
<<<<<<< HEAD
e = assert_rais RuntimeError do
=======
assert_raises RuntimeError, "Incompatible sources" do
>>>>>>> 687213d2e38 (use a more idiomatic form of `assert_raises`)
=======
assert_raise RuntimeError, "Incompatible sources" do
other_arg.location.join(recv.location)
end
assert_raise RuntimeError, "Incompatible sources" do
>>>>>>> b85e01d77d2 (Use assert_raise)
recv.location.join(other_arg.location)
end
end