apparition 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594a3f464bdb932d89f32f9bc0c3ce132ae5322c167e96016b0e66e292a8d71f
-  data.tar.gz: 4e2bf086855cb7aad5d38727efb96c9945f325e6c4b53f4ab17b4caa5a4caa35
+  metadata.gz: b51cb57f961f9825c56ce38377bbf4fd5477a5cdad6d75a2dac1aab827b81561
+  data.tar.gz: 29e9b0c81cdcd3be2820a8d9a2719708750d3099f56a6c403c474a77bb254bce
 SHA512:
-  metadata.gz: d4111cb452f2f30f69619bbdfe499b1a44aa00208e255264797440dfed1dd5c98c4045a31ebd6572b902bf16ed62c4873dbfc5229d5ec273296c7ba688cb4c70
-  data.tar.gz: 1c160f3115ec245d2ddb834053913627f1ed34fe681fd8cb892d0a2b9bcd1af7d61f673b392582c84d248d5341239b4b2343ee5eee14c357fd018396f6e919d8
+  metadata.gz: 95be5f025a29554e4909b5e4500d2694f580b20ee92b9cf555c7fcf2a9bc1962871d95c81730d9800a55d8cc38f99656713f88cd10f0f7bd8e880083819c0edc
+  data.tar.gz: 34c0d53702b1b0be001cd65ebf0bfcb17ab6d3e86505851a23bbe39bd9bd80d4c0cb6d3d95a990804bd3ee123090ebce155892ddadd2ab4484782219ad0535b3

data/README.md

@@ -158,8 +158,7 @@ end
 *   `:headless` (Boolean) - When false, run the browser visibly
 *   `:debug` (Boolean) - When true, debug output is logged to `STDERR`.
 *   `:logger` (Object responding to `puts`) - When present, debug output is written to this object
