diff --git a/CHANGELOG.md b/CHANGELOG.md index 814dbd0..2c409ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ - `:pending_connection_errors` is handled by Cuprite instead of being passed to Ferrum, which deprecates it. `visit` raises `Capybara::Cuprite::PendingConnectionsError`, a subclass of Ferrum's, and rescuing Ferrum's warns [rubycdp/ferrum#689] +- Dialogs are handled with Ferrum's `on(:dialog)` instead of the raw CDP event, so Ferrum's default handler no longer + accepts them first and loses dismissals and prompt responses [rubycdp/ferrum#703] ### Fixed - A click on a node the page removes before the hit test raises `ObsoleteNode`, which Capybara retries, instead of diff --git a/Gemfile b/Gemfile index 6dbf95d..63d7431 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "byebug", "~> 11.1", platforms: %i[mri windows] +gem "ferrum", github: "rubycdp/ferrum", branch: "main" gem "launchy", "~> 2.5" gem "logger" gem "ostruct" diff --git a/lib/capybara/cuprite/page/modals.rb b/lib/capybara/cuprite/page/modals.rb index 020d9d2..4e31514 100644 --- a/lib/capybara/cuprite/page/modals.rb +++ b/lib/capybara/cuprite/page/modals.rb @@ -14,13 +14,14 @@ def initialize(...) super end - # The `Page.javascriptDialogOpening` event is handled on Ferrum's - # background CDP dispatcher thread, so raising there wouldn't reach - # the caller and would permanently kill that thread instead. The - # dialog is always accepted immediately from that thread, and the - # error (if any) is stashed here to be raised from the main thread - # the next time it makes a command round trip. + # Dialogs are handled on Ferrum's background dispatcher thread, so + # raising there wouldn't reach the caller. The dialog is answered + # from that thread, skipping the pending error check, and the error + # (if any) is stashed here to be raised from the calling thread the + # next time it makes a command round trip. def command(...) + return super if Thread.current[:cuprite_handling_dialog] + raise_pending_unhandled_modal_error! { super } end @@ -78,20 +79,20 @@ def raise_pending_unhandled_modal_error! def prepare_page super - on("Page.javascriptDialogOpening") { |params| handle_javascript_dialog(params) } + on(:dialog) { |dialog| handle_dialog(dialog) } end - def handle_javascript_dialog(params) + def handle_dialog(dialog) accept_modal = @accept_modal.last unhandled_modal_error = nil if [true, false].include?(accept_modal) @accept_modal.pop - @modal_messages << params["message"] - options = { accept: accept_modal } - response = @modal_response || params["defaultPrompt"] + @modal_messages << dialog.message + accept = accept_modal + response = @modal_response else - with_text = params["message"] ? "with text `#{params['message']}` " : "" + with_text = dialog.message ? "with text `#{dialog.message}` " : "" message = "Modal window #{with_text}has been opened, but you didn't wrap " \ "your code into (`accept_prompt` | `dismiss_prompt` | " \ "`accept_confirm` | `dismiss_confirm` | `accept_alert`), " \ @@ -103,15 +104,19 @@ def handle_javascript_dialog(params) warn message end - options = { accept: true } - response = params["defaultPrompt"] + accept = true end - options.merge!(promptText: response) if response - # Skips #command so a pending error isn't raised on the dispatcher thread. - client.command("Page.handleJavaScriptDialog", timeout: timeout, **options) + answer_dialog(dialog, accept, response) @unhandled_modal_error = unhandled_modal_error if unhandled_modal_error end + + def answer_dialog(dialog, accept, response) + Thread.current[:cuprite_handling_dialog] = true + accept ? dialog.accept(response) : dialog.dismiss + ensure + Thread.current[:cuprite_handling_dialog] = nil + end end end end