apparition 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 138fab423026ba9b7e93b02a3dbbd4a4e438dfbf8bcf48500126dc9251dabd0d
-  data.tar.gz: af667994c4bf65674368b6e1e0a7e0a7d29ba4adf2a2d161eeb8dd1b16d98a45
+  metadata.gz: f5675a80f435049166cf933b540e00b5569b0f516099597cdc071cc4c7767ff0
+  data.tar.gz: 8a63bf45f5376a4eb0a65954bd3863062f1aea67b030cb3ee2b96c7cfe1d108d
 SHA512:
-  metadata.gz: 0e1f58fcdf5b3942bb219462ffd72e9f961747c0334c9fad0103e79cd0ff0dc3318a6c80988f5be0f045a1fc40d7c2695630b458ab79328accc0a3d17996a400
-  data.tar.gz: 4470dcb096886417f7d4b7ddcd0842f5be59d6a574173b3cda69c0878ad27047b9927696b4e7939579fadc90bbddcee6137fa6b91871f1ad7b2c746e3ba73c20
+  metadata.gz: 7d0b64f71ec2e0a026bc5f0cea02588e550a5e27768b5368041bfbbd206e758654900cf22c35620d88f0618a76a12b874120513ae3d606e8ee481a5021bf3297
+  data.tar.gz: b279c8871baedd04acf1e717fddbf2898ae9796e0c1152fd17c0ccc160deaa10cb0cc86243037448883e10da3a90844351c60e097e0b6b5aebb8e87b0e796f65

data/lib/capybara/apparition.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'backports/2.4.0/enumerable/sum'
-require 'backports/2.4.0/string/match'
 require 'capybara'
 
 module Capybara

data/lib/capybara/apparition/browser.rb

@@ -9,6 +9,7 @@ require 'capybara/apparition/browser/window'
 require 'capybara/apparition/browser/render'
 require 'capybara/apparition/browser/cookie'
 require 'capybara/apparition/browser/modal'
+require 'capybara/apparition/browser/page_manager'
 require 'capybara/apparition/browser/frame'
 require 'capybara/apparition/browser/auth'
 require 'json'
@@ -30,7 +31,7 @@ module Capybara::Apparition
     def initialize(client, logger = nil)
       @client = client
       @current_page_handle = nil
-      @pages = {}
+      @pages = PageManager.new(self)
       @context_id = nil
       @js_errors = true
       @ignore_https_errors = false
@@ -46,7 +47,7 @@ module Capybara::Apparition
     end
 
     def restart
-      puts 'handle client restart'
+      # puts 'handle client restart'
       # client.restart
 
       self.debug = @debug if defined?(@debug)
@@ -79,35 +80,26 @@ module Capybara::Apparition
 
     def reset
       new_context_id = command('Target.createBrowserContext')['browserContextId']
-      # current_pages = @pages.keys
-
       new_target_response = client.send_cmd('Target.createTarget', url: 'about:blank', browserContextId: new_context_id)
-      @pages.each do |id, page|
-        begin
-          client.send_cmd('Target.disposeBrowserContext', browserContextId: page.browser_context_id).discard_result
-        rescue WrongWorld
-          puts 'Unknown browserContextId'
-        end
-        @pages.delete(id)
-      end
+
+      @pages.reset
 
       new_target_id = new_target_response['targetId']
 
       session_id = command('Target.attachToTarget', targetId: new_target_id)['sessionId']
       session = Capybara::Apparition::DevToolsProtocol::Session.new(self, client, session_id)
 
-      @pages[new_target_id] = Page.create(self, session, new_target_id, new_context_id,
-                                          ignore_https_errors: ignore_https_errors,
-                                          js_errors: js_errors, extensions: @extensions,
-                                          url_blacklist: @url_blacklist,
-                                          url_whitelist: @url_whitelist) # .inherit(@info.delete('inherit'))
-      @pages[new_target_id].send(:main_frame).loaded!
+      @pages.create(new_target_id, session, new_context_id,
+                    ignore_https_errors: ignore_https_errors,
+                    js_errors: js_errors, extensions: @extensions,
+                    url_blacklist: @url_blacklist,
+                    url_whitelist: @url_whitelist) .send(:main_frame).loaded!
 
       timer = Capybara::Helpers.timer(expire_in: 10)
       until @pages[new_target_id].usable?
         if timer.expired?
           puts 'Timedout waiting for reset'
