apparition 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5675a80f435049166cf933b540e00b5569b0f516099597cdc071cc4c7767ff0
-  data.tar.gz: 8a63bf45f5376a4eb0a65954bd3863062f1aea67b030cb3ee2b96c7cfe1d108d
+  metadata.gz: 350a10ffb794579fb942f37a1739bf104b0230bd831945cbc22a20e2273927fd
+  data.tar.gz: e0bbdc5f79d03fcdedabd5db29ff990ee57801087d9c33ef98e85f9de833be8d
 SHA512:
-  metadata.gz: 7d0b64f71ec2e0a026bc5f0cea02588e550a5e27768b5368041bfbbd206e758654900cf22c35620d88f0618a76a12b874120513ae3d606e8ee481a5021bf3297
-  data.tar.gz: b279c8871baedd04acf1e717fddbf2898ae9796e0c1152fd17c0ccc160deaa10cb0cc86243037448883e10da3a90844351c60e097e0b6b5aebb8e87b0e796f65
+  metadata.gz: 313247fbbaccd8197d36ccd68adede1a33c944f46a5b30dce143606d4cc00bc61a3aab99ba35820dc6e2e3cbb7c09432084f221a36fee2f355fbd7d59639bb6f
+  data.tar.gz: 73f91c766ab2bc02f2a58b07c95cce2a01bc71dff6ca8f6eb3374b36b5a8efbc73c95d26f48766e00d3fbd7f49003765b293af8725028afa64d798f2c5ebddb2

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/twalpole/apparition.svg)](http://travis-ci.org/twalpole/apparition)
 
-Apparition is a driver for [Capybara](https://github.com/jnicklas/capybara). It allows you to
+Apparition is a driver for [Capybara](https://github.com/teamcapybara/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.  Implementing the `capybara-webkit` specific driver methods has also begun.
@@ -205,7 +205,7 @@ test to allow sufficient time for the page to settle.
 
 If you have these types of problems, read through the [Capybara
 documentation on asynchronous
-JavaScript](https://github.com/jnicklas/capybara#asynchronous-javascript-ajax-and-friends)
+JavaScript](https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends)
 which explains the tools that Capybara provides for dealing with this.
 
 ### Filing a bug ###

data/lib/capybara/apparition/browser.rb

@@ -203,9 +203,9 @@ module Capybara::Apparition
       #   @current_page_handle ||= target_info['targetId'] if target_info['type'] == 'page'
       # end
 
-      @client.on 'Target.targetDestroyed' do |info|
-        puts "**** Target Destroyed Info: #{info}" if ENV['DEBUG']
-        @pages.delete(info['targetId'])
+      @client.on 'Target.targetDestroyed' do |target_id:, **info|
+        puts "**** Target Destroyed Info: #{target_id} - #{info}" if ENV['DEBUG']
+        @pages.delete(target_id)
       end
 
       # @client.on 'Target.targetInfoChanged' do |info|

data/lib/capybara/apparition/configuration.rb

@@ -3,7 +3,7 @@
 module Capybara::Apparition
   class Configuration
     class << self
-    private # rubocop:disable Layout/IndentationWidth
+    private
 
       def instance
         @instance ||= new

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

@@ -25,10 +25,12 @@ module Capybara::Apparition
           elsif date?
             res = get_date_string(id)
             DateTime.parse(res)
-          elsif object_class? || css_style?
-            extract_properties_object(get_remote_object(id), object_cache)
           elsif window_class?
             { object_id: id }
+          elsif validity_state?
+            extract_properties_object(get_remote_object(id, false), object_cache)
+          elsif object_class? || css_style? || classname?
+            extract_properties_object(get_remote_object(id), object_cache)
           else
             params['value']
           end
@@ -46,6 +48,8 @@ module Capybara::Apparition
       def object_class?; classname == 'Object' end
       def css_style?; classname == 'CSSStyleDeclaration' end
       def window_class?; classname == 'Window' end
+      def validity_state?; classname == 'ValidityState' end
+      def classname?; !classname.nil? end
 
       def type; params['type'] end
       def subtype; params['subtype'] end

data/lib/capybara/apparition/driver.rb

@@ -243,7 +243,7 @@ module Capybara::Apparition
     end
 
     def proxy_authorize(user = nil, password = nil)
-      browser.set_proxy_aauth(user, password)
+      browser.set_proxy_auth(user, password)
     end
 
     def basic_authorize(user = nil, password = nil)

data/lib/capybara/apparition/driver/chrome_client.rb

@@ -206,7 +206,9 @@ module Capybara::Apparition
       event_name = event['method']
       handlers[event_name].each do |handler|
         puts "Calling handler for #{event_name}" if ENV['DEBUG'] == 'V'
-        handler.call(event['params'])
+        # TODO: Update this to use transform_keys when we dump Ruby 2.4
+        # handler.call(event['params'].transform_keys(&method(:snake_sym)))
+        handler.call(event['params'].each_with_object({}) { |(k, v), hash| hash[snake_sym(k)] = v })
       end
     end
 
@@ -229,5 +231,12 @@ module Capybara::Apparition
       end
       # @listener.abort_on_exception = true
     end
+
+    def snake_sym(str)
+      str.gsub(/([a-z\d])([A-Z])/, '\1_\2')
+         .tr('-', '_')
+         .downcase
+         .to_sym
+    end
   end
 end

data/lib/capybara/apparition/driver/launcher.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'open3'
+
 module Capybara::Apparition
   class Browser
     class Launcher
@@ -44,23 +46,23 @@ module Capybara::Apparition
 
       def start
         @output = Queue.new
-        @read_io, @write_io = IO.pipe
+
+        process_options = {}
+        process_options[:pgroup] = true unless Capybara::Apparition.windows?
+        cmd = [path] + @options.map { |k, v| v.nil? ? "--#{k}" : "--#{k}=#{v}" }
+
+        stdin, @stdout_stderr, wait_thr = Open3.popen2e(*cmd, process_options)
+        stdin.close
+
+        @pid = wait_thr.pid
 
         @out_thread = Thread.new do
-          while !@read_io.eof? && (data = @read_io.readpartial(512))
+          while !@stdout_stderr.eof? && (data = @stdout_stderr.readpartial(512))
             @output << data
           end
         end
 
-        process_options = { in: File::NULL }
-        process_options[:pgroup] = true unless Capybara::Apparition.windows?
-        process_options[:out] = process_options[:err] = @write_io if Capybara::Apparition.mri?
-
-        redirect_stdout do
-          cmd = [path] + @options.map { |k, v| v.nil? ? "--#{k}" : "--#{k}=#{v}" }
-          @pid = ::Process.spawn(*cmd, process_options)
-          ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
-        end
+        ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
       end
 
       def stop
@@ -87,10 +89,13 @@ module Capybara::Apparition
         @ws_url ||= begin
           regexp = %r{DevTools listening on (ws://.*)}
           url = nil
+
+          sleep 3
           loop do
             break if (url = @output.pop.scan(regexp)[0])
           end
           @out_thread.kill
+          @out_thread.join # wait for thread to end before closing io
           close_io
           Addressable::URI.parse(url[0])
         end
@@ -98,36 +103,15 @@ module Capybara::Apparition
 
     private
 
-      def redirect_stdout
-        if Capybara::Apparition.mri?
-          yield
-        else
-          begin
-            prev = STDOUT.dup
-            $stdout = @write_io
-            STDOUT.reopen(@write_io)
-            yield
-          ensure
-            STDOUT.reopen(prev)
-            $stdout = STDOUT
-            prev.close
-          end
-        end
-      end
-
       def kill
         self.class.process_killer(@pid).call
         @pid = nil
       end
 
       def close_io
-        [@write_io, @read_io].each do |io|
-          begin
-            io.close unless io.closed?
-          rescue IOError
-            raise unless RUBY_ENGINE == 'jruby'
-          end
-        end
+        @stdout_stderr.close unless @stdout_stderr.closed?
+      rescue IOError
+        raise unless RUBY_ENGINE == 'jruby'
       end
 
       def path

data/lib/capybara/apparition/network_traffic/request.rb

@@ -17,23 +17,23 @@ module Capybara::Apparition::NetworkTraffic
     end
 
     def request_id
-      @data['requestId']
+      @data[:request_id]
     end
 
     def url
-      @data.dig('request', 'url')
+      @data[:request]&.dig('url')
     end
 
     def method
-      @data.dig('request', 'method')
+      @data[:request]&.dig('method')
     end
 
     def headers
-      @data.dig('requst', 'headers')
+      @data[:request]&.dig('headers')
     end
 
     def time
-      @data['timestamp'] && Time.parse(@data['timestamp'])
+      @data[:timestamp] && Time.parse(@data[:timestamp])
     end
 
     def blocked?

data/lib/capybara/apparition/node.rb

@@ -130,6 +130,8 @@ module Capybara::Apparition
           set_time(value)
         when 'datetime-local'
           set_datetime_local(value)
+        when 'color'
+          set_color(value)
         else
           set_text(value.to_s, { delay: 0 }.merge(options))
         end
@@ -199,7 +201,10 @@ module Capybara::Apparition
 
       test = mouse_event_test(pos)
       raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['click']) if test.nil?
-      raise ::Capybara::Apparition::MouseEventFailed.new(self, 'args' => ['click', test.selector, pos]) unless test.success
+
+      unless options[:x] && options[:y]
+        raise ::Capybara::Apparition::MouseEventFailed.new(self, 'args' => ['click', test.selector, pos]) unless test.success
+      end
 
       @page.mouse.click_at pos.merge(button: button, count: count, modifiers: keys)
       if ENV['DEBUG']
@@ -278,9 +283,13 @@ module Capybara::Apparition
       evaluate_on GET_PATH_JS
     end
 
-    def element_click_pos(x: nil, y: nil, **)
+    def element_click_pos(x: nil, y: nil, offset: nil, **)
       if x && y
-        visible_top_left.tap do |p|
+        if offset == :center
+          visible_center
+        else
+          visible_top_left
+        end.tap do |p|
           p[:x] += x
           p[:y] += y
         end
@@ -290,7 +299,7 @@ module Capybara::Apparition
     end
 
     def visible_top_left
-      rect = in_view_bounding_rect
+      rect = in_view_client_rect
       return nil if rect.nil?
 
       frame_offset = @page.current_frame_offset
@@ -324,7 +333,7 @@ module Capybara::Apparition
     end
 
     def visible_center(allow_scroll: true)
-      rect = in_view_bounding_rect(allow_scroll: allow_scroll)
+      rect = in_view_client_rect(allow_scroll: allow_scroll)
       return nil if rect.nil?
 
       frame_offset = @page.current_frame_offset
@@ -367,12 +376,16 @@ module Capybara::Apparition
     end
 
     def top_left
-      result = evaluate_on GET_BOUNDING_CLIENT_RECT_JS
+      result = evaluate_on GET_CLIENT_RECT_JS
       return nil if result.nil?
 
       { x: result['x'], y: result['y'] }
     end
 
+    def rect
+      evaluate_on GET_CLIENT_RECT_JS
+    end
+
     def scroll_by(x, y)
       evaluate_on <<~JS, { value: x }, value: y
         (x, y) => this.scrollBy(x,y)
@@ -447,9 +460,9 @@ module Capybara::Apparition
       @page.keyboard.type(keys, delay: delay)
     end
 
-    def in_view_bounding_rect(allow_scroll: true)
+    def in_view_client_rect(allow_scroll: true)
       evaluate_on('() => this.scrollIntoViewIfNeeded()') if allow_scroll
-      result = evaluate_on GET_BOUNDING_CLIENT_RECT_JS
+      result = evaluate_on GET_CLIENT_RECT_JS
       result = result['model'] if result && result['model']
       result
     end
@@ -517,6 +530,10 @@ module Capybara::Apparition
       update_value_js(value.to_datetime_str)
     end
 
+    def set_color(value)
+      update_value_js(value.to_s)
+    end
+
     def update_value_js(value)
       evaluate_on(<<~JS, value: value)
         value => {
@@ -760,7 +777,11 @@ module Capybara::Apparition
               (parseFloat(style.opacity) == 0)) {
             return false;
           }
-          el = el.parentElement;
+          var parent = el.parentElement;
+          if (parent && (parent.tagName == 'DETAILS') && !parent.open && (el.tagName != 'SUMMARY')) {
+            return false;
+          }
+          el = parent;
         }
         return true;
       }
@@ -777,9 +798,10 @@ module Capybara::Apparition
       }
     JS
 
-    GET_BOUNDING_CLIENT_RECT_JS = <<~JS
+    GET_CLIENT_RECT_JS = <<~JS
       function(){
-        rect = this.getBoundingClientRect();
+        var rects = [...this.getClientRects()]
+        var rect = rects.find(r => (r.height && r.width)) || this.getBoundingClientRect();
         return rect.toJSON();
       }
     JS

data/lib/capybara/apparition/node/drag.rb

@@ -2,26 +2,27 @@
 
 module Capybara::Apparition
   module Drag
-    def drag_to(other, delay: 0.1)
-      return html5_drag_to(other) if html5_draggable?
-
-      pos = visible_center
-      raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['drag_to']) if pos.nil?
-
-      test = mouse_event_test(pos)
-      raise ::Capybara::Apparition::MouseEventFailed.new(self, 'args' => ['drag', test.selector, pos]) unless test.success
-
-      begin
-        @page.mouse.move_to(pos).down
-        sleep delay
-
-        other_pos = other.visible_center
-        raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['drag_to']) if other_pos.nil?
-
-        @page.mouse.move_to(other_pos.merge(button: 'left'))
-        sleep delay
-      ensure
-        @page.mouse.up
+    def drag_to(other, delay: 0.1, html5: nil)
+      driver.execute_script MOUSEDOWN_TRACKER
+      scroll_if_needed
+      m = @page.mouse
+      m.move_to(visible_center)
+      sleep delay
+      m.down
+      html5 = !driver.evaluate_script(LEGACY_DRAG_CHECK, self) if html5.nil?
+      if html5
+        driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, other, delay
+        m.up(other.visible_center)
+      else
+        begin
+          other.scroll_if_needed
+          sleep delay
+          m.move_to(other.visible_center)
+          sleep delay
+        ensure
+          m.up
+          sleep delay
+        end
       end
     end
 
