fix: consider existing frames when waiting for a frame

puppeteer/puppeteer#8200
YusukeIwaki · Jun 20, 2022 · 42f24f3 · 42f24f3
1 parent c5d4e41
commit 42f24f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/puppeteer/page.rb b/lib/puppeteer/page.rb
@@ -814,6 +814,10 @@ def wait_for_frame(url: nil, predicate: nil, timeout: nil)
         predicate
       end
 
+    frames.each do |frame|
+      return frame if frame_predicate.call(frame)
+    end
+
     wait_for_frame_manager_event(
       FrameManagerEmittedEvents::FrameAttached,
       FrameManagerEmittedEvents::FrameNavigated,

diff --git a/spec/integration/oopif_spec.rb b/spec/integration/oopif_spec.rb
@@ -221,4 +221,12 @@ def oopifs(context)
     expect(result_bounding_box.x).to be > 150 # padding + margin + border left
     expect(result_bounding_box.y).to be > 150 # padding + margin + border top
   end
+
+  it 'should resolve immediately if the frame already exists' do
+    page.goto(server_empty_page)
+    attach_frame(page, 'frame2', "#{server_cross_process_prefix}/empty.html")
+    predicate = ->(frame) { frame.url&.end_with?('/empty.html') }
+    frame = page.wait_for_frame(predicate: predicate)
+    expect(frame.url).to end_with("/empty.html")
+  end
 end