diff options
author | Kevin Newton <kddnewton@gmail.com> | 2023-08-30 12:43:56 -0400 |
---|---|---|
committer | Kevin Newton <kddnewton@gmail.com> | 2023-08-30 12:43:56 -0400 |
commit | 06f54c9a8c3058883e4c42c5b0d3c6e498d2f3ad (patch) | |
tree | 151874e1ca099c9b388f418517ed94fff5e1e34b | |
parent | c5c0a3cf1772c9345373ecc4d7558f216b4ceb62 (diff) | |
download | ruby-06f54c9a8c3058883e4c42c5b0d3c6e498d2f3ad.tar.gz |
Fix merge error on ruby_api_test.rb
-rw-r--r-- | test/yarp/ruby_api_test.rb | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/test/yarp/ruby_api_test.rb b/test/yarp/ruby_api_test.rb index 79a5e2ab0a..236407ccac 100644 --- a/test/yarp/ruby_api_test.rb +++ b/test/yarp/ruby_api_test.rb @@ -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 |