Fix #102 no more monkey patching

Author: route

lib/capybara/cuprite.rb

@@ -2,18 +2,12 @@
 
 require "ferrum"
 require "capybara"
-
-module Capybara::Cuprite
-end
-
 require "capybara/cuprite/driver"
 require "capybara/cuprite/browser"
 require "capybara/cuprite/page"
 require "capybara/cuprite/node"
 require "capybara/cuprite/errors"
 
-Ferrum::Page.prepend(Capybara::Cuprite::Page)
-
 Capybara.register_driver(:cuprite) do |app|
   Capybara::Cuprite::Driver.new(app)
 end

lib/capybara/cuprite/browser.rb

@@ -23,12 +23,12 @@ def initialize(options = nil)
 
     def page
       raise Ferrum::NoSuchPageError if @page.nil?
-      @page ||= default_context.page
+      @page ||= attach_page
     end
 
     def reset
       super
-      @page = default_context.page
+      @page = attach_page
     end
 
     def quit
@@ -81,7 +81,7 @@ def within_window(locator = nil, &block)
 
       if Capybara::VERSION.to_f < 3.0
         target_id = window_handles.find do |target_id|
-          page = targets[target_id].page
+          page = attach_page(target_id)
           locator == page.frame_name
         end
         locator = target_id if target_id
@@ -100,13 +100,13 @@ def within_window(locator = nil, &block)
     def switch_to_window(target_id)
       target = targets[target_id]
       raise Ferrum::NoSuchPageError unless target
-      @page = target.page
+      @page = attach_page(target.id)
     end
 
     def close_window(target_id)
       target = targets[target_id]
       raise Ferrum::NoSuchPageError unless target
-      @page = nil if @page == target.page
+      @page = nil if @page.target_id == target.id
       target.page.close
     end
 
@@ -200,5 +200,15 @@ def prepare_wildcards(wc)
         end
       end
     end
+
+    def attach_page(target_id = nil)
+      target = targets[target_id] if target_id
+      target ||= default_context.default_target
+      return target.page if target.attached?
+
+      target.maybe_sleep_if_new_window
+      target.page = Page.new(target.id, self)
+      target.page
+    end
   end
 end

lib/capybara/cuprite/driver.rb

@@ -129,7 +129,10 @@ def close_window(handle)
     end
 
     def open_new_window
-      browser.create_page
+      target = browser.default_context.create_target
+      target.maybe_sleep_if_new_window
+      target.page = Page.new(target.id, browser)
+      target.page
     end
 
     def switch_to_window(handle)

lib/capybara/cuprite/page.rb

@@ -3,15 +3,14 @@
 require "forwardable"
 
 module Capybara::Cuprite
-  module Page
+  class Page < Ferrum::Page
     MODAL_WAIT = ENV.fetch("CUPRITE_MODAL_WAIT", 0.05).to_f
     TRIGGER_CLICK_WAIT = ENV.fetch("CUPRITE_TRIGGER_CLICK_WAIT", 0.1).to_f
 
     extend Forwardable
     delegate %i[at_css at_xpath css xpath
-                current_url current_title body
-                execution_id evaluate evaluate_on evaluate_async execute] => :active_frame
-
+                current_url current_title body execution_id
+                evaluate evaluate_on evaluate_async execute] => :active_frame
 
     def initialize(*args)
       @frame_stack = []