@@ -34,7 +35,7 @@ module Capybara::Apparition
 
       @page.mouse.move_to(pos).down
       sleep delay
-      @page.mouse.move_to(other_pos.merge(button: 'left'))
+      @page.mouse.move_to(other_pos)
       sleep delay
       @page.mouse.up
     end
@@ -104,34 +105,29 @@ module Capybara::Apparition
       }
     JS
 
-  private
-
-    def html5_drag_to(element)
-      driver.execute_script MOUSEDOWN_TRACKER
-      scroll_if_needed
-      @page.mouse.move_to(visible_center).down
-      if driver.evaluate_script('window.capybara_mousedown_prevented')
-        element.scroll_if_needed
-        @page.mouse.move_to(element.visible_center).up
-      else
-        driver.execute_script HTML5_DRAG_DROP_SCRIPT, self, element
-        @page.mouse.up(element.visible_center)
-      end
-    end
-
-    def html5_draggable?
-      native.property('draggable')
-    end
-
     MOUSEDOWN_TRACKER = <<~JS
+      window.capybara_mousedown_prevented = null;
       document.addEventListener('mousedown', ev => {
         window.capybara_mousedown_prevented = ev.defaultPrevented;
       }, { once: true, passive: true })
     JS
 
+    LEGACY_DRAG_CHECK = <<~JS
+      (function(el){
+        if ([true, null].includes(window.capybara_mousedown_prevented)){
+          return true;
+        }
+        do {
+          if (el.draggable) return false;
+        } while (el = el.parentElement );
+        return true;
+      })(arguments[0])
+    JS
+
     HTML5_DRAG_DROP_SCRIPT = <<~JS
       var source = arguments[0];
       var target = arguments[1];