-          raise TimeoutError.new('reset')
+          raise TimeoutError, 'reset'
         end
         sleep 0.01
       end
@@ -117,42 +109,11 @@ module Capybara::Apparition
     end
 
     def refresh_pages(opener:)
-      new_pages = command('Target.getTargets')['targetInfos'].select do |ti|
-        (ti['openerId'] == opener.target_id) && (ti['type'] == 'page') && (ti['attached'] == false)
-      end
-      sessions = new_pages.map do |page|
-        target_id = page['targetId']
-        session_result = client.send_cmd('Target.attachToTarget', targetId: target_id)
-        [target_id, session_result]
-      end
-
-      sessions = sessions.map do |(target_id, session_result)|
-        session = Capybara::Apparition::DevToolsProtocol::Session.new(self, client, session_result.result['sessionId'])
-        [target_id, session]
-      end
-
-      sessions.each do |(_target_id, session)|
-        session.async_commands 'Page.enable', 'Network.enable', 'Runtime.enable', 'Security.enable', 'DOM.enable'
-      end
-
-      # sessions.each do |(target_id, session_result)|
-      #   session = Capybara::Apparition::DevToolsProtocol::Session.new(self, client, session_result.result['sessionId'])
-      sessions.each do |(target_id, session)|
-        page_options = { ignore_https_errors: ignore_https_errors, js_errors: js_errors,
-                         url_blacklist: @url_blacklist, url_whitelist: @url_whitelist }
-        new_page = Page.create(self, session, target_id, opener.browser_context_id, page_options).inherit(opener)
-        @pages[target_id] = new_page
-      end
-
-      # new_pages.each do |page|
-      #   target_id = page['targetId']
-      #   session_id = command('Target.attachToTarget', targetId: target_id)['sessionId']
-      #   session = Capybara::Apparition::DevToolsProtocol::Session.new(self, client, session_id)
-      #   page_options = { ignore_https_errors: ignore_https_errors, js_errors: js_errors,
-      #                  url_blacklist: @url_blacklist, url_whitelist: @url_whitelist }
-      #   new_page = Page.create(self, session, page['targetId'], opener.browser_context_id, page_options).inherit(opener)
-      #   @pages[target_id] = new_page
-      # end
+      @pages.refresh(opener: opener,
+                     ignore_https_errors: ignore_https_errors,
+                     js_errors: js_errors,
+                     url_blacklist: @url_blacklist,
+                     url_whitelist: @url_whitelist)
     end
 
     def resize(width, height, screen: nil)
@@ -178,17 +139,11 @@ module Capybara::Apparition
     end
 
     def url_whitelist=(whitelist)
-      @url_whitelist = whitelist
-      @pages.each do |_id, page|
-        page.url_whitelist = whitelist
-      end
+      @url_whitelist = @pages.whitelist = whitelist
     end
 
     def url_blacklist=(blacklist)
-      @url_blacklist = blacklist
-      @pages.each do |_id, page|
-        page.url_blacklist = blacklist
-      end
+      @url_blacklist = @pages.blacklist = blacklist
     end
 
     attr_writer :debug
@@ -234,72 +189,6 @@ module Capybara::Apparition
       @logger&.puts message if ENV['DEBUG']
     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|
       #   byebug

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

@@ -6,18 +6,9 @@ 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
-        )
+        CookieJar.new(self)
       end
+      alias :all_cookies :cookies
 
       def get_raw_cookies
         current_page.command('Network.getAllCookies')['cookies'].map do |c|
@@ -26,10 +17,7 @@ module Capybara::Apparition
       end
 
       def set_cookie(cookie)
