apparition 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbed62503718fca5fe4664a248445c8b222073b352e2afd1422eeb85cf7bbf40
-  data.tar.gz: 508d1a1883ccc043b26a617ce84bbfb30ed1a72eee407965b10a50a12e2a3a6d
+  metadata.gz: 3a8ccd4ce950f7c17f8ab0ac0c5ddcbbc13a336f428011d66f4b3cb028ced150
+  data.tar.gz: c524d1e955e3e4e958d0bd64350190eec6f53c7f612a6bd1b41867c05ab11427
 SHA512:
-  metadata.gz: 90fccfe118998a00935b4ff9c6637747a73ea917927e15db3bc29b6a02aa9ecd763bde7d8f65043b377e33c7357ff8fbe38f8064970e7e79de5aeac37bb6bcf2
-  data.tar.gz: 3e2220019a00bd43c8125c7ab6d75f6fb7b8b4430e57e28fe22dea73012b2b8c61fea655e1a455cb1dfa49d55cafadbf09ffc80621f1e43745c0791add88a5e1
+  metadata.gz: 1d772071df2776e86a611a07b718eb3c411cf9048e466d66515920261f6aa8b6705ddd1559d3fa8c8728fe3510a58b37b82986d698ad17f5add7f7399a9d4fc8
+  data.tar.gz: bdd2bdfba3591b9a798cc820ff4dd8ce7d90af853f79c716828e3bbb2a51810c0e2f4705c16181b9284533569bd4f050fa94d95f1b62d3c5fc2880d29d817a72

data/README.md

@@ -179,8 +179,9 @@ end
 `options` is a hash of options. The following options are supported:
 
 *   `:headless` (Boolean) - When false, run the browser visibly
