[ruby/yarp] use a more idiomatic form of `assert_raises`

https://github.com/ruby/yarp/commit/687213d2e3

1 files changed, 12 insertions, 3 deletions

diff --git a/test/yarp/ruby_api_test.rb b/test/yarp/ruby_api_test.rb
index b74da653f4..4e952b8b25 100644
--- a/test/yarp/ruby_api_test.rb
+++ b/test/yarp/ruby_api_test.rb
@@ -39,23 +39,32 @@ class YARPRubyAPITest < Test::Unit::TestCase
     assert_equal 0, joined.start_offset
     assert_equal 10, joined.length
 
+<<<<<<< HEAD
     e = assert_rais RuntimeError do
+=======
+    assert_raises RuntimeError, "Incompatible locations" do
+>>>>>>> 687213d2e38 (use a more idiomatic form of `assert_raises`)
       arg.location.join(recv.location)
     end
-    assert_equal "Incompatible locations", e.message
 
     other_recv, other_args_node, _ = parse_expression("1234 + 567").child_nodes
     other_arg = other_args_node.arguments[0]
 
+<<<<<<< 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
-    assert_equal "Incompatible sources", e.message
 
+<<<<<<< HEAD
     e = assert_rais RuntimeError do
+=======
+    assert_raises RuntimeError, "Incompatible sources" do
+>>>>>>> 687213d2e38 (use a more idiomatic form of `assert_raises`)
       recv.location.join(other_arg.location)
     end
-    assert_equal "Incompatible sources", e.message
   end
 
   private