apparition 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69753c37a3e00ce9d57e86847601bef5e39a820ebef96db2c4ad7a6cb922f341
-  data.tar.gz: 486caf74087a17e078b39e4960a0c707b090142f1831d12b9755ad8b2cbb0596
+  metadata.gz: 2df57d16d5cfa6f966f3b8de2146a63ca23877e4dddc2f81a12170ae37f5ec5d
+  data.tar.gz: b7b06eacc056f6b627b31ad091a7db9af5508b3f14ae69e7d9f1bedce6e8e63a
 SHA512:
-  metadata.gz: 2f512ba7bbaca565d304a2ac0ede0d1c2b41fd3dc38d7f00b8dbe30b75bba2bbf3c35d7bcea2b00a17bdcbdb9d1702c27efcdfb9ef082b75de3988e7e48664c6
-  data.tar.gz: e01438d8900cd67015e0b473e7f710528ac1d8d4597cb8d0f47c97a1971a914b63cb52013bc1958d46621be58123105e1ed1f3d8f9e033ca0d908490fb152f8f
+  metadata.gz: fd65552a378369a1d27852736c1cf2e1c51fb852a2c3e7c90b7c536f58608846bec86b471f009ef6eb9f9cbb803773d99c8af9b01575a0e5b2de953f1e0093f2
+  data.tar.gz: 77f8e17427d5621179b1707182e6df8bf3fc2bc52cb9f5f25e42ed31c6db945bd28b00c8f20ea09c2cf55e76476cf0fe467fd0b5aa8eece8f13a08611d9408e5

data/README.md