+*   `:remote` (Boolean) - When true, connect to remote browser instead of starting locally (see [below](#Remote Chrome Driver))
 *   `:debug` (Boolean) - When true, debug output is logged to `STDERR`.
-*   `:logger` (Object responding to `puts`) - When present, debug output is written to this object
+*   `:logger` (Ruby logger object or any object responding to `puts`) - When present, debug output is written to this object
 *   `:browser_logger` (`IO` object) - This is where your `console.log` statements will show up. Default: `STDOUT`
 *   `:timeout` (Numeric) - The number of seconds we'll wait for a response
     when communicating with Chrome. Default is 30.
@@ -198,6 +199,18 @@ end
 *   `:browser_options` (Hash) - Extra command line options to pass to Chrome when starting
 *   `:skip_image_loading` (Boolean) - Don't load images
 
+### Remote Chrome Driver ###
+Apparition can connect to already running instance of chrome. 
+Remote mode is useful when running tests in CI and chrome is available as separate docker container.
+
+In order to use remote browser - set up apparition in the following way:
+```ruby
+Capybara.register_driver :apparition do |app|
+  browser_options = { 'remote-debugging-address' => '127.0.0.1', 'remote-debugging-port' => 9999 }
+  Capybara::Apparition::Driver.new(app, remote: true, browser_options: browser_options)
+end
+```
+
 ### URL Blacklisting & Whitelisting ###
 Apparition supports URL blacklisting, which allows you
 to prevent scripts from running on designated domains:

data/lib/capybara/apparition/browser.rb

@@ -18,6 +18,7 @@ require 'time'
 module Capybara::Apparition
   class Browser
     attr_reader :client, :paper_size, :zoom_factor, :console, :proxy_auth
+
     extend Forwardable
 
     delegate %i[visit current_url status_code
@@ -93,7 +94,7 @@ module Capybara::Apparition
                     ignore_https_errors: ignore_https_errors,
                     js_errors: js_errors, extensions: @extensions,
                     url_blacklist: @url_blacklist,
-                    url_whitelist: @url_whitelist) .send(:main_frame).loaded!
+                    url_whitelist: @url_whitelist).send(:main_frame).loaded!
 
       timer = Capybara::Helpers.timer(expire_in: 10)
       until @pages[new_target_id].usable?
@@ -186,7 +187,13 @@ module Capybara::Apparition
   private
 
     def log(message)
-      @logger&.puts message if ENV['DEBUG']
+      return unless @logger && ENV['DEBUG']
+
+      if @logger.respond_to?(:puts)
+        @logger.puts(message)
+      else
+        @logger.debug(message)
+      end
     end
 
     def initialize_handlers

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'capybara/apparition/browser/launcher/local'
+require 'capybara/apparition/browser/launcher/remote'
+
+module Capybara::Apparition
+  class Browser
+    class Launcher
+      def self.start(options)
+        browser_options = options.fetch(:browser_options, {})
+
+        if options.fetch(:remote, false)
+          Remote.start(
+            browser_options
+          )
+        else
+          Local.start(
+            headless: options.fetch(:headless, true),
+            browser_options: browser_options
+          )
+        end
+      end
+    end
+  end
+end

data/lib/capybara/apparition/browser/launcher/local.rb

@@ -0,0 +1,213 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+module Capybara::Apparition
+  class Browser
+    class Launcher
+      class Local
+        KILL_TIMEOUT = 5
+
+        def self.start(*args, **options)
+          new(*args, **options).tap(&:start)
+        end
+
+        def self.process_killer(pid)
+          proc do
+            sleep 1
+            if Capybara::Apparition.windows?
+              ::Process.kill('KILL', pid)
+            else
+              ::Process.kill('USR1', pid)
+              timer = Capybara::Helpers.timer(expire_in: KILL_TIMEOUT)
+              while ::Process.wait(pid, ::Process::WNOHANG).nil?
+                sleep 0.05
+                next unless timer.expired?
+
+                ::Process.kill('KILL', pid)
+                ::Process.wait(pid)
+                break
+              end
+            end
+          rescue Errno::ESRCH, Errno::ECHILD # rubocop:disable Lint/SuppressedException
+          end
+        end
+
+        def initialize(headless:, **options)
+          @path = ENV['BROWSER_PATH']
+          @options = DEFAULT_OPTIONS.merge(options[:browser_options] || {})
+          if headless
+            @options.merge!(HEADLESS_OPTIONS)
+            @options['disable-gpu'] = nil if Capybara::Apparition.windows?
+          end
+          @options['user-data-dir'] = Dir.mktmpdir
+        end
+
+        def start
+          @output = Queue.new
+
+          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 !@stdout_stderr.eof? && (data = @stdout_stderr.readpartial(512))
+              @output << data
+            end
+          end
+
+          ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
+        end
+
+        def stop
+          return unless @pid
+
+          kill
+          ObjectSpace.undefine_finalizer(self)
+        end
+
+        def restart
+          stop
+          start
+        end
+
+        def host
+          @host ||= ws_url.host
+        end
+
+        def port
+          @port ||= ws_url.port
+        end
+
+        def ws_url
+          @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
+        end
+
+      private
+
+        def kill
+          self.class.process_killer(@pid).call
+          @pid = nil
+        end
+
+        def close_io
+          @stdout_stderr.close unless @stdout_stderr.closed?
+        rescue IOError
+          raise unless RUBY_ENGINE == 'jruby'
+        end
+
+        def path
+          host_os = RbConfig::CONFIG['host_os']
+          @path ||= case RbConfig::CONFIG['host_os']
+          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+            windows_path
+          when /darwin|mac os/
+            macosx_path
+          when /linux|solaris|bsd/
+            linux_path
+          else
+            raise ArgumentError, "unknown os: #{host_os.inspect}"
+          end
+
+          raise ArgumentError, 'Unable to find Chrome executeable' unless File.file?(@path.to_s) && File.executable?(@path.to_s)
+
+          @path
+        end
+
+        def windows_path
+          envs = %w[LOCALAPPDATA PROGRAMFILES PROGRAMFILES(X86)]
+          directories = %w[\\Google\\Chrome\\Application \\Chromium\\Application]
+          files = %w[chrome.exe]
+
+          directories.product(envs, files).lazy.map { |(dir, env, file)| "#{ENV[env]}\\#{dir}\\#{file}" }
+                     .find { |f| File.exist?(f) } || find_first_binary(*files)
+        end
+
+        def macosx_path
+          directories = ['', File.expand_path('~')]
+          files = ['/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+                   '/Applications/Chromium.app/Contents/MacOS/Chromium']
+          directories.product(files).map(&:join).find { |f| File.exist?(f) } ||
+            find_first_binary('Google Chrome', 'Chromium')
+        end
+
+        def linux_path
+          directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /opt/google/chrome]
+          files = %w[google-chrome chrome chromium chromium-browser]
+
+          directories.product(files).map { |p| p.join('/') }.find { |f| File.exist?(f) } ||
+            find_first_binary(*files)
+        end
+
+        def find_first_binary(*binaries)
+          paths = ENV['PATH'].split(File::PATH_SEPARATOR)
+
+          binaries.product(paths).lazy.map do |(binary, path)|
+            Dir.glob(File.join(path, binary)).find { |f| File.executable?(f) }
+          end.reject(&:nil?).first
+        end
+
+        # Chromium command line options
+        # https://peter.sh/experiments/chromium-command-line-switches/
+        DEFAULT_BOOLEAN_OPTIONS = %w[
+          disable-background-networking
+          disable-background-timer-throttling
+          disable-breakpad
+          disable-client-side-phishing-detection
+          disable-default-apps
+          disable-dev-shm-usage
+          disable-extensions
+          disable-features=site-per-process
+          disable-hang-monitor
+          disable-infobars
+          disable-popup-blocking
+          disable-prompt-on-repost
+          disable-sync
+          disable-translate
+          disable-session-crashed-bubble
+          metrics-recording-only
+          no-first-run
+          safebrowsing-disable-auto-update
+          enable-automation
+          password-store=basic
+          use-mock-keychain
+          keep-alive-for-test
+        ].freeze
+        # Note: --no-sandbox is not needed if you properly setup a user in the container.
+        # https://github.com/ebidel/lighthouse-ci/blob/master/builder/Dockerfile#L35-L40
+        # no-sandbox
+        # disable-web-security
+        DEFAULT_VALUE_OPTIONS = {
+          'window-size' => '1024,768',
+          'homepage' => 'about:blank',
+          'remote-debugging-address' => '127.0.0.1'
+        }.freeze
+        DEFAULT_OPTIONS = DEFAULT_BOOLEAN_OPTIONS.each_with_object({}) { |opt, hsh| hsh[opt] = nil }
+                                                 .merge(DEFAULT_VALUE_OPTIONS)
+                                                 .freeze
+        HEADLESS_OPTIONS = {
+          'headless' => nil,
+          'hide-scrollbars' => nil,
+          'mute-audio' => nil
+        }.freeze
+      end
+    end
+  end
+end

data/lib/capybara/apparition/browser/launcher/remote.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'socket'
+require 'timeout'
+
+module Capybara::Apparition
+  class Browser
+    class Launcher
+      class Remote
+        attr_reader :ws_url
+
+        def self.start(options)
+          new(options).tap(&:start)
+        end
+
+        def initialize(options)
+          @remote_host = options.fetch('remote-debugging-address', '127.0.0.1')
+          @remote_port = options.fetch('remote-debugging-port', '9222')
+        end
+
+        def start
+          @ws_url = Addressable::URI.parse(get_ws_url(@remote_host, @remote_port))
+
+          true
+        end
+
+        def stop
+          # Remote instance cannot be stopped
+        end
+
+        def restart
+          # Remote instance cannot be restarted
+        end
+
+        def host
+          ws_url.host
+        end
+
+        def port
+          ws_url.port
+        end
+
+      protected
+
+        def get_ws_url(host, port)
+          response = Net::HTTP.get(host, '/json/version', port)
+          response = JSON.parse(response)
+          response['webSocketDebuggerUrl']
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+          raise ArgumentError, "Cannot connect to remote Chrome at: 'http://#{host}:#{port}/json/version'"
+        end
+      end
+    end
+  end
+end

data/lib/capybara/apparition/console.rb

@@ -8,8 +8,15 @@ module Capybara::Apparition
     end
 
     def log(type, message, **options)
+      return unless @logger
+
       @messages << OpenStruct.new(type: type, message: message, **options)
-      @logger&.puts "#{type}: #{message}"
+      message_to_log = "#{type}: #{message}"
+      if @logger.respond_to?(:puts)
+        @logger.puts(message_to_log)
+      else
+        @logger.info(message_to_log)
+      end
     end
 
     def clear

data/lib/capybara/apparition/driver.rb

@@ -3,8 +3,8 @@
 require 'uri'
 require 'forwardable'
 require 'capybara/apparition/driver/chrome_client'
-require 'capybara/apparition/driver/launcher'
 require 'capybara/apparition/configuration'
+require 'capybara/apparition/browser/launcher'
 
 module Capybara::Apparition
   class Driver < Capybara::Driver::Base
@@ -64,10 +64,7 @@ module Capybara::Apparition
 
     def client
       @client ||= begin
-        @launcher ||= Browser::Launcher.start(
-          headless: options.fetch(:headless, true),
-          browser_options: browser_options
-        )
+        @launcher ||= Browser::Launcher.start(options)
         ws_url = @launcher.ws_url
         ::Capybara::Apparition::ChromeClient.client(ws_url.to_s)
       end
@@ -221,9 +218,7 @@ module Capybara::Apparition
     alias_method :header, :add_header
 
     def response_headers
-      browser.response_headers.each_with_object({}) do |(key, value), hsh|
-        hsh[key.split('-').map(&:capitalize).join('-')] = value
-      end
+      browser.response_headers.transform_keys { |key| key.split('-').map(&:capitalize).join('-') }
     end
 
     def set_cookie(name, value = nil, options = {})
@@ -295,7 +290,7 @@ module Capybara::Apparition
         begin
           input = read.read_nonblock(80) # clear out the read buffer
           puts unless input&.end_with?("\n")
-        rescue EOFError, IO::WaitReadable # rubocop:disable Lint/SuppressedException
+        rescue EOFError, IO::WaitReadable
           # Ignore problems reading from STDIN.
         end
       end
@@ -446,7 +441,7 @@ module Capybara::Apparition
           end
         end
       when Hash
-        options.each_with_object({}) { |(option, val), hsh| hsh[option.to_s.tr('_', '-')] = val }
+        options.transform_keys { |option| option.to_s.tr('_', '-') }
       else
         raise ArgumentError, 'browser_options must be an Array or a Hash'
       end
@@ -523,7 +518,7 @@ module Capybara::Apparition
         object_cache[arg]
       when Hash
         if (arg['subtype'] == 'node') && arg['objectId']
-          tag_name = arg['description'].split(/[\.#]/, 2)[0]
+          tag_name = arg['description'].split(/[.#]/, 2)[0]
           Capybara::Apparition::Node.new(self, browser.current_page, arg['objectId'], tag_name: tag_name)
         else
           object_cache[arg] = {}

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

@@ -206,9 +206,7 @@ module Capybara::Apparition
       event_name = event['method']
       handlers[event_name].each do |handler|
         puts "Calling handler for #{event_name}" if ENV['DEBUG'] == 'V'
-        # 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 })
+        handler.call(**event['params'].transform_keys(&method(:snake_sym)))
       end
     end
 
@@ -224,10 +222,8 @@ module Capybara::Apparition
       @async_response_handler.abort_on_exception = true
 
       @listener = Thread.new do
-        begin
-          listen
-        rescue EOFError # rubocop:disable Lint/SuppressedException
-        end
+        listen
+      rescue EOFError # rubocop:disable Lint/SuppressedException
       end
       # @listener.abort_on_exception = true
     end

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

@@ -63,6 +63,7 @@ module Capybara::Apparition
 
   class Socket
     attr_reader :url
+
     def initialize(url)
       @url = url
       uri = URI.parse(url)

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

@@ -3,6 +3,7 @@
 module Capybara::Apparition::NetworkTraffic
   class Error
     attr_reader :url, :code, :description
+
     def initialize(url:, code:, description:)
       @url = url
       @code = code

data/lib/capybara/apparition/node.rb

@@ -30,7 +30,7 @@ module Capybara::Apparition
     def find(method, selector)
       js = method == :css ? FIND_CSS_JS : FIND_XPATH_JS
       evaluate_on(js, value: selector).map do |r_o|
-        tag_name = r_o['description'].split(/[\.#]/, 2)[0]
+        tag_name = r_o['description'].split(/[.#]/, 2)[0]
         Capybara::Apparition::Node.new(driver, @page, r_o['objectId'], tag_name: tag_name)
       end
     rescue ::Capybara::Apparition::BrowserError => e
@@ -197,7 +197,7 @@ module Capybara::Apparition
       evaluate_on ELEMENT_DISABLED_JS
     end
 
-    def click(keys = [], button: 'left', count: 1, **options)
+    def click(keys = [], button: 'left', count: 1, delay: 0, **options)
       pos = element_click_pos(**options)
       raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['click']) if pos.nil?
 
@@ -208,7 +208,7 @@ module Capybara::Apparition
         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))
+      @page.mouse.click_at(**pos.merge(button: button, count: count, modifiers: keys, delay: delay))
       if ENV['DEBUG']
         begin
           new_pos = element_click_pos(**options)
@@ -490,13 +490,21 @@ module Capybara::Apparition
       DevToolsProtocol::RemoteObject.new(@page, response['result'] || response['object']).value
     end
 
-    def set_text(value, clear: nil, delay: 0, **_unused)
+    def set_text(value, clear: nil, delay: 0, rapid: nil, **_unused)
       value = value.to_s
       if value.empty? && clear.nil?
         evaluate_on CLEAR_ELEMENT_JS
       else
         focus
-        _send_keys(*keys_to_send(value, clear), delay: delay)
+        if (rapid && (value.length >= 6)) || ((value.length > 30) && rapid != false)
+          _send_keys(*keys_to_send(value[0..2], clear), delay: delay)
+          driver.execute_script <<~JS, self, value[0...-3]
+            arguments[0].value = arguments[1]
+          JS
+          _send_keys(*keys_to_send(value[-3..-1], :none), delay: delay)
+        else
+          _send_keys(*keys_to_send(value, clear), delay: delay)
+        end
       end
     end
 
@@ -563,7 +571,7 @@ module Capybara::Apparition
       r_o = @page.element_from_point(x: x, y: y)
       return nil unless r_o && r_o['objectId']
 
-      tag_name = r_o['description'].split(/[\.#]/, 2)[0]
+      tag_name = r_o['description'].split(/[.#]/, 2)[0]
       hit_node = Capybara::Apparition::Node.new(driver, @page, r_o['objectId'], tag_name: tag_name)
       result = begin
         evaluate_on(<<~JS, objectId: hit_node.id)

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

@@ -17,15 +17,13 @@ module Capybara::Apparition
         m.up(**other.visible_center)
       else
         @page.keyboard.with_keys(drop_modifiers) do
-          begin
-            other.scroll_if_needed
-            sleep delay
-            m.move_to(**other.visible_center)
-            sleep delay
-          ensure
-            m.up
-            sleep delay
-          end
+          other.scroll_if_needed
+          sleep delay
+          m.move_to(**other.visible_center)
+          sleep delay
+        ensure
+          m.up
+          sleep delay
         end
       end
     end
@@ -47,7 +45,7 @@ module Capybara::Apparition
     def drop(*args)
       if args[0].is_a? String
         input = evaluate_on ATTACH_FILE
-        tag_name = input['description'].split(/[\.#]/, 2)[0]
+        tag_name = input['description'].split(/[.#]/, 2)[0]
         input = Capybara::Apparition::Node.new(driver, @page, input['objectId'], tag_name: tag_name)
         input.set(args)
         evaluate_on DROP_FILE, objectId: input.id

data/lib/capybara/apparition/page.rb

@@ -197,7 +197,7 @@ module Capybara::Apparition
       js_escaped_selector = selector.gsub('\\', '\\\\\\').gsub('"', '\"')
       query = method == :css ? CSS_FIND_JS : XPATH_FIND_JS
       result = _raw_evaluate(format(query, selector: js_escaped_selector))
-      (result || []).map { |r_o| [self, r_o['objectId'], tag_name: r_o['description'].split(/[\.#]/, 2)[0]] }
+      (result || []).map { |r_o| [self, r_o['objectId'], tag_name: r_o['description'].split(/[.#]/, 2)[0]] }
     rescue ::Capybara::Apparition::BrowserError => e
       raise unless /is not a valid (XPath expression|selector)/.match? e.name
 
@@ -300,7 +300,7 @@ module Capybara::Apparition
 
     def element_from_point(x:, y:)
       r_o = _raw_evaluate("document.elementFromPoint(#{x}, #{y})", context_id: main_frame.context_id)
-      while r_o && (/^iframe/.match? r_o['description'])
+      while r_o&.[]('description')&.start_with?('iframe')
         frame_node = command('DOM.describeNode', objectId: r_o['objectId'])
         frame = @frames.get(frame_node.dig('node', 'frameId'))
         fo = frame_offset(frame)
@@ -366,7 +366,7 @@ module Capybara::Apparition
     end
 
     def async_command(name, **params)
-      @browser.command_for_session(@session.session_id, name, **params).discard_result
+      @browser.command_for_session(@session.session_id, name, params).discard_result
     end
 
     def extra_headers
@@ -374,11 +374,9 @@ module Capybara::Apparition
     end
 
     def update_headers(async: false)
-      method = async ? :async_command : :command
       if (ua = extra_headers.find { |k, _v| /^User-Agent$/i.match? k })
-        send(method, 'Network.setUserAgentOverride', userAgent: ua[1])
+        send(async ? :async_command : :command, 'Network.setUserAgentOverride', userAgent: ua[1])
       end
-      send(method, 'Network.setExtraHTTPHeaders', headers: extra_headers)
       setup_network_interception
     end
 
@@ -509,8 +507,6 @@ module Capybara::Apparition
       end
 
       @session.on 'Runtime.executionContextCreated' do |context:|
-        puts "**** executionContextCreated: #{params}" if ENV['DEBUG']
-        # context = params['context']
         frame_id = context.dig('auxData', 'frameId')
         if context.dig('auxData', 'isDefault') && frame_id
           if (frame = @frames.get(frame_id))
@@ -560,20 +556,6 @@ module Capybara::Apparition
         end
       end
 
-      @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, is_navigation_request)
-        end
-      end
-
       @session.on 'Fetch.requestPaused' do |request:, request_id:, resource_type:, **|
         process_intercepted_fetch(request_id, request, resource_type)
       end
@@ -645,39 +627,13 @@ 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
-
-    def process_intercepted_request(interception_id, request, navigation)
-      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('\*', '.*?') }
-        block_request(interception_id, 'Failed')
-      elsif @url_whitelist.any?
-        if @url_whitelist.any? { |r| url.match Regexp.escape(r).gsub('\*', '.*?') }
-          continue_request(interception_id, headers: headers)
-        else
-          block_request(interception_id, 'Failed')
-        end
-      else
-        continue_request(interception_id, headers: headers)
-      end
+      async_command 'Fetch.enable', handleAuthRequests: true
     end
 
     def process_intercepted_fetch(interception_id, request, resource_type)
       navigation = (resource_type == 'Document')
       headers, url = request.values_at('headers', 'url')
+      headers = headers.merge(extra_headers)
 
       unless @temp_headers.empty? || navigation # rubocop:disable Style/IfUnlessModifier
         headers.delete_if { |name, value| @temp_headers[name] == value }
@@ -706,14 +662,6 @@ module Capybara::Apparition
       end
     end
 
-    def continue_request(id, **params)
-      async_command 'Network.continueInterceptedRequest', interceptionId: id, **params
-    end
-
-    def block_request(id, reason)
-      async_command 'Network.continueInterceptedRequest', errorReason: reason, interceptionId: id
-    end
-
     def go_history(delta)
       history = command('Page.getNavigationHistory')
       entry = history['entries'][history['currentIndex'] + delta]

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

@@ -66,6 +66,10 @@ module Capybara::Apparition
 
   private
 
+    def insert_emoji(str)
+      @page.command('Input.insertText', text: str)
+    end
+
     def type_with_modifiers(keys, delay:)
       old_pressed_keys, @pressed_keys = @pressed_keys, {}
 
@@ -74,9 +78,17 @@ module Capybara::Apparition
         when Array
           type_with_modifiers(sequence, delay: delay)
         when String
-          sequence.each_char do |char|
-            press char
-            sleep delay
+          clusters = sequence.grapheme_clusters.chunk { |gc| gc.match?(/\p{Emoji Presentation}/) }
+          clusters.each do |emoji, chars|
+            if emoji
+              insert_emoji(chars.join)
+              sleep delay
+            else
+              chars.each do |char|
+                press char
+                sleep delay
+              end
+            end
           end
         else
           press sequence
@@ -91,7 +103,7 @@ module Capybara::Apparition
     end
 
     def release_pressed_keys
-      @pressed_keys.values.each { |desc| up(desc) }
+      @pressed_keys.each_value { |desc| up(desc) }
     end
 
     def key_description(key)

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

@@ -9,12 +9,13 @@ module Capybara::Apparition
       @current_buttons = BUTTONS[:none]
     end
 
-    def click_at(x:, y:, button: 'left', count: 1, modifiers: [])
+    def click_at(x:, y:, button: 'left', count: 1, delay: 0, modifiers: [])
       move_to x: x, y: y
       count.times do |num|
         @keyboard.with_keys(modifiers) do
           mouse_params = { x: x, y: y, button: button, count: num + 1 }
           down(**mouse_params)
+          sleep(delay || 0)
           up(**mouse_params)
         end
       end

data/lib/capybara/apparition/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Apparition
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apparition
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Thomas Walpole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -44,6 +44,20 @@ 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
@@ -242,6 +256,9 @@ files:
 - lib/capybara/apparition/browser/cookie.rb
 - lib/capybara/apparition/browser/frame.rb
 - lib/capybara/apparition/browser/header.rb
+- lib/capybara/apparition/browser/launcher.rb
+- lib/capybara/apparition/browser/launcher/local.rb
+- lib/capybara/apparition/browser/launcher/remote.rb
 - lib/capybara/apparition/browser/modal.rb
 - lib/capybara/apparition/browser/page_manager.rb
 - lib/capybara/apparition/browser/render.rb
@@ -254,7 +271,6 @@ files:
 - lib/capybara/apparition/dev_tools_protocol/session.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
@@ -284,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

@@ -1,213 +0,0 @@
-# frozen_string_literal: true
-
-require 'open3'
-
-module Capybara::Apparition
-  class Browser
-    class Launcher
-      KILL_TIMEOUT = 5
-
-      def self.start(*args, **options)
-        new(*args, **options).tap(&:start)
-      end
-
-      def self.process_killer(pid)
-        proc do
-          begin
-            sleep 1
-            if Capybara::Apparition.windows?
-              ::Process.kill('KILL', pid)
-            else
-              ::Process.kill('USR1', pid)
-              timer = Capybara::Helpers.timer(expire_in: KILL_TIMEOUT)
-              while ::Process.wait(pid, ::Process::WNOHANG).nil?
-                sleep 0.05
-                next unless timer.expired?
-
-                ::Process.kill('KILL', pid)
-                ::Process.wait(pid)
-                break
-              end
-            end
-          rescue Errno::ESRCH, Errno::ECHILD # rubocop:disable Lint/SuppressedException
-          end
-        end
-      end
-
-      def initialize(headless:, **options)
-        @path = ENV['BROWSER_PATH']
-        @options = DEFAULT_OPTIONS.merge(options[:browser_options] || {})
-        if headless
-          @options.merge!(HEADLESS_OPTIONS)
-          @options['disable-gpu'] = nil if Capybara::Apparition.windows?
-        end
-        @options['user-data-dir'] = Dir.mktmpdir
-      end
-
-      def start
-        @output = Queue.new
-
-        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 !@stdout_stderr.eof? && (data = @stdout_stderr.readpartial(512))
-            @output << data
-          end
-        end
-
-        ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
-      end
-
-      def stop
-        return unless @pid
-
-        kill
-        ObjectSpace.undefine_finalizer(self)
-      end
-
-      def restart
-        stop
-        start
-      end
-
-      def host
-        @host ||= ws_url.host
-      end
-
-      def port
-        @port ||= ws_url.port
-      end
-
-      def ws_url
-        @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
-      end
-
-    private
-
-      def kill
-        self.class.process_killer(@pid).call
-        @pid = nil
-      end
-
-      def close_io
-        @stdout_stderr.close unless @stdout_stderr.closed?
-      rescue IOError
-        raise unless RUBY_ENGINE == 'jruby'
-      end
-
-      def path
-        host_os = RbConfig::CONFIG['host_os']
-        @path ||= case RbConfig::CONFIG['host_os']
-        when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-          windows_path
-        when /darwin|mac os/
-          macosx_path
-        when /linux|solaris|bsd/
-          linux_path
-        else
-          raise ArgumentError, "unknown os: #{host_os.inspect}"
-        end
-
-        raise ArgumentError, 'Unable to find Chrome executeable' unless File.file?(@path.to_s) && File.executable?(@path.to_s)
-
-        @path
-      end
-
-      def windows_path
-        envs = %w[LOCALAPPDATA PROGRAMFILES PROGRAMFILES(X86)]
-        directories = %w[\\Google\\Chrome\\Application \\Chromium\\Application]
-        files = %w[chrome.exe]
-
-        directories.product(envs, files).lazy.map { |(dir, env, file)| "#{ENV[env]}\\#{dir}\\#{file}" }
-                   .find { |f| File.exist?(f) } || find_first_binary(*files)
-      end
-
-      def macosx_path
-        directories = ['', File.expand_path('~')]
-        files = ['/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
-                 '/Applications/Chromium.app/Contents/MacOS/Chromium']
-        directories.product(files).map(&:join).find { |f| File.exist?(f) } ||
-          find_first_binary('Google Chrome', 'Chromium')
-      end
-
-      def linux_path
-        directories = %w[/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin /opt/google/chrome]
-        files = %w[google-chrome chrome chromium chromium-browser]
-
-        directories.product(files).map { |p| p.join('/') }.find { |f| File.exist?(f) } ||
-          find_first_binary(*files)
-      end
-
-      def find_first_binary(*binaries)
-        paths = ENV['PATH'].split(File::PATH_SEPARATOR)
-
-        binaries.product(paths).lazy.map do |(binary, path)|
-          Dir.glob(File.join(path, binary)).find { |f| File.executable?(f) }
-        end.reject(&:nil?).first
-      end
-
-      # Chromium command line options
-      # https://peter.sh/experiments/chromium-command-line-switches/
-      DEFAULT_BOOLEAN_OPTIONS = %w[
-        disable-background-networking
-        disable-background-timer-throttling
-        disable-breakpad
-        disable-client-side-phishing-detection
-        disable-default-apps
-        disable-dev-shm-usage
-        disable-extensions
-        disable-features=site-per-process
-        disable-hang-monitor
-        disable-infobars
-        disable-popup-blocking
-        disable-prompt-on-repost
-        disable-sync
-        disable-translate
-        disable-session-crashed-bubble
-        metrics-recording-only
-        no-first-run
-        safebrowsing-disable-auto-update
-        enable-automation
-        password-store=basic
-        use-mock-keychain
-        keep-alive-for-test
-      ].freeze
-      # Note: --no-sandbox is not needed if you properly setup a user in the container.
-      # https://github.com/ebidel/lighthouse-ci/blob/master/builder/Dockerfile#L35-L40
-      # no-sandbox
-      # disable-web-security
-      DEFAULT_VALUE_OPTIONS = {
-        'window-size' => '1024,768',
-        'homepage' => 'about:blank',
-        'remote-debugging-address' => '127.0.0.1'
-      }.freeze
-      DEFAULT_OPTIONS = DEFAULT_BOOLEAN_OPTIONS.each_with_object({}) { |opt, hsh| hsh[opt] = nil }
-                                               .merge(DEFAULT_VALUE_OPTIONS)
-                                               .freeze
-      HEADLESS_OPTIONS = {
-        'headless' => nil,
-        'hide-scrollbars' => nil,
-        'mute-audio' => nil
-      }.freeze
-    end
-  end
-end