assert_dom :text collapses whitespace

Gemfile.lock

@@ -89,6 +89,7 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES

lib/rails/dom/testing/assertions/selector_assertions/html_selector.rb

@@ -51,14 +51,16 @@ def filter(matches)
 
                 content_mismatch = nil
                 text_matches = tests.has_key?(:text)
+                html_matches = tests.has_key?(:html)
                 regex_matching = match_with.is_a?(Regexp)
 
                 remaining = matches.reject do |match|
                   # Preserve markup with to_s for html elements
-                  content = text_matches ? match.text : match.children.to_s
+                  content = text_matches ? match.text : match.inner_html
 
                   content.strip! unless NO_STRIP.include?(match.name)
                   content.delete_prefix!("\n") if text_matches && match.name == "textarea"
+                  collapse_html_whitespace!(content) unless NO_STRIP.include?(match.name) || html_matches
 
                   next if regex_matching ? (content =~ match_with) : (content == match_with)
                   content_mismatch ||= diff(match_with, content)
@@ -138,6 +140,10 @@ def extract_equality_tests(refute)
 
                 comparisons
               end
+
+              def collapse_html_whitespace!(text)
+                text.gsub!(/\s+/, " ")
+              end
           end
         end
       end

test/selector_assertions_test.rb

@@ -237,6 +237,42 @@ def test_assert_select_with_invalid_minimum_and_maximum
     assert_equal "Range begin or :minimum cannot be greater than Range end or :maximum", error.message
   end
 
+  def test_assert_select_text_equality_collapses_whitespace
+    render_html "<p>Some\n   line-broken\n   text</p>"
+
+    assert_nothing_raised do
+      assert_select "p", {
+        text: "Some line-broken text",
+      }, "Whitespace was not collapsed from text"
+    end
+
+    render_html "<p>Some<br><br>line-broken<br><br>text</p>"
+
+    assert_nothing_raised do
+      assert_select "p", {
+        text: "Someline-brokentext",
+      }, "<br> was not removed from text"
+    end
+  end
+
+  def test_assert_select_html_equality_respects_whitespace
+    render_html "<p>Some\n   line-broken\n   text</p>"
+
+    assert_nothing_raised do
+      assert_select "p", {
+        html: "Some\n   line-broken\n   text",
+      }, "Whitespace was collapsed from html"
+    end
+
+    render_html "<p>Some<br><br>line-broken<br><br>text</p>"
+
+    assert_nothing_raised do
+      assert_select "p", {
+        html: "Some<br><br>line-broken<br><br>text",
+      }, "<br> was removed from html"
+    end
+  end
+
   #
   # Test assert_not_select.
   #