[ruby/yarp] Use assert_raise

https://github.com/ruby/yarp/commit/b85e01d77d

1 files changed, 12 insertions, 0 deletions

diff --git a/test/yarp/ruby_api_test.rb b/test/yarp/ruby_api_test.rb
index 4e952b8b25..79a5e2ab0a 100644
--- a/test/yarp/ruby_api_test.rb
+++ b/test/yarp/ruby_api_test.rb
@@ -40,10 +40,14 @@ class YARPRubyAPITest < Test::Unit::TestCase
     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
 
@@ -51,6 +55,7 @@ class YARPRubyAPITest < Test::Unit::TestCase
     other_arg = other_args_node.arguments[0]
 
 <<<<<<< HEAD
+<<<<<<< HEAD
     e = assert_rais RuntimeError do
 =======
     assert_raises RuntimeError, "Incompatible sources" do
@@ -63,6 +68,13 @@ class YARPRubyAPITest < Test::Unit::TestCase
 =======
     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