@@ -5,7 +5,7 @@
 Apparition is a driver for [Capybara](https://github.com/jnicklas/capybara). It allows you to
 run your Capybara tests in the Chrome browser via CDP (no selenium or chromedriver needed) in a headless or
 headed configuration. It started as a fork of Poltergeist and attempts to maintain as much compatibility
-with the Poltergeist API as possible, with the thought to add a capybara-webkit compatibility wrapper at some future point in time.
+with the Poltergeist API as possible.  Implementing the `capybara-webkit` specific driver methods has also begun.
 
 ## Getting help ##
 
@@ -217,7 +217,7 @@ Include as much information as possible. For example:
 
 * Specific steps to reproduce where possible (failing tests are even
   better)
-* The output obtained from running Apparition with `:debug` turned on
+* The output obtained from running Apparition with `:debug` turned on or ENV['DEBUG'] set
 * Screenshots
 * Stack traces if there are any Ruby on JavaScript exceptions generated
 * The Apparition, Capybara, and Chrome version numbers used

data/lib/capybara/apparition/browser.rb

@@ -9,7 +9,7 @@ require 'time'
 
 module Capybara::Apparition
   class Browser
-    attr_reader :client, :paper_size, :zoom_factor, :console
+    attr_reader :client, :paper_size, :zoom_factor, :console, :proxy_auth
     extend Forwardable
 
     delegate %i[visit current_url status_code
@@ -27,7 +27,9 @@ module Capybara::Apparition
       @context_id = nil
       @js_errors = true
       @ignore_https_errors = false
+      @logger = logger
       @console = Console.new(logger)
+      @proxy_auth = nil
 
       initialize_handlers
 
@@ -102,7 +104,7 @@ module Capybara::Apparition
     def close_window(handle)
       @current_page_handle = nil if @current_page_handle == handle
       win_target = @targets.delete(handle)
-      warn "Window was already closed unexpectedly" if win_target.nil?
+      warn 'Window was already closed unexpectedly' if win_target.nil?
       win_target&.close
     end
 
@@ -205,9 +207,21 @@ module Capybara::Apparition
     end
 
     def cookies
-      current_page.command('Network.getCookies')['cookies'].each_with_object({}) do |c, h|
-        h[c['name']] = Cookie.new(c)
-      end
+      CookieJar.new(
+        # current_page.command('Network.getCookies')['cookies'].map { |c| Cookie.new(c) }
+        self
+      )
+    end
+
+    def all_cookies
+      CookieJar.new(
+        # current_page.command('Network.getAllCookies')['cookies'].map { |c| Cookie.new(c) }
+        self
+      )
+    end
+
+    def get_raw_cookies
+      current_page.command('Network.getAllCookies')['cookies'].map { |c| Cookie.new(c) }
     end
 
     def set_cookie(cookie)
@@ -231,6 +245,14 @@ module Capybara::Apparition
       current_page.command('Emulation.setDocumentCookieDisabled', disabled: !flag)
     end
 
+    def set_proxy_auth(user, password)
+      @proxy_auth = if user.nil? && password.nil?
+        nil
+      else
+        { username: user, password: password }
+      end
+    end
+
     def set_http_auth(user = nil, password = nil)
       current_page.credentials = if user.nil? && password.nil?
         nil
@@ -311,8 +333,8 @@ module Capybara::Apparition
       current_target.page
     end
 
-    def console_messages
-      console.messages
+    def console_messages(type = nil)
+      console.messages(type)
     end
 
   private
@@ -326,7 +348,7 @@ module Capybara::Apparition
     end
 
     def log(message)
-      logger&.puts message if ENV['DEBUG']
+      @logger&.puts message if ENV['DEBUG']
     end
 
     def check_render_options!(options, path = nil)

data/lib/capybara/apparition/console.rb

@@ -7,17 +7,19 @@ module Capybara::Apparition
       @messages = []
     end
 
-    def log(type, message)
-      @messages << OpenStruct.new(type: type, message: message)
-      @logger&.puts message
+    def log(type, message, **options)
+      @messages << OpenStruct.new(type: type, message: message, **options)
+      @logger&.puts "#{type}: #{message}"
     end
 
     def clear
       @messages.clear
     end
 
-    def messages
-      @messages
+    def messages(type = nil)
+      return @messages if type.nil?
+
+      @messages.select { |msg| msg.type == type }
     end
   end
 end

data/lib/capybara/apparition/cookie.rb

@@ -48,9 +48,10 @@ module Capybara::Apparition
       Time.at @attributes['expires'] unless [nil, 0, -1].include? @attributes['expires']
     end
 
-    def ==(value)
-      return super unless value.is_a? String
-      self.value == value
+    def ==(other)
+      return super unless other.is_a? String
+
+      value == other
     end
   end
 end

data/lib/capybara/apparition/cookie_jar.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'capybara/apparition/cookie'
+
+module Capybara::Apparition
+  class CookieJar
+    def initialize(browser)
+      @browser = browser
+    end
+
+    # def find(name, domain = nil, path = '/')
+    def find(name, domain = URI.parse(@browser.current_url).host, path = URI.parse(@browser.current_url).path)
+      # sort by path length because more specific take precendence
+      cookies.sort_by { |c| -c.path.length }.find do |cookie|
+        cookie.name.casecmp(name).zero? &&
+          (domain.nil? || match_domain?(cookie, domain)) &&
+          (path.nil? || match_path?(cookie, path))
+      end
+    end
+    alias_method :[], :find
+
+  private
+
+    def match_domain?(cookie, domain)
+      domain = '.' + domain
+      cookie_domain = cookie.domain
+      cookie_domain = '.' + cookie_domain unless cookie_domain.start_with?('.')
+      # cookie_domain.downcase.end_with? domain.downcase
+      domain.downcase.end_with? cookie_domain.downcase
+    end
+
+    def match_path?(cookie, path)
+      # cookie.path.start_with? path
+      path.start_with? cookie.path
+    end
+
+    def cookies
+      @browser.get_raw_cookies
+    end
+  end
+end

data/lib/capybara/apparition/dev_tools_protocol/session.rb

@@ -14,16 +14,31 @@ module Capybara::Apparition
       end
 
       def command(name, **params)
-        @browser.command_for_session(@session_id, name, params).result
+        send_cmd(name, params).result
+      end
+
+      def commands(*names)
+        responses = names.map { |name| send_cmd(name) }
+        responses.map(&:result)
       end
 
       def async_command(name, **params)
-        @browser.command_for_session(@session_id, name, params).discard_result
+        send_cmd(name, params).discard_result
+      end
+
+      def async_commands(*names)
+        names.map { |name| async_command(name) }
       end
 
       def on(event_name, &block)
         connection.on(event_name, @session_id, &block)
       end
+
+    private
+
+      def send_cmd(name, **params)
+        @browser.command_for_session(@session_id, name, params)
+      end
     end
   end
 end

data/lib/capybara/apparition/driver.rb

@@ -2,8 +2,8 @@
 
 require 'uri'
 require 'forwardable'
-require 'capybara/apparition/chrome_client'
-require 'capybara/apparition/launcher'
+require 'capybara/apparition/driver/chrome_client'
+require 'capybara/apparition/driver/launcher'
 
 module Capybara::Apparition
   class Driver < Capybara::Driver::Base
@@ -20,7 +20,7 @@ module Capybara::Apparition
                 scroll_to
                 network_traffic clear_network_traffic
                 headers headers= add_headers
-                cookies remove_cookie clear_cookies cookies_enabled=
+                cookies all_cookies remove_cookie clear_cookies cookies_enabled=
                 clear_memory_cache
                 go_back go_forward refresh
                 console_messages] => :browser
@@ -196,13 +196,20 @@ module Capybara::Apparition
       end
     end
 
-    def set_proxy(host, port, type = nil, user = nil, password = nil, bypass: [])
-      # TODO: Look at implementing via the CDP Fetch domain
-      raise ArgumentError, "Proxy auth is not yet implented" if user || password
+    def set_proxy(host, port, type = nil, user_ = nil, password_ = nil, user: nil, password: nil, bypass: [])
+      if user_ || password_
+        warn '#set_proxy: Passing `user` and `password` as positional arguments is deprecated. ' \
+             'Please pass as keyword arguments.'
+        user ||= user_
+        password ||= password_
+      end
+
+      # TODO: Look at implementing via the CDP Fetch domain when available
       @options[:browser] ||= {}
-      @options[:browser].merge!("proxy-server" => "#{type+"=" if type}#{host}:#{port}")
+      @options[:browser]['proxy-server'] = "#{type + '=' if type}#{host}:#{port}"
       bypass = Array(bypass).join(';')
-      @options[:browser].merge!("proxy-bypass-list" => bypass) unless bypass.empty?
+      @options[:browser]['proxy-bypass-list'] = bypass unless bypass.empty?
+      browser.set_proxy_auth(user, password) if user || password
     end
 
     def add_header(name, value, options = {})
@@ -216,7 +223,7 @@ module Capybara::Apparition
       end
     end
 
-    def set_cookie(name, value=nil, options = {})
+    def set_cookie(name, value = nil, options = {})
       name, value, options = parse_raw_cookie(name) if value.nil?
 
       options[:name]  ||= name
@@ -232,10 +239,12 @@ module Capybara::Apparition
       browser.set_cookie(options)
     end
 
+    def proxy_authorize(user = nil, password = nil)
+      browser.set_proxy_aauth(user, password)
+    end
+
     def basic_authorize(user = nil, password = nil)
       browser.set_http_auth(user, password)
-      # credentials = ["#{user}:#{password}"].pack('m*').strip
-      # add_header('Authorization', "Basic #{credentials}")
     end
     alias_method :authenticate, :basic_authorize
 
@@ -336,7 +345,7 @@ module Capybara::Apparition
     end
 
     def within_frame(frame_selector)
-      warn "Driver#within_frame is deprecated, please use Session#within_frame"
+      warn 'Driver#within_frame is deprecated, please use Session#within_frame'
 
       frame = case frame_selector
       when Capybara::Apparition::Node
@@ -347,7 +356,7 @@ module Capybara::Apparition
         find_css("iframe[name='#{frame_selector}']")[0]
       else
         raise TypeError, 'Unknown frame selector'
-        command("FrameFocus")
+        # command('FrameFocus')
       end
 
       switch_to_frame(frame)
@@ -358,6 +367,10 @@ module Capybara::Apparition
       end
     end
 
+    def error_messages
+      console_messages('error')
+    end
+
   private
 
     def parse_raw_cookie(raw)
@@ -385,7 +398,8 @@ module Capybara::Apparition
         raise Capybara::ModalNotFound if modal_text.nil? || (expect_text && !modal_text.match(expect_regexp))
       rescue Capybara::ModalNotFound => e
         if timer.expired?
-          raise e, 'Timed out waiting for modal dialog. Unable to find modal dialog.' if !found_text
+          raise e, 'Timed out waiting for modal dialog. Unable to find modal dialog.' unless found_text
+
           raise e, 'Unable to find modal dialog' \
                    "#{" with #{expect_text}" if expect_text}" \
                    "#{", did find modal with #{found_text}" if found_text}"

data/lib/capybara/apparition/{chrome_client.rb → driver/chrome_client.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'capybara/apparition/errors'
-require 'capybara/apparition/web_socket_client'
-require 'capybara/apparition/response'
+require 'capybara/apparition/driver/web_socket_client'
+require 'capybara/apparition/driver/response'
 
 module Capybara::Apparition
   class ChromeClient

data/lib/capybara/apparition/errors.rb

@@ -135,7 +135,6 @@ module Capybara
         'The element you are trying to access is not from the current page'
       end
     end
-    NodeNotAttachedError = ObsoleteNode
 
     class UnsupportedFeature < ClientError
       def name

data/lib/capybara/apparition/node.rb

@@ -46,7 +46,7 @@ module Capybara::Apparition
     end
 
     def all_text
-      text = evaluate_on('function(){ return this.textContent }')
+      text = evaluate_on('() => this.textContent')
       text.to_s.gsub(/[\u200b\u200e\u200f]/, '')
           .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
           .gsub(/\A[[:space:]&&[^\u00a0]]+/, '')
@@ -64,20 +64,21 @@ module Capybara::Apparition
           .tr("\u00a0", ' ')
     end
 
-    def text # capybara-webkit method
-      warn "Node#text is deprecated, please use Node#visible_text instead"
+    # capybara-webkit method
+    def text
+      warn 'Node#text is deprecated, please use Node#visible_text instead'
       visible_text
     end
 
     def property(name)
-      evaluate_on('function(name){ return this[name] }', value: name)
+      evaluate_on('name => this[name]', value: name)
     end
 
     def attribute(name)
       if %w[checked selected].include?(name.to_s)
         property(name)
       else
-        evaluate_on('function(name){ return this.getAttribute(name)}', value: name)
+        evaluate_on('name => this.getAttribute(name)', value: name)
       end
     end
 
@@ -95,6 +96,10 @@ module Capybara::Apparition
       evaluate_on GET_VALUE_JS
     end
 
+    def style(styles)
+      evaluate_on GET_STYLES_JS, value: styles
+    end
+
     def set(value, **_options)
       if tag_name == 'input'
         case self[:type]
@@ -137,7 +142,7 @@ module Capybara::Apparition
     end
 
     def tag_name
-      @tag_name ||= evaluate_on('function(){ return this.tagName; }').downcase
+      @tag_name ||= evaluate_on('() => this.tagName').downcase
     end
 
     def visible?
@@ -169,7 +174,7 @@ module Capybara::Apparition
         begin
           new_pos = element_click_pos(options)
           puts "Element moved from #{pos} to #{new_pos}" unless pos == new_pos
-        rescue WrongWorld
+        rescue WrongWorld # rubocop:disable Lint/HandleExceptions
         end
       end
       # Wait a short time to see if click triggers page load
@@ -204,19 +209,25 @@ module Capybara::Apparition
       mouseenter: ['MouseEvent'],
       mouseleave: ['MouseEvent'],
       mousemove: ['MouseEvent', { bubbles: true, cancelable: true }],
-      submit: ['Event', { bubbles: true, cancelable: true }]
+      mouseover: ['MouseEvent', { bubbles: true, cancelable: true }],
+      mouseout: ['MouseEvent', { bubbles: true, cancelable: true }],
+      context_menu: ['MouseEvent', { bubble: true, cancelable: true }],
+      submit: ['Event', { bubbles: true, cancelable: true }],
+      change: ['Event', { bubbles: true, cacnelable: false }],
+      input: ['InputEvent', { bubbles: true, cacnelable: false }],
+      wheel: ['WheelEvent', { bubbles: true, cancelable: true }]
     }.freeze
 
-    def trigger(name, **options)
-      raise ArgumentError, 'Unknown event' unless EVENTS.key?(name.to_sym)
+    def trigger(name, event_type = nil, **options)
+      raise ArgumentError, 'Unknown event' unless EVENTS.key?(name.to_sym) || event_type
 
-      event_type, opts = *EVENTS[name.to_sym], {}
+      event_type, opts = *EVENTS[name.to_sym], {} if event_type.nil?
 
       evaluate_on DISPATCH_EVENT_JS, { value: event_type }, { value: name }, value: opts.merge(options)
     end
 
     def ==(other)
-      evaluate_on('function(el){ return this == el; }', objectId: other.id)
+      evaluate_on('el => this == el', objectId: other.id)
     rescue ObsoleteNode
       false
     end
@@ -328,8 +339,9 @@ module Capybara::Apparition
 
     def scroll_by(x, y)
       evaluate_on <<~JS, { value: x }, value: y
-        function(x, y){ this.scrollBy(x,y); }
+        (x, y) => this.scrollBy(x,y)
       JS
+      self
     end
 
     def scroll_to(element, location, position = nil)
@@ -350,7 +362,7 @@ module Capybara::Apparition
       obsolete_checked_function = <<~JS
         function(){
           if (!this.ownerDocument.contains(this)) { throw 'ObsoleteNode' };
-            return #{page_function.strip}.apply(this, arguments);
+          return (#{page_function.strip}).apply(this, arguments);
         }
       JS
       response = @page.command('Runtime.callFunctionOn',
@@ -371,7 +383,7 @@ module Capybara::Apparition
   private
 
     def in_view_bounding_rect
-      evaluate_on('function(){ this.scrollIntoViewIfNeeded() }')
+      evaluate_on('() => this.scrollIntoViewIfNeeded()')
       result = evaluate_on GET_BOUNDING_CLIENT_RECT_JS
       result = result['model'] if result && result['model']
       result
@@ -422,7 +434,7 @@ module Capybara::Apparition
       value = value.to_s
       if value.empty? && clear.nil?
         evaluate_on <<~JS
-          function() {
+          () => {
             this.focus();
             this.value = '';
             this.dispatchEvent(new Event('change', { bubbles: true }));
@@ -479,7 +491,7 @@ module Capybara::Apparition
 
     def update_value_js(value)
       evaluate_on(<<~JS, value: value)
-        function(value){
+        value => {
           if (document.activeElement !== this){
             this.focus();
           }
@@ -503,7 +515,7 @@ module Capybara::Apparition
       hit_node = Capybara::Apparition::Node.new(driver, @page, r_o['objectId'])
       result = begin
         evaluate_on(<<~JS, objectId: hit_node.id)
-          function(hit_node){
+          (hit_node) => {
             if ((hit_node == this) || this.contains(hit_node))
               return { status: 'success' };
             return { status: 'failure' };
@@ -513,38 +525,6 @@ module Capybara::Apparition
                  { 'status': 'failure' }
       end
       OpenStruct.new(success: result['status'] == 'success', selector: r_o['description'])
-
-      # frame_offset = @page.current_frame_offset
-      # # return { status: 'failure' } if x < 0 || y < 0
-      # result = evaluate_on(<<~JS, { value: x - frame_offset[:x] }, value: y - frame_offset[:y])
-      #   function(x,y){
-      #     const hit_node = document.elementFromPoint(x,y);
-      #     if ((hit_node == this) || this.contains(hit_node))
-      #       return { status: 'success' };
-      #
-      #     const getSelector = function(element){
-      #       if (element == null)
-      #         return 'Element out of bounds';
-      #
-      #       let selector = '';
-      #       if (element.tagName != 'HTML')
-      #         selector = getSelector(element.parentNode) + ' ';
-      #       selector += element.tagName.toLowerCase();
-      #       if (element.id)
-      #         selector += `#${element.id}`;
-      #
-      #       for (let className of element.classList){
-      #         if (className != '')
-      #           selector += `.${className}`;
-      #       }
-      #       return selector;
-      #     }
-      #
-      #     return { status: 'failure', selector: getSelector(hit_node) };
-      #   }
-      # JS
-      #
-      # OpenStruct.new(success: result['status'] == 'success', selector: result['selector'])
     end
 
     def scroll_element_to_location(element, location)
@@ -558,7 +538,7 @@ module Capybara::Apparition
       else
         raise ArgumentError, "Invalid scroll_to location: #{location}"
       end
-      element.evaluate_on "function(){ this.scrollIntoView(#{scroll_opts}) }"
+      element.evaluate_on "() => this.scrollIntoView(#{scroll_opts})"
     end
 
     def scroll_to_location(location)
@@ -570,12 +550,12 @@ module Capybara::Apparition
       when :center
         '(this.scrollHeight - this.clientHeight)/2'
       end
-      evaluate_on "function(){ this.scrollTo(0, #{scroll_y}) }"
+      evaluate_on "() => this.scrollTo(0, #{scroll_y})"
     end
 
     def scroll_to_coords(x, y)
       evaluate_on <<~JS, { value: x }, value: y
-        function(x,y){ this.scrollTo(x,y) }
+        (x,y) => this.scrollTo(x,y)
       JS
     end
 
@@ -831,5 +811,15 @@ module Capybara::Apparition
         this.dispatchEvent(event);
       }
     JS
+
+    GET_STYLES_JS = <<~JS
+      function(styles){
+        style = window.getComputedStyle(this);
+        return styles.reduce((res,name) => {
+          res[name] = style[name];
+          return res;
+        }, {})
+      }
+    JS
   end
 end

data/lib/capybara/apparition/page.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'capybara/apparition/frame_manager'
-require 'capybara/apparition/mouse'
-require 'capybara/apparition/keyboard'
+require 'capybara/apparition/page/frame_manager'
+require 'capybara/apparition/page/mouse'
+require 'capybara/apparition/page/keyboard'
 
 module Capybara::Apparition
   class Page
@@ -20,12 +20,13 @@ module Capybara::Apparition
 
       page = Page.new(browser, session, id, ignore_https_errors, screenshot_task_queue, js_errors)
 
-      session.command 'Network.enable'
-      session.command 'Runtime.enable'
-      session.command 'Security.enable'
+      session.async_commands 'Network.enable', 'Runtime.enable', 'Security.enable', 'DOM.enable'
+      # session.command 'Network.enable'
+      # session.command 'Runtime.enable'
+      # session.command 'Security.enable'
       # session.command 'Security.setOverrideCertificateErrors', override: true if ignore_https_errors
       session.command 'Security.setIgnoreCertificateErrors', ignore: !!ignore_https_errors
-      session.command 'DOM.enable'
+      # session.command 'DOM.enable'
       # session.command 'Log.enable'
       if Capybara.save_path
         session.command 'Page.setDownloadBehavior', behavior: 'allow', downloadPath: Capybara.save_path
@@ -46,18 +47,26 @@ module Capybara::Apparition
       @status_code = 0
       @url_blacklist = []
       @url_whitelist = []
+      @credentials = nil
       @auth_attempts = []
+      @proxy_credentials = nil
+      @proxy_auth_attempts = []
       @perm_headers = {}
       @temp_headers = {}
       @temp_no_redirect_headers = {}
       @viewport_size = nil
       @network_traffic = []
       @open_resource_requests = {}
+      @raise_js_errors = js_errors
       @js_error = nil
+      @modal_mutex = Mutex.new
+      @modal_closed = ConditionVariable.new
 
       register_event_handlers
 
-      register_js_error_handler if js_errors
+      register_js_error_handler # if js_errors
+
+      setup_network_interception if browser.proxy_auth
     end
 
     def usable?
@@ -70,6 +79,7 @@ module Capybara::Apparition
       @response_headers = {}
       @status_code = 0
       @auth_attempts = []
+      @proxy_auth_attempts = []
       @perm_headers = {}
     end
 
@@ -78,6 +88,11 @@ module Capybara::Apparition
       @modals.push(modal_response)
     end
 
+    def proxy_credentials=(creds)
+      @proxy_credentials = creds
+      setup_network_interception
+    end
+
     def credentials=(creds)
       @credentials = creds
       setup_network_interception
@@ -151,7 +166,6 @@ module Capybara::Apparition
         # Wait for the frame creation messages to be processed
         if timer.expired?
           puts 'Timed out waiting from frame to be ready'
-          # byebug
           raise TimeoutError.new('push_frame')
         end
         sleep 0.1
@@ -181,25 +195,41 @@ module Capybara::Apparition
 
     def execute(script, *args)
       wait_for_loaded
-      _execute_script("function(){ #{script} }", *args)
+      _execute_script <<~JS, *args
+        function(){
+          #{script}
+        }
+      JS
       nil
     end
 
     def evaluate(script, *args)
       wait_for_loaded
-      _execute_script("function(){ return #{script} }", *args)
+      _execute_script <<~JS, *args
+        function(){
+          let apparitionId=0;
+          return (function ider(obj){
+            if (obj && (typeof obj == 'object') && !obj.apparitionId){
+              obj.apparitionId = ++apparitionId;
+              Reflect.ownKeys(obj).forEach(key => ider(obj[key]))
+            }
+            return obj;
+          })((function(){ return #{script} }).apply(this, arguments))
+        }
+      JS
     end
 
     def evaluate_async(script, _wait_time, *args)
       wait_for_loaded
-      _execute_script("function(){
-        var args = Array.prototype.slice.call(arguments);
-        return new Promise((resolve, reject)=>{
-          args.push(resolve);
-          var fn = function(){ #{script} };
-          fn.apply(this, args);
-        });
-      }", *args)
+      _execute_script <<~JS, *args
+        function(){
+          var args = Array.prototype.slice.call(arguments);
+          return new Promise((resolve, reject)=>{
+            args.push(resolve);
+            (function(){ #{script} }).apply(this, args);
+          });
+        }
+      JS
     end
 
     def refresh
@@ -288,9 +318,15 @@ module Capybara::Apparition
       wait_for_loaded
       @viewport_size = { width: width, height: height }
       result = @browser.command('Browser.getWindowForTarget', targetId: @target_id)
-      @browser.command('Browser.setWindowBounds',
-                       windowId: result['windowId'],
-                       bounds: { width: width, height: height })
+      begin
+        @browser.command('Browser.setWindowBounds',
+                         windowId: result['windowId'],
+                         bounds: { width: width, height: height })
+      rescue WrongWorld # TODO: Fix Error naming here
+        @browser.command('Browser.setWindowBounds', windowId: result['windowId'], bounds: { windowState: 'normal' })
+        retry
+      end
+
       metrics = {
         mobile: false,
         width: width,
@@ -339,7 +375,7 @@ module Capybara::Apparition
 
     def update_headers(async: false)
       method = async ? :async_command : :command
-      if (ua = extra_headers.find { |k, _v| k=~/^User-Agent$/i })
+      if (ua = extra_headers.find { |k, _v| k =~ /^User-Agent$/i })
         send(method, 'Network.setUserAgentOverride', userAgent: ua[1])
       end
       send(method, 'Network.setExtraHTTPHeaders', headers: extra_headers)
@@ -378,23 +414,14 @@ module Capybara::Apparition
     def register_event_handlers
       @session.on 'Page.javascriptDialogOpening' do |params|
         type = params['type'].to_sym
-        accept = if type == :beforeunload
-          true
-        else
-          response = @modals.pop
-          if !response&.key?(type)
-            handle_unexpected_modal(type)
-          else
-            @modal_messages.push(params['message'])
-            response[type]
-          end
-        end
+        accept = accept_modal?(type, message: params['message'], manual: params['hasBrowserHandler'])
+        next if accept.nil?
 
         if type == :prompt
           case accept
           when false
             async_command('Page.handleJavaScriptDialog', accept: false)
-          when nil
+          when true
             async_command('Page.handleJavaScriptDialog', accept: true, promptText: params['defaultPrompt'])
           else
             async_command('Page.handleJavaScriptDialog', accept: true, promptText: accept)
@@ -404,6 +431,12 @@ module Capybara::Apparition
         end
       end
 
+      @session.on 'Page.javascriptDialogClosed' do
+        @modal_mutex.synchronize do
+          @modal_closed.signal
+        end
+      end
+
       @session.on 'Page.windowOpen' do |params|
         puts "**** windowOpen was called with: #{params}" if ENV['DEBUG']
         # TODO: find a better way to handle this
@@ -474,7 +507,6 @@ module Capybara::Apparition
             puts "unknown frame for context #{frame_id}"
           end
         end
-        # command 'Network.setRequestInterception', patterns: [{urlPattern: '*'}]
       end
 
       @session.on 'Runtime.executionContextDestroyed' do |params|
@@ -519,15 +551,24 @@ module Capybara::Apparition
       @session.on 'Network.requestIntercepted' do |params|
         request, interception_id = *params.values_at('request', 'interceptionId')
         if params['authChallenge']
-          handle_auth(interception_id)
+          if params['authChallenge']['source'] == 'Proxy'
+            handle_proxy_auth(interception_id)
+          else
+            handle_user_auth(interception_id)
+          end
         else
           process_intercepted_request(interception_id, request, params['isNavigationRequest'])
         end
       end
 
       @session.on 'Runtime.consoleAPICalled' do |params|
+        # {"type"=>"log", "args"=>[{"type"=>"string", "value"=>"hello"}], "executionContextId"=>2, "timestamp"=>1548722854903.285, "stackTrace"=>{"callFrames"=>[{"functionName"=>"", "scriptId"=>"15", "url"=>"http://127.0.0.1:53977/", "lineNumber"=>6, "columnNumber"=>22}]}}
+        details = params.dig('stackTrace', 'callFrames')&.first
         @browser.console.log(params['type'],
-                             "#{params['args'].map { |arg| arg['description'] || arg['value'] }.join(' ')}")
+                             params['args'].map { |arg| arg['description'] || arg['value'] }.join(' ').to_s,
+                             source: details['url'].empty? ? nil : details['url'],
+                             line_number: details['lineNumber'].zero? ? nil : details['lineNumber'],
+                             columnNumber: details['columnNumber'].zero? ? nil : details['columnNumber'])
       end
 
       # @session.on 'Security.certificateError' do |params|
@@ -544,7 +585,14 @@ module Capybara::Apparition
 
     def register_js_error_handler
       @session.on 'Runtime.exceptionThrown' do |params|
-        @js_error ||= params.dig('exceptionDetails', 'exception', 'description')
+        @js_error ||= params.dig('exceptionDetails', 'exception', 'description') if @raise_js_errors
+
+        details = params.dig('exceptionDetails', 'stackTrace', 'callFrames')&.first
+        @browser.console.log('error',
+                             params.dig('exceptionDetails', 'exception', 'description'),
+                             source: details['url'].empty? ? nil : details['url'],
+                             line_number: details['lineNumber'].zero? ? nil : details['lineNumber'],
+                             columnNumber: details['columnNumber'].zero? ? nil : details['columnNumber'])
       end
     end
 
@@ -607,6 +655,20 @@ module Capybara::Apparition
       wait_for_loaded
     end
 
+    def accept_modal?(type, message:, manual:)
+      if type == :beforeunload
+        true
+      else
+        response = @modals.pop
+        if !response&.key?(type)
+          manual ? manual_unexpected_modal(type) : auto_unexpected_modal(type)
+        else
+          @modal_messages.push(message)
+          response[type].nil? ? true : response[type]
+        end
+      end
+    end
+
     def _execute_script(script, *args)
       args = args.map do |arg|
         if arg.is_a? Capybara::Apparition::Node
@@ -658,26 +720,48 @@ module Capybara::Apparition
       decode_result(result)
     end
 
-    def handle_unexpected_modal(type)
+    def manual_unexpected_modal(type)
+      warn "An unexpected #{type} modal has opened - please close"
+      @modal_mutex.synchronize do
+        @modal_closed.wait(@modal_mutex)
+      end
+      nil
+    end
+
+    def auto_unexpected_modal(type)
       case type
       when :prompt
         warn 'Unexpected prompt modal - accepting with the default value.' \
-             'This is deprecated behavior, start using `accept_prompt`.'
-        nil
+             'You should be using `accept_prompt` or `dismiss_prompt`.'
       when :confirm
         warn 'Unexpected confirm modal - accepting.' \
-             'This is deprecated behavior, start using `accept_confirm`.'
-        true
+             'You should be using `accept_confirm` or `dismiss_confirm`.'
       else
-        raise "Unexpected #{type} modal"
+        warn 'Unexpected alert modal - clearing.' \
+             'You should be using `accept_alert`.'
       end
+      true
     end
 
-    def handle_auth(interception_id)
+    def handle_proxy_auth(interception_id)
+      credentials_response = if @proxy_auth_attempts.include?(interception_id)
+        puts 'Cancelling proxy auth' if ENV['DEBUG']
+        { response: 'CancelAuth' }
+      else
+        puts 'Replying with proxy auth credentials' if ENV['DEBUG']
+        @proxy_auth_attempts.push(interception_id)
+        { response: 'ProvideCredentials' }.merge(@browser.proxy_auth || {})
+      end
+      continue_request(interception_id, authChallengeResponse: credentials_response)
+    end
+
+    def handle_user_auth(interception_id)
       credentials_response = if @auth_attempts.include?(interception_id)
+        puts 'Cancelling auth' if ENV['DEBUG']
         { response: 'CancelAuth' }
       else
         @auth_attempts.push(interception_id)
+        puts 'Replying with auth credentials' if ENV['DEBUG']
         { response: 'ProvideCredentials' }.merge(@credentials || {})
       end
       continue_request(interception_id, authChallengeResponse: credentials_response)
@@ -690,7 +774,7 @@ module Capybara::Apparition
                                   objectId: result['objectId'],
                                   ownProperties: true)
 
-          properties = remote_object['result']
+          properties = remote_object['result'].reject { |prop| prop['name'] == 'apparitionId' }
           results = []
 
           properties.each do |property|
@@ -714,16 +798,22 @@ module Capybara::Apparition
           remote_object = command('Runtime.getProperties',
                                   objectId: result['objectId'],
                                   ownProperties: true)
-          stable_id = remote_object['internalProperties']
-                      .find { |prop| prop['name'] == '[[StableObjectId]]' }
-                      .dig('value', 'value')
+
+          # stable_id went away in Chrome 72 - we add our own id in evaluate
+          # stable_id = remote_object['internalProperties']
+          #             &.find { |prop| prop['name'] == '[[StableObjectId]]' }
+          #             &.dig('value', 'value')
+
           # We could actually return cyclic objects here but Capybara would need to be updated to support
-          # return object_cache[stable_id] if object_cache.key?(stable_id)
+          # return object_cache[stable_id] if object_cache.key?(stable_id) # and update the cache to be a hash
 
+          stable_id = remote_object['result']
+                      &.find { |prop| prop['name'] == 'apparitionId'}
+                      &.dig('value', 'value')
           return '(cyclic structure)' if object_cache.key?(stable_id)
 
           object_cache[stable_id] = {}
-          properties = remote_object['result']
+          properties = remote_object['result'].reject { |prop| prop['name'] == "apparitionId"}
 
           return properties.each_with_object(object_cache[stable_id]) do |property, memo|
             if property['enumerable']

data/lib/capybara/apparition/{frame_manager.rb → page/frame_manager.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'capybara/apparition/frame'
+require 'capybara/apparition/page/frame'
 
 module Capybara::Apparition
   class FrameManager

data/lib/capybara/apparition/{mouse.rb → page/mouse.rb}

@@ -10,10 +10,12 @@ module Capybara::Apparition
 
     def click_at(x:, y:, button: 'left', count: 1, modifiers: [])
       move_to x: x, y: y
-      @keyboard.with_keys(modifiers) do
-        mouse_params = { x: x, y: y, button: button, count: count }
-        down mouse_params
-        up mouse_params
+      count.times do |num|
+        @keyboard.with_keys(modifiers) do
+          mouse_params = { x: x, y: y, button: button, count: num+1 }
+          down mouse_params
+          up mouse_params
+        end
       end
       self
     end
@@ -24,21 +26,21 @@ module Capybara::Apparition
       self
     end
 
-    def down(**options)
-      options = @current_pos.merge(options)
+    def down(button: 'left', **options)
+      options = @current_pos.merge(button: button).merge(options)
       mouse_event('mousePressed', options)
       self
     end
 
-    def up(**options)
-      options = @current_pos.merge(options)
+    def up(button: 'left', **options)
+      options = @current_pos.merge(button: button).merge(options)
       mouse_event('mouseReleased', options)
       self
     end
 
   private
 
-    def mouse_event(type, x:, y:, button: 'left', count: 1)
+    def mouse_event(type, x:, y:, button: 'none', count: 1)
       @page.command('Input.dispatchMouseEvent',
                     type: type,
                     button: button,

data/lib/capybara/apparition/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Apparition
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apparition
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Thomas Walpole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
@@ -184,6 +184,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -210,20 +224,19 @@ files:
 - README.md
 - lib/capybara/apparition.rb
 - lib/capybara/apparition/browser.rb
-- lib/capybara/apparition/chrome_client.rb
 - lib/capybara/apparition/console.rb
 - lib/capybara/apparition/cookie.rb
+- lib/capybara/apparition/cookie_jar.rb
 - lib/capybara/apparition/dev_tools_protocol/session.rb
 - lib/capybara/apparition/dev_tools_protocol/target.rb
 - lib/capybara/apparition/dev_tools_protocol/target_manager.rb
 - lib/capybara/apparition/driver.rb
+- lib/capybara/apparition/driver/chrome_client.rb
+- lib/capybara/apparition/driver/launcher.rb
+- lib/capybara/apparition/driver/response.rb
+- lib/capybara/apparition/driver/web_socket_client.rb
 - lib/capybara/apparition/errors.rb
-- lib/capybara/apparition/frame.rb
-- lib/capybara/apparition/frame_manager.rb
 - lib/capybara/apparition/inspector.rb
-- lib/capybara/apparition/keyboard.rb
-- lib/capybara/apparition/launcher.rb
-- lib/capybara/apparition/mouse.rb
 - lib/capybara/apparition/network_traffic.rb
 - lib/capybara/apparition/network_traffic/error.rb
 - lib/capybara/apparition/network_traffic/request.rb
@@ -231,10 +244,12 @@ files:
 - lib/capybara/apparition/node.rb
 - lib/capybara/apparition/node/drag.rb
 - lib/capybara/apparition/page.rb
-- lib/capybara/apparition/response.rb
+- lib/capybara/apparition/page/frame.rb
+- lib/capybara/apparition/page/frame_manager.rb
+- lib/capybara/apparition/page/keyboard.rb
+- lib/capybara/apparition/page/mouse.rb
 - lib/capybara/apparition/utility.rb
 - lib/capybara/apparition/version.rb
-- lib/capybara/apparition/web_socket_client.rb
 homepage: https://github.com/twalpole/apparition
 licenses:
 - MIT