Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/capybara/apparition/network_traffic/request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ def initialize(data, response_parts = [])
@response_parts = response_parts
@response = nil
@blocked_params = nil
@finished = false
end

def response=(response)
Expand Down Expand Up @@ -43,5 +44,13 @@ def blocked?
def error
response_parts.last&.error
end

def finished?
@finished
end

def finish!
@finished = true
end
end
end
5 changes: 5 additions & 0 deletions lib/capybara/apparition/page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions spec/integration/driver_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,14 @@ def create_screenshot(file, *args)

expect(@driver.network_traffic(:blocked).length).to eq(0)
end

it 'keeps track of whether network traffic is finished' do
@driver.clear_network_traffic
@session.visit('/apparition/with_js')
expect(@driver.network_traffic.last).not_to be_finished
sleep 1
expect(@driver.network_traffic.last).to be_finished
end
end

context 'memory cache clearing' do
Expand Down