-        if cookie[:expires]
-          # cookie[:expires] = cookie[:expires].to_i * 1000
-          cookie[:expires] = cookie[:expires].to_i
-        end
+        cookie[:expires] = cookie[:expires].to_i if cookie[:expires]
 
         current_page.command('Network.setCookie', cookie)
       end

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

@@ -8,7 +8,7 @@ module Capybara::Apparition
       end
 
       def headers=(headers)
-        @pages.each do |_id, page|
+        @pages.each do |page|
           page.perm_headers = headers.dup
           page.temp_headers = {}
           page.temp_no_redirect_headers = {}
@@ -23,7 +23,7 @@ module Capybara::Apparition
 
       def add_header(header, permanent: true, **_options)
         if permanent == true
-          @pages.each do |_id, page|
+          @pages.each do |page|
             page.perm_headers.merge! header
             page.update_headers
           end

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

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Capybara::Apparition
+  class Browser
+    class PageManager
+      def initialize(browser)
+        @browser = browser
+        @pages = {}
+      end
+
+      def ids
+        @pages.keys
+      end
+
+      def [](id)
+        @pages[id]
+      end
+
+      def each(&block)
+        @pages.each_value(&block)
+      end
+
+      def reset
+        @pages.each do |id, page|
+          begin
+            @browser.client.send_cmd(
+              'Target.disposeBrowserContext',
+              browserContextId: page.browser_context_id
+            ).discard_result
+          rescue WrongWorld
+            puts 'Unknown browserContextId'
+          end
+          @pages.delete(id)
+        end
+      end
+
+      def create(id, session, ctx_id, **options)
+        @pages[id] = Page.create(@browser, session, id, ctx_id, **options)
+      end
+
+      def delete(id)
+        @pages.delete(id)
+      end
+
+      def refresh(opener:, **page_options)
+        new_pages = @browser.command('Target.getTargets')['targetInfos'].select do |ti|
+          (ti['openerId'] == opener.target_id) && (ti['type'] == 'page') && (ti['attached'] == false)
+        end
+
+        sessions = new_pages.map do |page|
+          target_id = page['targetId']
+          session_result = @browser.client.send_cmd('Target.attachToTarget', targetId: target_id)
+          [target_id, session_result]
+        end
+
+        sessions = sessions.map do |(target_id, session_result)|
+          session = Capybara::Apparition::DevToolsProtocol::Session.new(
+            @browser,
+            @browser.client,
+            session_result.result['sessionId']
+          )
+          [target_id, session]
+        end
+
+        sessions.each do |(_id, session)|
+          session.async_commands 'Page.enable', 'Network.enable', 'Runtime.enable', 'Security.enable', 'DOM.enable'
+        end
+
+        sessions.each do |(target_id, session)|
+          new_page = Page.create(@browser, session, target_id, opener.browser_context_id, page_options).inherit(opener)
+          @pages[target_id] = new_page
+        end
+      end
+
+      def whitelist=(list)
+        @pages.each_value { |page| page.url_whitelist = list }
+      end
+
+      def blacklist=(list)
+        @pages.each_value { |page| page.url_blacklist = list }
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Capybara::Apparition
       end
 
       def window_handles
-        @pages.keys
+        @pages.ids
       end
 
       def switch_to_window(handle)
@@ -29,12 +29,12 @@ module Capybara::Apparition
         target_id = command('Target.createTarget', url: 'about:blank', browserContextId: context_id)['targetId']
         session_id = command('Target.attachToTarget', targetId: target_id)['sessionId']
         session = Capybara::Apparition::DevToolsProtocol::Session.new(self, client, session_id)
-        @pages[target_id] = Page.create(self, session, target_id, context_id,
-                                        ignore_https_errors: ignore_https_errors,
-                                        js_errors: js_errors,
-                                        url_whitelist: @url_whitelist,
-                                        extensions: @extensions,
-                                        url_blacklist: @url_blacklist).inherit(current_page(allow_nil: true))
+        @pages.create(target_id, session, context_id,
+                      ignore_https_errors: ignore_https_errors,
+                      js_errors: js_errors,
+                      url_whitelist: @url_whitelist,
+                      extensions: @extensions,
+                      url_blacklist: @url_blacklist).inherit(current_page(allow_nil: true))
         @pages[target_id].send(:main_frame).loaded!
         target_id
       end