+      var step_delay = arguments[2] * 1000;
 
       function rectCenter(rect){
         return new DOMPoint(
@@ -171,9 +167,60 @@ module Capybara::Apparition
         return new DOMPoint(pt.x,pt.y);
       }
 
+      function dragStart() {
+        return new Promise( resolve => {
+          var dragEvent = new DragEvent('dragstart', opts);
+          source.dispatchEvent(dragEvent);
+          setTimeout(resolve, step_delay)
+        })
+      }
+
+      function dragEnter() {
+        return new Promise( resolve => {
+          target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+          let targetRect = target.getBoundingClientRect(),
+          sourceCenter = rectCenter(source.getBoundingClientRect());
+
+          // fire 2 dragover events to simulate dragging with a direction
+          let entryPoint = pointOnRect(sourceCenter, targetRect);
+          let dragOverOpts = Object.assign({clientX: entryPoint.x, clientY: entryPoint.y}, opts);
+          let dragOverEvent = new DragEvent('dragover', dragOverOpts);
+          target.dispatchEvent(dragOverEvent);
+          setTimeout(resolve, step_delay)
+        })
+      }
+
+      function dragOnto() {
+        return new Promise( resolve => {
+          var targetCenter = rectCenter(target.getBoundingClientRect());
+          dragOverOpts = Object.assign({clientX: targetCenter.x, clientY: targetCenter.y}, opts);
+          dragOverEvent = new DragEvent('dragover', dragOverOpts);
+          target.dispatchEvent(dragOverEvent);
+          setTimeout(resolve, step_delay, dragOverEvent.defaultPrevented);
+        })
+      }
+
+      function dragLeave(drop) {
+        return new Promise( resolve => {
+          var dragLeaveEvent = new DragEvent('dragleave', opts);
+          target.dispatchEvent(dragLeaveEvent);
+          if (drop) {
+            var dropEvent = new DragEvent('drop', opts);
+            target.dispatchEvent(dropEvent);
+          }
+          var dragEndEvent = new DragEvent('dragend', opts);
+          source.dispatchEvent(dragEndEvent);
+          setTimeout(resolve, step_delay);
+        })
+      }
+
       var dt = new DataTransfer();
       var opts = { cancelable: true, bubbles: true, dataTransfer: dt };
 
+      while (source && !source.draggable) {
+        source = source.parentElement;
+      }
+
       if (source.tagName == 'A'){
         dt.setData('text/uri-list', source.href);
         dt.setData('text', source.href);
@@ -183,31 +230,7 @@ module Capybara::Apparition
         dt.setData('text', source.src);
       }
 
-      var dragEvent = new DragEvent('dragstart', opts);
-      source.dispatchEvent(dragEvent);
-      target.scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
-      var targetRect = target.getBoundingClientRect();
-      var sourceCenter = rectCenter(source.getBoundingClientRect());
-
-      // fire 2 dragover events to simulate dragging with a direction
-      var entryPoint = pointOnRect(sourceCenter, targetRect)
-      var dragOverOpts = Object.assign({clientX: entryPoint.x, clientY: entryPoint.y}, opts);
-      var dragOverEvent = new DragEvent('dragover', dragOverOpts);
-      target.dispatchEvent(dragOverEvent);
-
-      var targetCenter = rectCenter(targetRect);
-      dragOverOpts = Object.assign({clientX: targetCenter.x, clientY: targetCenter.y}, opts);
-      dragOverEvent = new DragEvent('dragover', dragOverOpts);
-      target.dispatchEvent(dragOverEvent);
-
-      var dragLeaveEvent = new DragEvent('dragleave', opts);
-      target.dispatchEvent(dragLeaveEvent);
-      if (dragOverEvent.defaultPrevented) {
-        var dropEvent = new DragEvent('drop', opts);
-        target.dispatchEvent(dropEvent);
-      }
-      var dragEndEvent = new DragEvent('dragend', opts);
-      source.dispatchEvent(dragEndEvent);
+      dragStart().then(dragEnter).then(dragOnto).then(dragLeave)
     JS
   end
 end

data/lib/capybara/apparition/page.rb

@@ -285,7 +285,6 @@ module Capybara::Apparition
       navigate_opts = { url: url, transitionType: 'reload' }
       navigate_opts[:referrer] = extra_headers['Referer'] if extra_headers['Referer']
       response = command('Page.navigate', navigate_opts)
-
       raise StatusFailError, 'args' => [url, response['errorText']] if response['errorText']
 
       main_frame.loading(response['loaderId'])
@@ -426,9 +425,9 @@ module Capybara::Apparition
     end
 
     def register_event_handlers
-      @session.on 'Page.javascriptDialogOpening' do |params|
-        type = params['type'].to_sym
-        accept = accept_modal?(type, message: params['message'], manual: params['hasBrowserHandler'])
+      @session.on 'Page.javascriptDialogOpening' do |type:, message:, has_browser_handler:, **params|
+        type = type.to_sym
+        accept = accept_modal?(type, message: message, manual: has_browser_handler)
         next if accept.nil?
 
         if type == :prompt
@@ -436,7 +435,7 @@ module Capybara::Apparition
           when false
             async_command('Page.handleJavaScriptDialog', accept: false)
           when true
-            async_command('Page.handleJavaScriptDialog', accept: true, promptText: params['defaultPrompt'])
+            async_command('Page.handleJavaScriptDialog', accept: true, promptText: params[:default_prompt])
           else
             async_command('Page.handleJavaScriptDialog', accept: true, promptText: accept)
           end
@@ -451,39 +450,38 @@ module Capybara::Apparition
         end
       end
 
-      @session.on 'Page.windowOpen' do |params|
+      @session.on 'Page.windowOpen' do |**params|
         puts "**** windowOpen was called with: #{params}" if ENV['DEBUG']
         @browser.refresh_pages(opener: self)
       end
 
-      @session.on 'Page.frameAttached' do |params|
+      @session.on 'Page.frameAttached' do |**params|
         puts "**** frameAttached called with #{params}" if ENV['DEBUG']
         # @frames.get(params["frameId"]) = Frame.new(params)
       end
 
-      @session.on 'Page.frameDetached' do |params|
-        @frames.delete(params['frameId'])
-        puts "**** frameDetached called with #{params}" if ENV['DEBUG']
+      @session.on 'Page.frameDetached' do |frame_id:, **params|
+        @frames.delete(frame_id)
+        puts "**** frameDetached called with #{frame_id} : #{params}" if ENV['DEBUG']
       end
 
-      @session.on 'Page.frameNavigated' do |params|
-        puts "**** frameNavigated called with #{params}" if ENV['DEBUG']
-        frame_params = params['frame']
-        unless @frames.exists?(frame_params['id'])
-          puts "**** creating frome for #{frame_params['id']}" if ENV['DEBUG']
-          @frames.add(frame_params['id'], frame_params)
+      @session.on 'Page.frameNavigated' do |frame:|
+        puts "**** frameNavigated called with #{frame}" if ENV['DEBUG']
+        unless @frames.exists?(frame['id'])
+          puts "**** creating frame for #{frame['id']}" if ENV['DEBUG']
+          @frames.add(frame['id'], frame)
         end
-        @frames.get(frame_params['id'])&.loading(frame_params['loaderId'] || -1)
+        @frames.get(frame['id'])&.loading(frame['loaderId'] || -1)
       end
 
-      @session.on 'Page.frameStartedLoading' do |params|
-        puts "Setting loading for #{params['frameId']}" if ENV['DEBUG']
-        @frames.get(params['frameId'])&.loading(-1)
+      @session.on 'Page.frameStartedLoading' do |frame_id:|
+        puts "Setting loading for #{frame_id}" if ENV['DEBUG']
+        @frames.get(frame_id)&.loading(-1)
       end
 
-      @session.on 'Page.frameStoppedLoading' do |params|
-        puts "Setting loaded for #{params['frameId']}" if ENV['DEBUG']
-        @frames.get(params['frameId'])&.loaded!
+      @session.on 'Page.frameStoppedLoading' do |frame_id:|
+        puts "Setting loaded for #{frame_id}" if ENV['DEBUG']
+        @frames.get(frame_id)&.loaded!
       end
 
       # @session.on 'Page.lifecycleEvent' do |params|
@@ -505,16 +503,14 @@ module Capybara::Apparition
         main_frame.loaded! if @status_code != 200
       end
 
-      @session.on 'Page.navigatedWithinDocument' do |params|
-        puts "**** navigatedWithinDocument called with #{params}" if ENV['DEBUG']
-        frame_id = params['frameId']
-        # @frames.get(frame_id).state = :loaded if frame_id == main_frame.id
+      @session.on 'Page.navigatedWithinDocument' do |frame_id:, **params|
+        puts "**** navigatedWithinDocument called with #{frame_id}: #{params}" if ENV['DEBUG']
         @frames.get(frame_id).loaded! if frame_id == main_frame.id
       end
 
-      @session.on 'Runtime.executionContextCreated' do |params|
+      @session.on 'Runtime.executionContextCreated' do |context:|
         puts "**** executionContextCreated: #{params}" if ENV['DEBUG']
-        context = params['context']
+        # context = params['context']
         frame_id = context.dig('auxData', 'frameId')
         if context.dig('auxData', 'isDefault') && frame_id
           if (frame = @frames.get(frame_id))
@@ -525,63 +521,92 @@ module Capybara::Apparition
         end
       end
 
-      @session.on 'Runtime.executionContextDestroyed' do |params|
-        puts "executionContextDestroyed: #{params}" if ENV['DEBUG']
-        @frames.destroy_context(params['executionContextId'])
+      @session.on 'Runtime.executionContextDestroyed' do |execution_context_id:, **params|
+        puts "executionContextDestroyed: #{execution_context_id} : #{params}" if ENV['DEBUG']
+        @frames.destroy_context(execution_context_id)
       end
 
-      @session.on 'Network.requestWillBeSent' do |params|
-        @open_resource_requests[params['requestId']] = params.dig('request', 'url')
+      @session.on 'Network.requestWillBeSent' do |request_id:, request: nil, **|
+        @open_resource_requests[request_id] = request&.dig('url')
       end
 
-      @session.on 'Network.responseReceived' do |params|
-        @open_resource_requests.delete(params['requestId'])
+      @session.on 'Network.responseReceived' do |request_id:, **|
+        @open_resource_requests.delete(request_id)
         temp_headers.clear
         update_headers(async: true)
       end
 
-      @session.on 'Network.requestWillBeSent' do |params|
+      @session.on 'Network.requestWillBeSent' do |**params|
         @network_traffic.push(NetworkTraffic::Request.new(params))
       end
 
-      @session.on 'Network.responseReceived' do |params|
-        req = @network_traffic.find { |request| request.request_id == params['requestId'] }
-        req.response = NetworkTraffic::Response.new(params['response']) if req
+      @session.on 'Network.responseReceived' do |request_id:, response:, **|
+        req = @network_traffic.find { |request| request.request_id == request_id }
+        req.response = NetworkTraffic::Response.new(response) if req
       end
 
-      @session.on 'Network.responseReceived' do |params|
-        if params['type'] == 'Document'
-          @response_headers[params['frameId']] = params['response']['headers']
-          @status_code = params['response']['status']
+      @session.on 'Network.responseReceived' do |type:, frame_id: nil, response: nil, **|
+        if type == 'Document'
+          @response_headers[frame_id] = response['headers']
+          @status_code = response['status']
         end
       end
 
-      @session.on 'Network.loadingFailed' do |params|
-        req = @network_traffic.find { |request| request.request_id == params['requestId'] }
-        req&.blocked_params = params if params['blockedReason']
-        if params['type'] == 'Document'
-          puts "Loading Failed - request: #{params['requestId']} : #{params['errorText']}" if ENV['DEBUG']
+      @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
+        if type == 'Document'
+          puts "Loading Failed - request: #{request_id} : #{error_text}" if ENV['DEBUG']
         end
       end
 
-      @session.on 'Network.requestIntercepted' do |params|
-        request, interception_id = *params.values_at('request', 'interceptionId')
-        if params['authChallenge']
-          if params['authChallenge']['source'] == 'Proxy'
+      @session.on(
+        'Network.requestIntercepted'
+      ) do |request:, interception_id:, auth_challenge: nil, is_navigation_request: nil, **|
+        if auth_challenge
+          if auth_challenge['source'] == 'Proxy'
             handle_proxy_auth(interception_id)
           else
             handle_user_auth(interception_id)
           end
         else
-          process_intercepted_request(interception_id, request, params['isNavigationRequest'])
+          process_intercepted_request(interception_id, request, is_navigation_request)
+        end
+      end
+
+      @session.on 'Fetch.requestPaused' do |request:, request_id:, resource_type:, **|
+        process_intercepted_fetch(request_id, request, resource_type)
+      end
+
+      @session.on 'Fetch.authRequired' do |request_id:, auth_challenge: nil, **|
+        next unless auth_challenge
+
+        credentials_response = if auth_challenge['source'] == 'Proxy'
+          if @proxy_auth_attempts.include?(request_id)
+            puts 'Cancelling proxy auth' if ENV['DEBUG']
+            { response: 'CancelAuth' }
+          else
+            puts 'Replying with proxy auth credentials' if ENV['DEBUG']
+            @proxy_auth_attempts.push(request_id)
+            { response: 'ProvideCredentials' }.merge(@browser.proxy_auth || {})
+          end
+        elsif @auth_attempts.include?(request_id)
+          puts 'Cancelling auth' if ENV['DEBUG']
+          { response: 'CancelAuth' }
+        else
+          @auth_attempts.push(request_id)
+          puts 'Replying with auth credentials' if ENV['DEBUG']
+          { response: 'ProvideCredentials' }.merge(@credentials || {})
         end
+
+        async_command('Fetch.continueWithAuth', requestId: request_id, authChallengeResponse: credentials_response)
       end
 
-      @session.on 'Runtime.consoleAPICalled' do |params|
+      @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(' ').to_s,
+        details = params.dig(:stack_trace, 'callFrames')&.first
+        @browser.console.log(params[:type],
+                             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'])
@@ -600,15 +625,16 @@ module Capybara::Apparition
     end
 
     def register_js_error_handler
-      @session.on 'Runtime.exceptionThrown' do |params|
-        @js_error ||= params.dig('exceptionDetails', 'exception', 'description') if @raise_js_errors
+      @session.on 'Runtime.exceptionThrown' do |exception_details: nil, **|
+        @js_error ||= exception_details&.dig('exception', 'description') if @raise_js_errors
 
-        details = params.dig('exceptionDetails', 'stackTrace', 'callFrames')&.first
+        details = exception_details&.dig('stackTrace', 'callFrames')&.first ||
+                  exception_details || {}
         @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'])
+                             exception_details&.dig('exception', 'description'),
+                             source: details['url'].to_s.empty? ? nil : details['url'],
+                             line_number: details['lineNumber'].to_i.zero? ? nil : details['lineNumber'],
+                             columnNumber: details['columnNumber'].to_i.zero? ? nil : details['columnNumber'])
       end
     end
 
@@ -619,6 +645,7 @@ module Capybara::Apparition
 
     def setup_network_interception
       async_command 'Network.setCacheDisabled', cacheDisabled: true
+      # async_command 'Fetch.enable', handleAuthRequests: true
       async_command 'Network.setRequestInterception', patterns: [{ urlPattern: '*' }]
     end
 
@@ -648,6 +675,37 @@ module Capybara::Apparition
       end
     end
 
+    def process_intercepted_fetch(interception_id, request, resource_type)
+      navigation = (resource_type == 'Document')
+      headers, url = request.values_at('headers', 'url')
+
+      unless @temp_headers.empty? || navigation # rubocop:disable Style/IfUnlessModifier
+        headers.delete_if { |name, value| @temp_headers[name] == value }
+      end
+      unless @temp_no_redirect_headers.empty? || !navigation
+        headers.delete_if { |name, value| @temp_no_redirect_headers[name] == value }
+      end
+      if (accept = perm_headers.keys.find { |k| /accept/i.match? k })
+        headers[accept] = perm_headers[accept]
+      end
+
+      if @url_blacklist.any? { |r| url.match Regexp.escape(r).gsub('\*', '.*?') }
+        async_command('Fetch.failRequest', errorReason: 'Failed', requestId: interception_id)
+      elsif @url_whitelist.any?
+        if @url_whitelist.any? { |r| url.match Regexp.escape(r).gsub('\*', '.*?') }
+          async_command('Fetch.continueRequest',
+                        requestId: interception_id,
+                        headers: headers.map { |k, v| { name: k, value: v } })
+        else
+          async_command('Fetch.failRequest', errorReason: 'Failed', requestId: interception_id)
+        end
+      else
+        async_command('Fetch.continueRequest',
+                      requestId: interception_id,
+                      headers: headers.map { |k, v| { name: k, value: v } })
+      end
+    end
+
     def continue_request(id, **params)
       async_command 'Network.continueInterceptedRequest', interceptionId: id, **params
     end

data/lib/capybara/apparition/page/keyboard.rb

@@ -71,11 +71,13 @@ module Capybara::Apparition
 
       Array(keys).each do |sequence|
         case sequence
-        when Array then type_with_modifiers(sequence, delay: delay)
-        when String then sequence.each_char do |char|
-          press char
-          sleep delay
-        end
+        when Array
+          type_with_modifiers(sequence, delay: delay)
+        when String
+          sequence.each_char do |char|
+            press char
+            sleep delay
+          end
         else
           press sequence
           sleep delay

data/lib/capybara/apparition/page/mouse.rb

@@ -6,6 +6,7 @@ module Capybara::Apparition
       @page = page
       @keyboard = keyboard
       @current_pos = { x: 0, y: 0 }
+      @current_buttons = BUTTONS[:none]
     end
 
     def click_at(x:, y:, button: 'left', count: 1, modifiers: [])
@@ -29,11 +30,13 @@ module Capybara::Apparition
     def down(button: 'left', **options)
       options = @current_pos.merge(button: button).merge(options)
       mouse_event('mousePressed', options)
+      @current_buttons |= BUTTONS[button.to_sym]
       self
     end
 
     def up(button: 'left', **options)
       options = @current_pos.merge(button: button).merge(options)
+      @current_buttons &= ~BUTTONS[button.to_sym]
       mouse_event('mouseReleased', options)
       self
     end
@@ -43,11 +46,21 @@ module Capybara::Apparition
     def mouse_event(type, x:, y:, button: 'none', count: 1)
       @page.command('Input.dispatchMouseEvent',
                     type: type,
-                    button: button,
+                    button: button.to_s,
+                    buttons: @current_buttons,
                     x: x,
                     y: y,
                     modifiers: @keyboard.modifiers,
                     clickCount: count)
     end
+
+    BUTTONS = {
+      left: 1,
+      right: 2,
+      middle: 4,
+      back: 8,
+      forward: 16,
+      none: 0
+    }.freeze
   end
 end

data/lib/capybara/apparition/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Apparition
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apparition
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Thomas Walpole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.5
-- !ruby/object:Gem::Dependency
-  name: byebug
-  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: chunky_png
   requirement: !ruby/object:Gem::Requirement