+ assert_match now returns the MatchData on success. (Nakilon)

[git-p4: depot-paths = "//src/minitest/dev/": change = 13421]
minitest · Jun 5, 2022 · ed224bc · ed224bc
1 parent 8a131bf
commit ed224bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/minitest/assertions.rb b/lib/minitest/assertions.rb
@@ -293,6 +293,8 @@ def assert_match matcher, obj, msg = nil
       assert_respond_to matcher, :"=~"
       matcher = Regexp.new Regexp.escape matcher if String === matcher
       assert matcher =~ obj, msg
+
+      Regexp.last_match
     end
 
     ##

diff --git a/test/minitest/test_minitest_assertions.rb b/test/minitest/test_minitest_assertions.rb
@@ -484,7 +484,10 @@ def test_assert_kind_of_triggered
 
   def test_assert_match
     @assertion_count = 2
-    @tc.assert_match(/\w+/, "blah blah blah")
+    m = @tc.assert_match(/\w+/, "blah blah blah")
+
+    assert_kind_of MatchData, m
+    assert_equal "blah", m[0]
   end
 
   def test_assert_match_matchee_to_str

diff --git a/test/minitest/test_minitest_spec.rb b/test/minitest/test_minitest_spec.rb
@@ -505,7 +505,7 @@ def assert_success spec
   it "needs to verify regexp matches" do
     @assertion_count += 3 # must_match is 2 assertions
 
-    assert_success _("blah").must_match(/\w+/)
+    assert_kind_of MatchData, _("blah").must_match(/\w+/)
 
     assert_triggered "Expected /\\d+/ to match \"blah\"." do
       _("blah").must_match(/\d+/)