data/lib/capybara/apparition/driver.rb

@@ -100,7 +100,9 @@ module Capybara::Apparition
     end
 
     def find(method, selector)
-      browser.find(method, selector).map { |page_id, id| Capybara::Apparition::Node.new(self, page_id, id) }
+      browser.find(method, selector).map do |page_id, id, attrs|
+        Capybara::Apparition::Node.new(self, page_id, id, attrs)
+      end
     end
 
     def find_xpath(selector)
@@ -521,7 +523,8 @@ module Capybara::Apparition
         object_cache[arg]
       when Hash
         if (arg['subtype'] == 'node') && arg['objectId']
-          Capybara::Apparition::Node.new(self, browser.current_page, arg['objectId'])
+          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] = {}
           arg.each { |k, v| object_cache[arg][k] = unwrap_script_result(v, object_cache) }

data/lib/capybara/apparition/node.rb

@@ -11,8 +11,8 @@ module Capybara::Apparition
 
     attr_reader :page_id
 
-    def initialize(driver, page, remote_object)
-      super(driver, self)
+    def initialize(driver, page, remote_object, initial_cache)
+      super(driver, self, initial_cache)
       @page = page
       @remote_object = remote_object
     end
@@ -30,7 +30,8 @@ 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|
-        Capybara::Apparition::Node.new(driver, @page, r_o['objectId'])
+        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
       raise unless /is not a valid (XPath expression|selector)/.match? e.name
@@ -165,8 +166,19 @@ module Capybara::Apparition
       evaluate_on VISIBLE_JS
     end
 
-    def obscured?(x: nil, y: nil)
-      evaluate_on(OBSCURED_JS) == true
+    def obscured?(**)
+      pos = visible_center(allow_scroll: false)
+      return true if pos.nil?
+
+      hit_node = @page.element_from_point(pos)
+      return true if hit_node.nil?
+
+      begin
+        return evaluate_on('el => !this.contains(el)', objectId: hit_node['objectId'])
+      rescue WrongWorld # rubocop:disable Lint/HandleExceptions
+      end
+
+      true
     end
 
     def checked?
@@ -256,9 +268,9 @@ module Capybara::Apparition
       false
     end
 
-    def send_keys(*keys, delay: 0, **_opts)
+    def send_keys(*keys, delay: 0, **opts)
       click unless evaluate_on CURRENT_NODE_SELECTED_JS
-      @page.keyboard.type(keys, delay: delay)
+      _send_keys(*keys, delay: delay, **opts)
     end
     alias_method :send_key, :send_keys
 
@@ -311,8 +323,8 @@ module Capybara::Apparition
       end
     end
 
-    def visible_center
-      rect = in_view_bounding_rect
+    def visible_center(allow_scroll: true)
+      rect = in_view_bounding_rect(allow_scroll: allow_scroll)
       return nil if rect.nil?
 
       frame_offset = @page.current_frame_offset
@@ -405,8 +417,38 @@ module Capybara::Apparition
 
   private
 
-    def in_view_bounding_rect
-      evaluate_on('() => this.scrollIntoViewIfNeeded()')
+    def focus
+      @page.command('DOM.focus', objectId: id)
+    end
+
+    def keys_to_send(value, clear)
+      case clear
+      when :backspace
+        # Clear field by sending the correct number of backspace keys.
+        [:end] + ([:backspace] * self.value.to_s.length) + [value]
+      when :none
+        [value]
+      when Array
+        clear << value
+      else
+        # Clear field by JavaScript assignment of the value property.
+        # Script can change a readonly element which user input cannot, so
+        # don't execute if readonly.
+        driver.execute_script <<~JS, self
+          if (!arguments[0].readOnly) {
+            arguments[0].value = ''
+          }
+        JS
+        [value]
+      end
+    end
+
+    def _send_keys(*keys, delay: 0, **_opts)
+      @page.keyboard.type(keys, delay: delay)
+    end
+
+    def in_view_bounding_rect(allow_scroll: true)
+      evaluate_on('() => this.scrollIntoViewIfNeeded()') if allow_scroll
       result = evaluate_on GET_BOUNDING_CLIENT_RECT_JS
       result = result['model'] if result && result['model']
       result
