Fix #136 error for log entry and failed request

route · route · commit 6e0a845a0aeb · 2021-01-21T21:34:16.000+03:00
diff --git a/lib/ferrum/network.rb b/lib/ferrum/network.rb
@@ -159,18 +159,25 @@ def subscribe
 
       @page.on("Network.loadingFailed") do |params|
         exchange = select(params["requestId"]).last
+        exchange.error ||= Network::Error.new
 
-        if exchange && params['canceled']
-          exchange.error = :canceled
-        end
+        exchange.error.id = params["requestId"]
+        exchange.error.type = params["type"]
+        exchange.error.error_text = params["errorText"]
+        exchange.error.monotonic_time = params["timestamp"]
+        exchange.error.canceled = params["canceled"]
       end
 
       @page.on("Log.entryAdded") do |params|
         entry = params["entry"] || {}
         if entry["source"] == "network" && entry["level"] == "error"
           exchange = select(entry["networkRequestId"]).last
-          error = Network::Error.new(entry)
-          exchange.error = error
+          exchange.error ||= Network::Error.new
+
+          exchange.error.id = entry["networkRequestId"]
+          exchange.error.url = entry["url"]
+          exchange.error.description = entry["text"]
+          exchange.error.timestamp = entry["timestamp"]
         end
       end
     end
diff --git a/lib/ferrum/network/error.rb b/lib/ferrum/network/error.rb
@@ -3,24 +3,17 @@
 module Ferrum
   class Network
     class Error
-      def initialize(data)
-        @data = data
-      end
-
-      def id
-        @data["networkRequestId"]
-      end
-
-      def url
-        @data["url"]
-      end
+      attr_writer :canceled
+      attr_reader :time, :timestamp
+      attr_accessor :id, :url, :type, :error_text, :monotonic_time, :description
 
-      def description
-        @data["text"]
+      def canceled?
+        @canceled
       end
 
-      def time
-        @time ||= Time.strptime(@data["timestamp"].to_s, "%s")
+      def timestamp=(value)
+        @timestamp = value
+        @time = Time.strptime((value / 1000).to_s, "%s")
       end
     end
   end
diff --git a/spec/network_spec.rb b/spec/network_spec.rb
@@ -69,7 +69,12 @@ module Ferrum
 
     it "captures canceled requests" do
       browser.go_to("/ferrum/with_ajax_connection_canceled")
-      expect(browser.at_xpath("//h1[text() = 'Canceled']")).to be
+
+      # FIXME: Hack to wait for content in the browser
+      Ferrum.with_attempts(errors: RuntimeError, max: 10, wait: 0.1) do
+        browser.at_xpath("//h1[text() = 'Canceled']") || raise("Node not found")
+      end
+
       expect(browser.network.idle?).to be true
     end
 
diff --git a/spec/support/views/with_ajax_connection_canceled.erb b/spec/support/views/with_ajax_connection_canceled.erb
@@ -8,8 +8,11 @@
   <body>
     <h1>Here</h1>
     <script>
-      $.ajax("http://localhost:12345/slow_response").abort();
-      $("h1").text("Canceled");
+      let req = $.ajax("/ferrum/really_slow");
+      setTimeout(() => {
+        req.abort();
+        $("h1").text("Canceled");
+      }, 500);
     </script>
   </body>
 </html>