-*   `:browser_logger` (`IO` object) - Where the `STDOUT` from Chromium is written to. This is
-    where your `console.log` statements will show up. Default: `STDOUT`
+*   `: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.
 *   `:inspector` (Boolean, String) - See 'Remote Debugging', above.

data/lib/capybara/apparition/browser.rb

@@ -4,6 +4,13 @@ require 'capybara/apparition/errors'
 require 'capybara/apparition/dev_tools_protocol/target_manager'
 require 'capybara/apparition/page'
 require 'capybara/apparition/console'
+require 'capybara/apparition/browser/header'
+require 'capybara/apparition/browser/window'
+require 'capybara/apparition/browser/render'
+require 'capybara/apparition/browser/cookie'
+require 'capybara/apparition/browser/modal'
+require 'capybara/apparition/browser/frame'
+require 'capybara/apparition/browser/auth'
 require 'json'
 require 'time'
 
@@ -23,7 +30,7 @@ module Capybara::Apparition
     def initialize(client, logger = nil)
       @client = client
       @current_page_handle = nil
-      @targets = Capybara::Apparition::DevToolsProtocol::TargetManager.new
+      @targets = Capybara::Apparition::DevToolsProtocol::TargetManager.new(self)
       @context_id = nil
       @js_errors = true
       @ignore_https_errors = false
@@ -38,6 +45,7 @@ module Capybara::Apparition
         puts 'waiting for target...'
         sleep 0.1
       end
+      @context_id = current_target.context_id
     end
 
     def restart
@@ -64,101 +72,43 @@ module Capybara::Apparition
       current_page.click_at(x, y)
     end
 
-    def switch_to_frame(frame)
-      case frame
-      when Capybara::Node::Base
-        current_page.push_frame(frame)
-      when :parent
-        current_page.pop_frame
-      when :top
-        current_page.pop_frame(top: true)
-      end
-    end
-
-    def window_handle
-      @current_page_handle
-    end
-
-    def window_handles
-      @targets.window_handles
-    end
-
-    def switch_to_window(handle)
-      target = @targets.get(handle)
-      raise NoSuchWindowError unless target&.page
+    include Header
+    include Window
+    include Render
+    include Cookie
+    include Modal
+    include Frame
+    include Auth
 
-      target.page.wait_for_loaded
-      @current_page_handle = handle
-    end
-
-    def open_new_window
-      context_id = @context_id || current_target.info['browserContextId']
-      info = command('Target.createTarget', url: 'about:blank', browserContextId: context_id)
-      target_id = info['targetId']
-      target = DevToolsProtocol::Target.new(self, info.merge('type' => 'page', 'inherit' => current_page))
-      target.page # Ensure page object construction happens
-      @targets.add(target_id, target)
-      target_id
-    end
+    def reset
+      current_page_targets = @targets.of_type('page').values
 
-    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?
-      win_target&.close
-    end
+      new_context_id = command('Target.createBrowserContext')['browserContextId']
+      new_target_response = client.send_cmd('Target.createTarget', url: 'about:blank', browserContextId: new_context_id)
 
-    def within_window(locator)
-      original = window_handle
-      handle = find_window_handle(locator)
-      switch_to_window(handle)
-      yield
-    ensure
-      switch_to_window(original)
-    end
-
-    def reset
-      command('Target.disposeBrowserContext', browserContextId: @context_id) if @context_id
+      current_page_targets.each do |target|
+        begin
+          client.send_cmd('Target.disposeBrowserContext', browserContextId: target.context_id).discard_result
+        rescue WrongWorld
+          puts 'Unknown browserContextId'
+        end
+        @targets.delete(target.id)
+      end
 
-      @context_id = command('Target.createBrowserContext')['browserContextId']
-      target_id = command('Target.createTarget', url: 'about:blank', browserContextId: @context_id)['targetId']
+      new_target_id = new_target_response['targetId']
 
-      timer = Capybara::Helpers.timer(expire_in: 5)
-      until @targets.get(target_id)&.page&.usable?
+      timer = Capybara::Helpers.timer(expire_in: 10)
+      until @targets.get(new_target_id)&.page&.usable?
         if timer.expired?
           puts 'Timedout waiting for reset'
-          # byebug
           raise TimeoutError.new('reset')
         end
         sleep 0.01
       end
-      @current_page_handle = target_id
+      @current_page_handle = new_target_id
       true
     end
 
-    def render(path, options = {})
-      check_render_options!(options, path)
-      img_data = current_page.render(options)
-      File.open(path, 'wb') { |f| f.write(Base64.decode64(img_data)) }
-    end
-
-    def render_base64(options = {})
-      check_render_options!(options)
-      current_page.render(options)
-    end
-
-    attr_writer :zoom_factor
-
-    def paper_size=(size)
-      @paper_size = if size.is_a? Hash
-        size
-      else
-        PAPER_SIZES.fetch(size) do
-          raise_errors ArgumentError, "Unknwon paper size: #{size}"
-        end
-      end
-    end
-
     def resize(width, height, screen: nil)
       current_page.set_viewport width: width, height: height, screen: screen
     end
@@ -172,95 +122,6 @@ module Capybara::Apparition
       end
     end
 
-    def headers
-      current_page.extra_headers
-    end
-
-    def headers=(headers)
-      @targets.pages.each do |page|
-        page.perm_headers = headers.dup
-        page.temp_headers = {}
-        page.temp_no_redirect_headers = {}
-        page.update_headers
-      end
-    end
-
-    def add_headers(headers)
-      current_page.perm_headers.merge! headers
-      current_page.update_headers
-    end
-
-    def add_header(header, permanent: true, **_options)
-      if permanent == true
-        @targets.pages.each do |page|
-          page.perm_headers.merge! header
-          page.update_headers
-        end
-      else
-        if permanent.to_s == 'no_redirect'
-          current_page.temp_no_redirect_headers.merge! header
-        else
-          current_page.temp_headers.merge! header
-        end
-        current_page.update_headers
-      end
-    end
-
-    def cookies
-      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)
-      if cookie[:expires]
-        # cookie[:expires] = cookie[:expires].to_i * 1000
-        cookie[:expires] = cookie[:expires].to_i
-      end
-
-      current_page.command('Network.setCookie', cookie)
-    end
-
-    def remove_cookie(name)
-      current_page.command('Network.deleteCookies', name: name, url: current_url)
-    end
-
-    def clear_cookies
-      current_page.command('Network.clearBrowserCookies')
-    end
-
-    def cookies_enabled=(flag)
-      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
-      else
-        { username: user, password: password }
-      end
-    end
-
     attr_accessor :js_errors, :ignore_https_errors
 
     def extensions=(filenames)
@@ -305,30 +166,6 @@ module Capybara::Apparition
       raise
     end
 
-    def accept_alert
-      current_page.add_modal(alert: true)
-    end
-
-    def accept_confirm
-      current_page.add_modal(confirm: true)
-    end
-
-    def dismiss_confirm
-      current_page.add_modal(confirm: false)
-    end
-
-    def accept_prompt(response)
-      current_page.add_modal(prompt: response)
-    end
-
-    def dismiss_prompt
-      current_page.add_modal(prompt: false)
-    end
-
-    def modal_message
-      current_page.modal_messages.shift
-    end
-
     def current_page
       current_target.page
     end
@@ -342,6 +179,7 @@ module Capybara::Apparition
     def current_target
       @targets.get(@current_page_handle) || begin
         puts "No current page: #{@current_page_handle}"
+        puts caller
         @current_page_handle = nil
         raise NoSuchWindowError
       end
@@ -351,98 +189,79 @@ module Capybara::Apparition
       @logger&.puts message if ENV['DEBUG']
     end
 
-    def check_render_options!(options, path = nil)
-      options[:format] ||= File.extname(path).downcase[1..-1] if path
-      options[:format] = :jpeg if options[:format].to_s == 'jpg'
-      options[:full] = !!options[:full]
-      return unless options[:full] && options.key?(:selector)
-
-      warn "Ignoring :selector in #render since :full => true was given at #{caller(1..1)}"
-      options.delete(:selector)
-    end
-
-    def find_window_handle(locator)
-      return locator if window_handles.include? locator
-
-      window_handles.each do |handle|
-        switch_to_window(handle)
-        return handle if evaluate('window.name') == locator
-      end
-      raise NoSuchWindowError
-    end
-
-    KEY_ALIASES = {
-      command: :Meta,
-      equals: :Equal,
-      control: :Control,
-      ctrl: :Control,
-      multiply: 'numpad*',
-      add: 'numpad+',
-      divide: 'numpad/',
-      subtract: 'numpad-',
-      decimal: 'numpad.',
-      left: 'ArrowLeft',
-      right: 'ArrowRight',
-      down: 'ArrowDown',
-      up: 'ArrowUp'
-    }.freeze
-
-    def normalize_keys(keys)
-      keys.map do |key_desc|
-        case key_desc
-        when Array
-          # [:Shift, "s"] => { modifier: "shift", keys: "S" }
-          # [:Shift, "string"] => { modifier: "shift", keys: "STRING" }
-          # [:Ctrl, :Left] => { modifier: "ctrl", key: 'Left' }
-          # [:Ctrl, :Shift, :Left] => { modifier: "ctrl,shift", key: 'Left' }
-          # [:Ctrl, :Left, :Left] => { modifier: "ctrl", key: [:Left, :Left] }
-          keys_chunks = key_desc.chunk do |k|
-            k.is_a?(Symbol) && %w[shift ctrl control alt meta command].include?(k.to_s.downcase)
-          end
-          modifiers = modifiers_from_chunks(keys_chunks)
-          letters = normalize_keys(_keys.next[1].map { |k| k.is_a?(String) ? k.upcase : k })
-          { modifier: modifiers, keys: letters }
-        when Symbol
-          symbol_to_desc(key_desc)
-        when String
-          key_desc # Plain string, nothing to do
-        end
-      end
-    end
-
-    def modifiers_from_chunks(chunks)
-      if chunks.peek[0]
-        chunks.next[1].map do |k|
-          k = k.to_s.downcase
-          k = 'control' if k == 'ctrl'
-          k = 'meta' if k == 'command'
-          k
-        end.join(',')
-      else
-        ''
-      end
-    end
-
-    def symbol_to_desc(symbol)
-      if symbol == :space
-        res = ' '
-      else
-        key = KEY_ALIASES.fetch(symbol.downcase, symbol)
-        if (match = key.to_s.match(/numpad(.)/))
-          res = { keys: match[1], modifier: 'keypad' }
-        elsif !/^[A-Z]/.match?(key)
-          key = key.to_s.split('_').map(&:capitalize).join
-        end
-      end
-      res || { key: key }
-    end
+    # KEY_ALIASES = {
+    #   command: :Meta,
+    #   equals: :Equal,
+    #   control: :Control,
+    #   ctrl: :Control,
+    #   multiply: 'numpad*',
+    #   add: 'numpad+',
+    #   divide: 'numpad/',
+    #   subtract: 'numpad-',
+    #   decimal: 'numpad.',
+    #   left: 'ArrowLeft',
+    #   right: 'ArrowRight',
+    #   down: 'ArrowDown',
+    #   up: 'ArrowUp'
+    # }.freeze
+    #
+    # def normalize_keys(keys)
+    #   keys.map do |key_desc|
+    #     case key_desc
+    #     when Array
+    #       # [:Shift, "s"] => { modifier: "shift", keys: "S" }
+    #       # [:Shift, "string"] => { modifier: "shift", keys: "STRING" }
+    #       # [:Ctrl, :Left] => { modifier: "ctrl", key: 'Left' }
+    #       # [:Ctrl, :Shift, :Left] => { modifier: "ctrl,shift", key: 'Left' }
+    #       # [:Ctrl, :Left, :Left] => { modifier: "ctrl", key: [:Left, :Left] }
+    #       keys_chunks = key_desc.chunk do |k|
+    #         k.is_a?(Symbol) && %w[shift ctrl control alt meta command].include?(k.to_s.downcase)
+    #       end
+    #       modifiers = modifiers_from_chunks(keys_chunks)
+    #       letters = normalize_keys(_keys.next[1].map { |k| k.is_a?(String) ? k.upcase : k })
+    #       { modifier: modifiers, keys: letters }
+    #     when Symbol
+    #       symbol_to_desc(key_desc)
+    #     when String
+    #       key_desc # Plain string, nothing to do
+    #     end
+    #   end
+    # end
+    #
+    # def modifiers_from_chunks(chunks)
+    #   if chunks.peek[0]
+    #     chunks.next[1].map do |k|
+    #       k = k.to_s.downcase
+    #       k = 'control' if k == 'ctrl'
+    #       k = 'meta' if k == 'command'
+    #       k
+    #     end.join(',')
+    #   else
+    #     ''
+    #   end
+    # end
+    #
+    # def symbol_to_desc(symbol)
+    #   if symbol == :space
+    #     res = ' '
+    #   else
+    #     key = KEY_ALIASES.fetch(symbol.downcase, symbol)
+    #     if (match = key.to_s.match(/numpad(.)/))
+    #       res = { keys: match[1], modifier: 'keypad' }
+    #     elsif !/^[A-Z]/.match?(key)
+    #       key = key.to_s.split('_').map(&:capitalize).join
+    #     end
+    #   end
+    #   res || { key: key }
+    # end
 
     def initialize_handlers
       @client.on 'Target.targetCreated' do |info|
         puts "Target Created Info: #{info}" if ENV['DEBUG']
         target_info = info['targetInfo']
         if !@targets.target?(target_info['targetId'])
-          @targets.add(target_info['targetId'], DevToolsProtocol::Target.new(self, target_info))
+          # @targets.add(target_info['targetId'], DevToolsProtocol::Target.new(self, target_info))
+          @targets.add(target_info['targetId'], target_info)
           puts "**** Target Added #{info}" if ENV['DEBUG']
         elsif ENV['DEBUG']
           puts "Target already existed #{info}"
@@ -460,22 +279,12 @@ module Capybara::Apparition
         target_info = info['targetInfo']
         target = @targets.get(target_info['targetId'])
         if target
-          target.info.merge!(target_info)
+          target.update(target_info)
         else
           puts '****No target for the info change- creating****' if ENV['DEBUG']
-          @targets.add(target_info['targetId'], DevToolsProtocol::Target.new(self, target_info))
+          @targets.add(target_info['targetId'], target_info)
         end
       end
     end
-
-    PAPER_SIZES = {
-      'A3' => { width: 11.69, height: 16.53 },
-      'A4' => { width: 8.27, height: 11.69 },
-      'A5' => { width: 5.83, height: 8.27 },
-      'Legal' => { width: 8.5, height: 14 },
-      'Letter' => { width: 8.5, height: 11 },
-      'Tabloid' => { width: 11, height: 17 },
-      'Ledger' => { width: 17, height: 11 }
-    }.freeze
   end
 end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Capybara::Apparition
+  class Browser
+    module Auth
+      def set_proxy_auth(user, password)
+        set_auth(:proxy, user, password)
+      end
+
+      def set_http_auth(user, password)
+        set_auth(:http, user, password)
+      end
+
+    private
+
+      def set_auth(type, user, password)
+        creds = user.nil? && password.nil? ? nil : { username: user, password: password }
+
+        case type
+        when :http
+          current_page.credentials = creds
+        when :proxy
+          @proxy_auth = creds
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'capybara/apparition/cookie_jar'
+
+module Capybara::Apparition
+  class Browser
+    module Cookie
+      def cookies
+        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 do |c|
+          Capybara::Apparition::Cookie.new(c)
+        end
+      end
+
+      def set_cookie(cookie)
+        if cookie[:expires]
+          # cookie[:expires] = cookie[:expires].to_i * 1000
+          cookie[:expires] = cookie[:expires].to_i
+        end
+
+        current_page.command('Network.setCookie', cookie)
+      end
+
+      def remove_cookie(name)
+        current_page.command('Network.deleteCookies', name: name, url: current_url)
+      end
+
+      def clear_cookies
+        current_page.command('Network.clearBrowserCookies')
+      end
+
+      def cookies_enabled=(flag)
+        current_page.command('Emulation.setDocumentCookieDisabled', disabled: !flag)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Capybara::Apparition
+  class Browser
+    module Frame
+      def switch_to_frame(frame)
+        case frame
+        when Capybara::Node::Base
+          current_page.push_frame(frame)
+        when :parent
+          current_page.pop_frame
+        when :top
+          current_page.pop_frame(top: true)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Capybara::Apparition
+  class Browser
+    module Header
+      def headers
+        current_page.extra_headers
+      end
+
+      def headers=(headers)
+        @targets.pages.each do |page|
+          page.perm_headers = headers.dup
+          page.temp_headers = {}
+          page.temp_no_redirect_headers = {}
+          page.update_headers
+        end
+      end
+
+      def add_headers(headers)
+        current_page.perm_headers.merge! headers
+        current_page.update_headers
+      end
+
+      def add_header(header, permanent: true, **_options)
+        if permanent == true
+          @targets.pages.each do |page|
+            page.perm_headers.merge! header
+            page.update_headers
+          end
+        else
+          if permanent.to_s == 'no_redirect'
+            current_page.temp_no_redirect_headers.merge! header
+          else
+            current_page.temp_headers.merge! header
+          end
+          current_page.update_headers
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Capybara::Apparition
+  class Browser
+    module Modal
+      def accept_alert
+        current_page.add_modal(alert: true)
+      end
+
+      def accept_confirm
+        current_page.add_modal(confirm: true)
+      end
+
+      def dismiss_confirm
+        current_page.add_modal(confirm: false)
+      end
+
+      def accept_prompt(response)
+        current_page.add_modal(prompt: response)
+      end
+
+      def dismiss_prompt
+        current_page.add_modal(prompt: false)
+      end
+
+      def modal_message
+        current_page.modal_messages.shift
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Capybara::Apparition
+  class Browser
+    module Render
+      def render(path, options = {})
+        check_render_options!(options, path)
+        img_data = current_page.render(options)
+        File.open(path, 'wb') { |f| f.write(Base64.decode64(img_data)) }
+      end
+
+      def render_base64(options = {})
+        check_render_options!(options)
+        current_page.render(options)
+      end
+
+      attr_writer :zoom_factor
+
+      def paper_size=(size)
+        @paper_size = if size.is_a? Hash
+          size
+        else
+          PAPER_SIZES.fetch(size) do
+            raise_errors ArgumentError, "Unknwon paper size: #{size}"
+          end
+        end
+      end
+
+    private
+
+      def check_render_options!(options, path = nil)
+        options[:format] ||= File.extname(path).downcase[1..-1] if path
+        options[:format] = :jpeg if options[:format].to_s == 'jpg'
+        options[:full] = !!options[:full]
+        return unless options[:full] && options.key?(:selector)
+
+        warn "Ignoring :selector in #render since :full => true was given at #{caller(1..1)}"
+        options.delete(:selector)
+      end
+
+      PAPER_SIZES = {
+        'A3' => { width: 11.69, height: 16.53 },
+        'A4' => { width: 8.27, height: 11.69 },
+        'A5' => { width: 5.83, height: 8.27 },
+        'Legal' => { width: 8.5, height: 14 },
+        'Letter' => { width: 8.5, height: 11 },
+        'Tabloid' => { width: 11, height: 17 },
+        'Ledger' => { width: 17, height: 11 }
+      }.freeze
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Capybara::Apparition
+  class Browser
+    module Window
+      def window_handle
+        @current_page_handle
+      end
+
+      def window_handles
+        @targets.window_handles
+      end
+
+      def switch_to_window(handle)
+        target = @targets.get(handle)
+        raise NoSuchWindowError unless target&.page
+
+        target.page.wait_for_loaded
+        @current_page_handle = handle
+      end
+
+      def open_new_window
+        context_id = current_target.context_id
+        info = command('Target.createTarget', url: 'about:blank', browserContextId: context_id)
+        target_id = info['targetId']
+        target = DevToolsProtocol::Target.new(self, info.merge('type' => 'page', 'inherit' => current_page))
+        target.page # Ensure page object construction happens
+        begin
+          puts "Adding #{target_id} - #{target.info}" if ENV['DEBUG']
+          @targets.add(target_id, target)
+        rescue ArgumentError
+          puts 'Target already existed' if ENV['DEBUG']
+        end
+        target_id
+      end
+
+      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?
+        win_target&.close
+      end
+
+      def within_window(locator)
+        original = window_handle
+        handle = find_window_handle(locator)
+        switch_to_window(handle)
+        yield
+      ensure
+        switch_to_window(original)
+      end
+    end
+
+  private
+
+    def find_window_handle(locator)
+      return locator if window_handles.include? locator
+
+      window_handles.each do |handle|
+        switch_to_window(handle)
+        return handle if evaluate('window.name') == locator
+      end
+      raise NoSuchWindowError
+    end
+  end
+end

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

@@ -5,24 +5,36 @@ require 'capybara/apparition/dev_tools_protocol/session'
 module Capybara::Apparition
   module DevToolsProtocol
     class Target
-      attr_accessor :info
-
       def initialize(browser, info)
         @browser = browser
-        @info = info
+        @info = info.dup
         @page = nil
       end
 
+      def info
+        @info.dup.freeze
+      end
+
+      def update(new_info)
+        @info ||= {}
+        @info.merge!(new_info)
+        info
+      end
+
       def id
-        info['targetId']
+        @info['targetId']
+      end
+
+      def context_id
+        @info['browserContextId']
       end
 
       def title
-        info['title']
+        @info['title']
       end
 
       def url
-        info['url']
+        @info['url']
       end
 
       def page
@@ -30,7 +42,7 @@ module Capybara::Apparition
           if info['type'] == 'page'
             Page.create(@browser, create_session, id,
                         ignore_https_errors: @browser.ignore_https_errors,
-                        js_errors: @browser.js_errors).inherit(info.delete('inherit'))
+                        js_errors: @browser.js_errors).inherit(@info.delete('inherit'))
           else
             nil
           end

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

@@ -5,7 +5,8 @@ require 'capybara/apparition/dev_tools_protocol/target'
 module Capybara::Apparition
   module DevToolsProtocol
     class TargetManager
-      def initialize
+      def initialize(browser)
+        @browser = browser
         @targets = {}
       end
 
@@ -13,8 +14,18 @@ module Capybara::Apparition
         @targets[id]
       end
 
+      def of_type(type)
+        @targets.select { |_id, target| target.info['type'] == type }
+      end
+
       def add(id, target)
-        @targets[id] = target
+        raise ArgumentError, 'Target already exists' if @targets.key?(id)
+
+        @targets[id] = if target.is_a? DevToolsProtocol::Target
+          target
+        else
+          DevToolsProtocol::Target.new(@browser, target)
+        end
       end
 
       def delete(id)

data/lib/capybara/apparition/driver.rb

@@ -135,7 +135,12 @@ module Capybara::Apparition
     end
 
     def reset!
-      browser.reset
+      begin
+        browser.reset
+      rescue TimeoutError
+        puts 'Reset timed out - retrying'
+        browser.reset
+      end
       browser.url_blacklist = options[:url_blacklist] || []
       browser.url_whitelist = options[:url_whitelist] || []
       @started = false

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

@@ -227,6 +227,7 @@ module Capybara::Apparition
         rescue EOFError # rubocop:disable Lint/HandleExceptions
         end
       end
+      # @listener.abort_on_exception = true
     end
   end
 end

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

@@ -26,6 +26,10 @@ module Capybara::Apparition
         nil
       end
 
+      def [](key)
+        result[key]
+      end
+
     private
 
       def handle_error(error)

data/lib/capybara/apparition/node.rb

@@ -101,7 +101,7 @@ module Capybara::Apparition
       evaluate_on GET_STYLES_JS, value: styles
     end
 
-    def set(value, **_options)
+    def set(value, **options)
       if tag_name == 'input'
         case self[:type]
         when 'radio'
@@ -118,13 +118,13 @@ module Capybara::Apparition
         when 'datetime-local'
           set_datetime_local(value)
         else
-          set_text(value.to_s)
+          set_text(value.to_s, delay: options.fetch(:delay, 0))
         end
       elsif tag_name == 'textarea'
         set_text(value.to_s)
       elsif self[:isContentEditable]
         delete_text
-        send_keys(value.to_s)
+        send_keys(value.to_s, delay: options.fetch(:delay, 0))
       end
     end
 
@@ -233,9 +233,9 @@ module Capybara::Apparition
       false
     end
 
-    def send_keys(*keys)
+    def send_keys(*keys, delay: 0, **_opts)
       click unless evaluate_on CURRENT_NODE_SELECTED_JS
-      @page.keyboard.type(keys)
+      @page.keyboard.type(keys, delay: delay)
     end
     alias_method :send_key, :send_keys
 
@@ -410,16 +410,16 @@ module Capybara::Apparition
       DevToolsProtocol::RemoteObject.new(@page, response['result'] || response['object']).value
     end
 
-    def set_text(value, clear: nil, **_unused)
+    def set_text(value, clear: nil, delay: 0, **_unused)
       value = value.to_s
       if value.empty? && clear.nil?
         evaluate_on CLEAR_ELEMENT_JS
       elsif clear == :backspace
         # Clear field by sending the correct number of backspace keys.
         backspaces = [:backspace] * self.value.to_s.length
-        send_keys(*([:end] + backspaces + [value]))
+        send_keys(*([:end] + backspaces + [value]), delay: delay)
       elsif clear.is_a? Array
-        send_keys(*clear, value)
+        send_keys(*clear, value, delay: delay)
       else
         # Clear field by JavaScript assignment of the value property.
         # Script can change a readonly element which user input cannot, so
@@ -429,7 +429,7 @@ module Capybara::Apparition
             arguments[0].value = ''
           }
         JS
-        send_keys(value)
+        send_keys(value, delay: delay)
       end
     end
 
@@ -439,7 +439,11 @@ module Capybara::Apparition
 
     def set_date(value)
       value = SettableValue.new(value)
-      return set_text(value) unless value.dateable?
+      unless value.dateable?
+        # click(x:5, y:10)
+        # debug
+        return set_text(value)
+      end
 
       # TODO: this would be better if locale can be detected and correct keystrokes sent
       update_value_js(value.to_date_str)

data/lib/capybara/apparition/page.rb

@@ -133,11 +133,13 @@ module Capybara::Apparition
 
     def render(options)
       wait_for_loaded
+      pixel_ratio = evaluate('window.devicePixelRatio')
+      scale = (@browser.zoom_factor || 1).to_f / pixel_ratio
       if options[:format].to_s == 'pdf'
         params = {}
         params[:paperWidth] = @browser.paper_size[:width].to_f if @browser.paper_size
         params[:paperHeight] = @browser.paper_size[:height].to_f if @browser.paper_size
-        params[:scale] = @browser.zoom_factor if @browser.zoom_factor
+        params[:scale] = scale
         command('Page.printToPDF', params)
       else
         clip_options = if options[:selector]
@@ -152,8 +154,7 @@ module Capybara::Apparition
             { width: window.innerWidth, height: window.innerHeight }
           JS
         end
-        options[:clip] = { x: 0, y: 0, scale: 1 }.merge(clip_options)
-        options[:clip][:scale] = @browser.zoom_factor || 1
+        options[:clip] = { x: 0, y: 0, scale: scale }.merge(clip_options)
         command('Page.captureScreenshot', options)
       end['data']
     end
@@ -595,6 +596,9 @@ module Capybara::Apparition
       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| k =~ /accept/i })
+        headers[accept] = perm_headers[accept]
+      end
 
       if @url_blacklist.any? { |r| url.match Regexp.escape(r).gsub('\*', '.*?') }
         block_request(interception_id, 'Failed')

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

@@ -10,8 +10,8 @@ module Capybara::Apparition
       @pressed_keys = {}
     end
 
-    def type(keys)
-      type_with_modifiers(Array(keys))
+    def type(keys, delay:)
+      type_with_modifiers(Array(keys), delay: delay)
     end
 
     def press(key)
@@ -66,14 +66,19 @@ module Capybara::Apparition
 
   private
 
-    def type_with_modifiers(keys)
+    def type_with_modifiers(keys, delay:)
       old_pressed_keys, @pressed_keys = @pressed_keys, {}
 
       Array(keys).each do |sequence|
         case sequence
-        when Array then type_with_modifiers(sequence)
-        when String then sequence.each_char { |char| press char }
-        else press sequence
+        when Array then type_with_modifiers(sequence, delay: delay)
+        when String then sequence.each_char do |char|
+          press char
+          sleep delay
+        end
+        else
+          press sequence
+          sleep delay
         end
       end
 

data/lib/capybara/apparition/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Apparition
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apparition
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Thomas Walpole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
@@ -224,6 +224,13 @@ files:
 - README.md
 - lib/capybara/apparition.rb
 - lib/capybara/apparition/browser.rb
+- lib/capybara/apparition/browser/auth.rb
+- lib/capybara/apparition/browser/cookie.rb
+- lib/capybara/apparition/browser/frame.rb
+- lib/capybara/apparition/browser/header.rb
+- lib/capybara/apparition/browser/modal.rb
+- lib/capybara/apparition/browser/render.rb
+- lib/capybara/apparition/browser/window.rb
 - lib/capybara/apparition/console.rb
 - lib/capybara/apparition/cookie.rb
 - lib/capybara/apparition/cookie_jar.rb