@@ -437,22 +479,9 @@ module Capybara::Apparition
       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]), delay: delay)
-      elsif clear.is_a? Array
-        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
-        # don't execute if readonly.
-        driver.execute_script <<~JS, self unless clear == :none
-          if (!arguments[0].readOnly) {
-            arguments[0].value = ''
-          }
-        JS
-        send_keys(value, delay: delay)
+        focus
+        _send_keys(*keys_to_send(value, clear), delay: delay)
       end
     end
 
@@ -511,7 +540,8 @@ module Capybara::Apparition
       r_o = @page.element_from_point(x: x, y: y)
       return nil unless r_o && r_o['objectId']
 
-      hit_node = Capybara::Apparition::Node.new(driver, @page, r_o['objectId'])
+      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)
           (hit_node) => {
@@ -681,11 +711,14 @@ module Capybara::Apparition
           sel = sel.parentNode;
         }
         let event_options = { bubbles: true, cancelable: true };
+        sel.dispatchEvent(new MouseEvent('mousedown', event_options));
         sel.dispatchEvent(new FocusEvent('focus', event_options));
-
-        this.selected = true
-
-        sel.dispatchEvent(new Event('change', event_options));
+        if (this.selected == false){
+          this.selected = true;
+          sel.dispatchEvent(new Event('change', event_options));
+        }
+        sel.dispatchEvent(new MouseEvent('mouseup', event_options));
+        sel.dispatchEvent(new MouseEvent('click', event_options));
         sel.dispatchEvent(new FocusEvent('blur', event_options));
       }
     JS
@@ -733,24 +766,6 @@ module Capybara::Apparition
       }
     JS
 
-    OBSCURED_JS = <<~JS
-      function(x, y) {
-        var box = this.getBoundingClientRect();
-        if (x == null) x = box.width/2;
-        if (y == null) y = box.height/2 ;
-
-        var px = box.left + x,
-            py = box.top + y,
-            e = document.elementFromPoint(px, py);
-
-        if (!this.contains(e))
-          return true;
-
-        return { x: px, y: py };
-      }
-    JS
-
-
     DELETE_TEXT_JS = <<~JS
       function(){
         range = document.createRange();

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

@@ -42,16 +42,17 @@ module Capybara::Apparition
     def drop(*args)
       if args[0].is_a? String
         input = evaluate_on ATTACH_FILE
-        input = Capybara::Apparition::Node.new(driver, @page, input['objectId'])
+        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 }
+        evaluate_on DROP_FILE, objectId: input.id
       else
         items = args.each_with_object([]) do |arg, arr|
           arg.each_with_object(arr) do |(type, data), arr_|
             arr_ << { type: type, data: data }
           end
         end
-        evaluate_on DROP_STRING, { value: items }
+        evaluate_on DROP_STRING, value: items
       end
     end
 
@@ -103,7 +104,6 @@ module Capybara::Apparition
       }
     JS
 
-
   private
 
     def html5_drag_to(element)

data/lib/capybara/apparition/page.rb

@@ -145,10 +145,11 @@ module Capybara::Apparition
       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] = scale
+        params = { scale: scale }
+        if @browser.paper_size
+          params[:paperWidth] = @browser.paper_size[:width].to_f
+          params[:paperHeight] = @browser.paper_size[:height].to_f
+        end
         command('Page.printToPDF', params)
       else
         clip_options = if options[:selector]
@@ -173,15 +174,14 @@ module Capybara::Apparition
       frame_id = node['node']['frameId']
 
       timer = Capybara::Helpers.timer(expire_in: 10)
-      while (frame = @frames.get(frame_id)).nil? || frame.loading?
+      while (frame = @frames[frame_id]).nil? || frame.loading?
         # Wait for the frame creation messages to be processed
         if timer.expired?
