Raise StatusError on top frame navigation error (#341)

rubycdp · Feb 16, 2023 · a6708f9 · a6708f9
1 parent 0cab51d
commit a6708f9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -595,10 +595,9 @@ Activates offline mode for a page.
 
 ```ruby
 browser.network.offline_mode
-browser.go_to("https://github.com/") # => Ferrum::StatusError (Request to https://github.com/ failed to reach server, check DNS and server status)
+browser.go_to("https://github.com/") # => Ferrum::StatusError (Request to https://github.com/ failed(net::ERR_INTERNET_DISCONNECTED))
 ```
 
-
 ## Proxy
 
 You can set a proxy with a `:proxy` option:

diff --git a/lib/ferrum/network.rb b/lib/ferrum/network.rb
@@ -333,8 +333,7 @@ def emulate_network_conditions(offline: false, latency: 0,
     #
     # @example
     #   browser.network.offline_mode
-    #   browser.go_to("https://github.com/") # => Ferrum::StatusError (Request to https://github.com/ failed to reach
-    #   server, check DNS and server status)
+    #   browser.go_to("https://github.com/") # => Ferrum::StatusError (Request to https://github.com/ failed (net::ERR_INTERNET_DISCONNECTED))
     #
     def offline_mode
       emulate_network_conditions(offline: true, latency: 0, download_throughput: 0, upload_throughput: 0)

diff --git a/lib/ferrum/page.rb b/lib/ferrum/page.rb
@@ -114,14 +114,7 @@ def go_to(url = nil)
       options = { url: combine_url!(url) }
       options.merge!(referrer: referrer) if referrer
       response = command("Page.navigate", wait: GOTO_WAIT, **options)
-      # https://cs.chromium.org/chromium/src/net/base/net_error_list.h
-      if %w[net::ERR_NAME_NOT_RESOLVED
-            net::ERR_NAME_RESOLUTION_FAILED
-            net::ERR_INTERNET_DISCONNECTED
-            net::ERR_CONNECTION_TIMED_OUT
-            net::ERR_FILE_NOT_FOUND].include?(response["errorText"])
-        raise StatusError, options[:url]
-      end
+      raise StatusError.new(options[:url], "Request to #{options[:url]} failed (#{response['errorText']})") if response['errorText']
 
       response["frameId"]
     rescue TimeoutError

diff --git a/spec/network/exchange_spec.rb b/spec/network/exchange_spec.rb
@@ -91,7 +91,12 @@
       network.intercept
       page.on(:request) { |r, _, _| r.abort }
 
-      page.go_to
+      expect do
+        page.go_to
+      end.to raise_error(
+        Ferrum::StatusError,
+        %r{Request to http://127.0.0.1:#{server.port} failed \(net::ERR_BLOCKED_BY_CLIENT\)}
+      )
 
       expect(page.body).not_to include("Hello world!")
       expect(last_exchange.blocked?).to be true

diff --git a/spec/network_spec.rb b/spec/network_spec.rb
@@ -456,7 +456,7 @@
 
     expect { page.go_to("/ferrum/with_js") }.to raise_error(
       Ferrum::StatusError,
-      %r{Request to http://.*/ferrum/with_js failed to reach server, check DNS and server status}
+      %r{Request to http://.*/ferrum/with_js failed \(net::ERR_INTERNET_DISCONNECTED\)}
     )
 
     expect(page.body).to eq("<html><head></head><body></body></html>")

diff --git a/spec/page_spec.rb b/spec/page_spec.rb
@@ -16,32 +16,10 @@
     end
 
     context "with failing response" do
-      it "handles when a non-existent file was specified" do
-        file_name = "file:non-existent"
-
-        expect do
-          page.go_to(file_name)
-        end.to raise_error(
-          Ferrum::StatusError,
-          "Request to #{file_name} failed to reach server, check DNS and server status"
-        )
-      end
-
-      it "handles when DNS is incorrect" do
+      it "handles navigation error" do
         expect { page.go_to("http://nope:#{port}/") }.to raise_error(
           Ferrum::StatusError,
-          %r{Request to http://nope:\d+/ failed to reach server, check DNS and server status}
-        )
-      end
-
-      it "has a descriptive message when DNS incorrect" do
-        url = "http://nope:#{port}/"
-
-        expect do
-          page.go_to(url)
-        end.to raise_error(
-          Ferrum::StatusError,
-          /Request to #{url} failed to reach server, check DNS and server status/
+          %r{Request to http://nope:\d+/ failed \(net::ERR_NAME_NOT_RESOLVED\)}
         )
       end