Fix: Safe call body method (DOM) when page is empty (#522)

Mihoid · web-flow · commit 486a64a6b43e · 2025-02-20T11:18:47.000+05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Correctly set mouse events buttons property [#509]
 - Prevent 'Hash#[]=': can't add a new key into hash during iteration [#513]
 - `Ferrum::Network::Exchange#finished?` and `Ferrum::Network#wait_for_idle` take into account that request can be a blob [#496]
+- Safe call _body_ method (DOM) when page is empty and no html [#522]
 
 ### Removed
 
diff --git a/lib/ferrum/frame/dom.rb b/lib/ferrum/frame/dom.rb
@@ -92,7 +92,7 @@ def doctype
       #   browser.body # => '<html itemscope="" itemtype="http://schema.org/WebPage" lang="ru"><head>...
       #
       def body
-        evaluate("document.documentElement.outerHTML")
+        evaluate("document.documentElement?.outerHTML") || ""
       end
 
       #
diff --git a/spec/network_spec.rb b/spec/network_spec.rb
@@ -517,6 +517,6 @@
       %r{Request to http://.*/with_js failed \(net::ERR_INTERNET_DISCONNECTED\)}
     )
 
-    expect(page.at_css("body").text).to match("No internet")
+    expect(page.at_css("body").text).to match("")
   end
 end
diff --git a/spec/unit/browser_spec.rb b/spec/unit/browser_spec.rb
@@ -19,7 +19,7 @@ def puts(*args)
     browser = Ferrum::Browser.new(logger: logger)
     browser.body
     file_log = File.read(file_path)
-    expect(file_log).to include("return document.documentElement.outerHTML")
+    expect(file_log).to include("return document.documentElement?.outerHTML")
     expect(file_log).to include("<html><head></head><body></body></html>")
   ensure
     FileUtils.rm_f(file_path)
@@ -32,7 +32,7 @@ def puts(*args)
 
     browser.body
 
-    expect(logger.string).to include("return document.documentElement.outerHTML")
+    expect(logger.string).to include("return document.documentElement?.outerHTML")
     expect(logger.string).to include("<html><head></head><body></body></html>")
   ensure
     browser.quit

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ def doctype`
`92`	`92`	`# browser.body # => '<html itemscope="" itemtype="http://schema.org/WebPage" lang="ru"><head>...`
`93`	`93`	`#`
`94`	`94`	`def body`
`95`		`- evaluate("document.documentElement.outerHTML")`
	`95`	`+ evaluate("document.documentElement?.outerHTML") \|\| ""`
`96`	`96`	`end`
`97`	`97`
`98`	`98`	`#`
Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,6 @@`
`517`	`517`	`%r{Request to http://.*/with_js failed \(net::ERR_INTERNET_DISCONNECTED\)}`
`518`	`518`	`)`
`519`	`519`
`520`		`- expect(page.at_css("body").text).to match("No internet")`
	`520`	`+ expect(page.at_css("body").text).to match("")`
`521`	`521`	`end`
`522`	`522`	`end`