Add Capybara::Apparition::NetworkTraffic::Request#finished?

twalpole · Apr 16, 2020 · c583c9d · c583c9d
1 parent f347909
commit c583c9d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/capybara/apparition/network_traffic/request.rb b/lib/capybara/apparition/network_traffic/request.rb
@@ -10,6 +10,7 @@ def initialize(data, response_parts = [])
       @response_parts = response_parts
       @response = nil
       @blocked_params = nil
+      @finished = false
     end
 
     def response=(response)
@@ -43,5 +44,13 @@ def blocked?
     def error
       response_parts.last&.error
     end
+
+    def finished?
+      @finished
+    end
+
+    def finish!
+      @finished = true
+    end
   end
 end
diff --git a/lib/capybara/apparition/page.rb b/lib/capybara/apparition/page.rb
@@ -552,6 +552,11 @@ def register_event_handlers
         end
       end
 
+      @session.on 'Network.loadingFinished' do |request_id:, **|
+        req = @network_traffic.find { |request| request.request_id == request_id }
+        req&.finish!
+      end
+
       @session.on 'Network.loadingFailed' do |type:, request_id:, blocked_reason: nil, error_text: nil, **params|
         req = @network_traffic.find { |request| request.request_id == request_id }
         req&.blocked_params = params if blocked_reason