-          puts 'Timed out waiting from frame to be ready'
+          puts 'Timed out waiting for frame to be ready'
           raise TimeoutError.new('push_frame')
         end
         sleep 0.1
       end
-      return unless frame
 
       frame.element_id = frame_el.base.id
       @frames.push_frame(frame.id)
@@ -196,8 +196,8 @@ module Capybara::Apparition
       wait_for_loaded
       js_escaped_selector = selector.gsub('\\', '\\\\\\').gsub('"', '\"')
       query = method == :css ? CSS_FIND_JS : XPATH_FIND_JS
-      result = _raw_evaluate(query % js_escaped_selector)
-      (result || []).map { |r_o| [self, r_o['objectId']] }
+      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]] }
     rescue ::Capybara::Apparition::BrowserError => e
       raise unless /is not a valid (XPath expression|selector)/.match? e.name
 
@@ -241,15 +241,29 @@ module Capybara::Apparition
     attr_reader :status_code
 
     def wait_for_loaded(allow_obsolete: false)
+      # We can't reliably detect if the page is loaded, so just ensure the context
+      # is usable
       timer = Capybara::Helpers.timer(expire_in: 30)
-      cf = current_frame
-      until cf.usable? || (allow_obsolete && cf.obsolete?) || @js_error
-        if timer.expired?
-          puts 'Timedout waiting for page to be loaded'
-          raise TimeoutError.new('wait_for_loaded')
+      page_function = '(function(){ return 1 == 1; })()'
+      begin
+        response = command('Runtime.evaluate',
+                           expression: page_function,
+                           contextId: current_frame.context_id,
+                           returnByValue: false,
+                           awaitPromise: true)
+        process_response(response)
+        current_frame.loaded!
+      rescue # rubocop:disable Style/RescueStandardError
+        return if allow_obsolete && current_frame.obsolete?
+
+        unless timer.expired?
+          sleep 0.05
+          retry
         end
-        sleep 0.05
+        puts 'Timedout waiting for page to be loaded' if ENV['DEBUG']
+        raise TimeoutError.new('wait_for_loaded')
       end
+
       raise JavascriptError.new(js_error) if @js_error
     end
 
@@ -702,8 +716,8 @@ module Capybara::Apparition
     def process_response(response)
       return nil if response.nil?
 
-      exception_details = response['exceptionDetails']
-      if (exception = exception_details&.dig('exception'))
+      exception = response['exceptionDetails']&.dig('exception')
+      if exception
         case exception['className']
         when 'DOMException'
           raise ::Capybara::Apparition::BrowserError.new('name' => exception['description'], 'args' => nil)
@@ -798,12 +812,12 @@ module Capybara::Apparition
     JS
 
     CSS_FIND_JS = <<~JS
-      Array.from(document.querySelectorAll("%s"));
+      Array.from(document.querySelectorAll("%<selector>s"));
     JS
 
     XPATH_FIND_JS = <<~JS
       (function(){
-        const xpath = document.evaluate("%s", document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+        const xpath = document.evaluate("%<selector>s", document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
         let results = [];
         for (let i=0; i < xpath.snapshotLength; i++){
           results.push(xpath.snapshotItem(i))

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

@@ -43,6 +43,7 @@ module Capybara::Apparition
         @frames[id]
       end
     end
+    alias :[] :get
 
     def delete(id)
       @frames_mutex.synchronize do

data/lib/capybara/apparition/version.rb

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

metadata

@@ -1,36 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: apparition
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Thomas Walpole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -40,7 +26,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -184,6 +170,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: rubocop-performance
+  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: rubocop-rspec
+  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: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +257,7 @@ files:
 - lib/capybara/apparition/browser/frame.rb
 - lib/capybara/apparition/browser/header.rb
 - lib/capybara/apparition/browser/modal.rb
+- lib/capybara/apparition/browser/page_manager.rb
 - lib/capybara/apparition/browser/render.rb
 - lib/capybara/apparition/browser/window.rb
 - lib/capybara/apparition/configuration.rb