apparition 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e8fee05c8a55aecbed96ec2f5f1c7d36ffdea00488281be36fe4e6ac85ab9a4
-  data.tar.gz: 781e519f382127f2dfd6be4bda8a0b674d185bfdc8d1072962c5136cae773a1c
+  metadata.gz: e4f76aefa6b5bebbab16d325e6f434846c2a426b74df9b8c0248465653124202
+  data.tar.gz: e9538e39a9c912471527fc456e801f0b3cc261bf042ddc82177d0e74e0769a33
 SHA512:
-  metadata.gz: 96e43542fe127e373cb1f5167c4023922e4a0428b11fa11c13797e1dec0f304fad8ae6422e1c887891317d064905a1a54174c4696d989ad2741a18e6c278e901
-  data.tar.gz: 2667120038d46b9fc874f8009c9820fc6fee86e6a02e753ffcbd16c60398928bb1f1b8ad2cdbf2640d883de94920e2d569e6e127b433866c39809cc712cb34bd
+  metadata.gz: 9f187d2d4b1185e2fe5460adf9435daec58d008789e69bca907df06bdc20f59b1b8808ac4f346ef1c7d00d4caa62a6fe7aaf033a9e3287299a007e8c9c7493fb
+  data.tar.gz: 443d5076e6b92f8c051a261663a8dc93a3ae2b0a75d87943579b762927b0f8d4e42a527b3c047c4ae937bf001198f7e14ebd8f4ea77de7ffd1ec04d4e096ad65

data/lib/capybara/apparition/browser.rb

@@ -133,7 +133,9 @@ module Capybara::Apparition
 
     def close_window(handle)
       @current_page_handle = nil if @current_page_handle == handle
-      @targets.delete(handle).close
+      win_target = @targets.delete(handle)
+      warn "Window was already closed unexpectedly" if win_target.nil?
+      win_target&.close
     end
 
     def within_window(locator)

data/lib/capybara/apparition/driver.rb

@@ -286,7 +286,7 @@ module Capybara::Apparition
     end
 
     def invalid_element_errors
-      [Capybara::Apparition::ObsoleteNode, Capybara::Apparition::MouseEventFailed]
+      [Capybara::Apparition::ObsoleteNode, Capybara::Apparition::MouseEventFailed, Capybara::Apparition::WrongWorld]
     end
 
     def accept_modal(type, options = {})

data/lib/capybara/apparition/errors.rb

@@ -172,6 +172,7 @@ module Capybara
           'It may be overlapping the element you are trying to interact with. '
       end
     end
+    ClickFailed = MouseEventFailed
 
     class MouseEventImpossible < MouseEventFailed
       def name

data/lib/capybara/apparition/inspector.rb

@@ -7,7 +7,7 @@ module Capybara::Apparition
     DEFAULT_PORT = 9664
 
     def self.detect_browser
-      @browser ||= BROWSERS.find { |name| browser_binary_exists?(name) }
+      @browser ||= BROWSERS.find { |name| browser_binary_exists?(name) } # rubocop:disable Naming/MemoizedInstanceVariableName
     end
 
     attr_reader :port

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

@@ -44,7 +44,7 @@ module Capybara::Apparition
     def html5_drag_to(element)
       driver.execute_script MOUSEDOWN_TRACKER
       scroll_if_needed
-      @page.mouse.move_to(element.visible_center).down
+      @page.mouse.move_to(visible_center).down
       if driver.evaluate_script('window.capybara_mousedown_prevented')
         element.scroll_if_needed
         @page.mouse.move_to(element.visible_center).up

data/lib/capybara/apparition/node.rb

@@ -79,16 +79,7 @@ module Capybara::Apparition
     def [](name)
       # Although the attribute matters, the property is consistent. Return that in
       # preference to the attribute for links and images.
-      return evaluate_on ELEMENT_PROP_OR_ATTR_JS, value: name
-      # if ((tag_name == 'img') && (name == 'src')) || ((tag_name == 'a') && (name == 'href'))
-      #   # if attribute exists get the property
-      #   return attribute(name) && property(name)
-      # end
-      #
-      # value = property(name)
-      # value = attribute(name) if value.nil? || value.is_a?(Hash)
-      #
-      # value
+      evaluate_on ELEMENT_PROP_OR_ATTR_JS, value: name
     end
 
     def attributes
@@ -165,6 +156,7 @@ module Capybara::Apparition
       raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['click']) if pos.nil?
 
       test = mouse_event_test(pos)
+      raise ::Capybara::Apparition::MouseEventImpossible.new(self, 'args' => ['click']) if test.nil?
       raise ::Capybara::Apparition::MouseEventFailed.new(self, 'args' => ['click', test.selector, pos]) unless test.success
 
       @page.mouse.click_at pos.merge(button: button, count: count, modifiers: keys)
@@ -248,7 +240,9 @@ module Capybara::Apparition
 
       frame_offset = @page.current_frame_offset
 
-      if (rect['width'].zero? || rect['height'].zero?) && (tag_name == 'area')
+      if rect['width'].zero? || rect['height'].zero?
+        return nil unless tag_name == 'area'
+
         map = find('xpath', 'ancestor::map').first
         img = find('xpath', "//img[@usemap='##{map[:name]}']").first
         return nil unless img.visible?
@@ -280,7 +274,9 @@ module Capybara::Apparition
 
       frame_offset = @page.current_frame_offset
 
-      if (rect['width'].zero? || rect['height'].zero?) && (tag_name == 'area')
+      if rect['width'].zero? || rect['height'].zero?
+        return nil unless tag_name == 'area'
+
         map = find('xpath', 'ancestor::map').first
         img = find('xpath', "//img[@usemap='##{map[:name]}']").first
         return nil unless img.visible?
@@ -489,37 +485,54 @@ module Capybara::Apparition
     end
 
     def mouse_event_test(x:, y:)
-      frame_offset = @page.current_frame_offset
-      # return { status: 'failure' } if x < 0 || y < 0
-      result = evaluate_on(<<~JS, { value: x - frame_offset[:x] }, value: y - frame_offset[:y])
-        function(x,y){
-          const hit_node = document.elementFromPoint(x,y);
-          if ((hit_node == this) || this.contains(hit_node))
-            return { status: 'success' };
-
-          const getSelector = function(element){
-            if (element == null)
-              return 'Element out of bounds';
-
-            let selector = '';
-            if (element.tagName != 'HTML')
-              selector = getSelector(element.parentNode) + ' ';
-            selector += element.tagName.toLowerCase();
-            if (element.id)
-              selector += `#${element.id}`;
-
-            for (let className of element.classList){
-              if (className != '')
-                selector += `.${className}`;
-            }
-            return selector;
+      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'])
+      result = begin
+        evaluate_on(<<~JS, objectId: hit_node.id)
+          function(hit_node){
+            if ((hit_node == this) || this.contains(hit_node))
+              return { status: 'success' };
+            return { status: 'failure' };
           }
-
-          return { status: 'failure', selector: getSelector(hit_node) };
-        }
-      JS
-
-      OpenStruct.new(success: result['status'] == 'success', selector: result['selector'])
+        JS
+               rescue WrongWorld
+                 { 'status': 'failure' }
+      end
+      OpenStruct.new(success: result['status'] == 'success', selector: r_o['description'])
+
+      # frame_offset = @page.current_frame_offset
+      # # return { status: 'failure' } if x < 0 || y < 0
+      # result = evaluate_on(<<~JS, { value: x - frame_offset[:x] }, value: y - frame_offset[:y])
+      #   function(x,y){
+      #     const hit_node = document.elementFromPoint(x,y);
+      #     if ((hit_node == this) || this.contains(hit_node))
+      #       return { status: 'success' };
+      #
+      #     const getSelector = function(element){
+      #       if (element == null)
+      #         return 'Element out of bounds';
+      #
+      #       let selector = '';
+      #       if (element.tagName != 'HTML')
+      #         selector = getSelector(element.parentNode) + ' ';
+      #       selector += element.tagName.toLowerCase();
+      #       if (element.id)
+      #         selector += `#${element.id}`;
+      #
+      #       for (let className of element.classList){
+      #         if (className != '')
+      #           selector += `.${className}`;
+      #       }
+      #       return selector;
+      #     }
+      #
+      #     return { status: 'failure', selector: getSelector(hit_node) };
+      #   }
+      # JS
+      #
+      # OpenStruct.new(success: result['status'] == 'success', selector: result['selector'])
     end
 
     def scroll_element_to_location(element, location)
@@ -615,7 +628,7 @@ module Capybara::Apparition
       properties.each_with_object({}) do |property, object|
         if property['enumerable']
           object[property['name']] = property['value']['value']
-        else
+        else # rubocop:disable Style/EmptyElse
           #     releasePromises.push(helper.releaseObject(@element._client, property.value))
         end
         # releasePromises = [helper.releaseObject(@element._client, remote_object)]
@@ -749,11 +762,13 @@ module Capybara::Apparition
            return false;
           }
         }
-
+        var forced_visible = false;
         while (el) {
           const style = window.getComputedStyle(el);
+          if (style.visibility == 'visible')
+            forced_visible = true;
           if ((style.display == 'none') ||
-              (style.visibility == 'hidden') ||
+              ((style.visibility == 'hidden') && !forced_visible) ||
               (parseFloat(style.opacity) == 0)) {
             return false;
           }

data/lib/capybara/apparition/page.rb

@@ -43,7 +43,7 @@ module Capybara::Apparition
       @modal_messages = []
       @frames = Capybara::Apparition::FrameManager.new(id)
       @response_headers = {}
-      @status_code = nil
+      @status_code = 0
       @url_blacklist = []
       @url_whitelist = []
       @auth_attempts = []
@@ -68,7 +68,7 @@ module Capybara::Apparition
       @modals.clear
       @modal_messages.clear
       @response_headers = {}
-      @status_code = nil
+      @status_code = 0
       @auth_attempts = []
       @perm_headers = {}
     end
@@ -112,11 +112,7 @@ module Capybara::Apparition
     end
 
     def current_frame_offset
-      return { x: 0, y: 0 } if current_frame.id == main_frame.id
-
-      result = command('DOM.getBoxModel', objectId: current_frame.element_id)
-      x, y = result['model']['content']
-      { x: x, y: y }
+      frame_offset(current_frame)
     end
 
     def render(options)
@@ -233,7 +229,6 @@ module Capybara::Apparition
       until cf.usable? || (allow_obsolete && cf.obsolete?) || @js_error
         if timer.expired?
           puts 'Timedout waiting for page to be loaded'
-          # byebug
           raise TimeoutError.new('wait_for_loaded')
         end
         sleep 0.05
@@ -255,7 +250,7 @@ module Capybara::Apparition
 
     def visit(url)
       wait_for_loaded
-      @status_code = nil
+      @status_code = 0
       navigate_opts = { url: url, transitionType: 'reload' }
       navigate_opts[:referrer] = extra_headers['Referer'] if extra_headers['Referer']
       response = command('Page.navigate', navigate_opts)
@@ -273,6 +268,17 @@ module Capybara::Apparition
       _raw_evaluate('window.location.href', context_id: main_frame.context_id)
     end
 
+    def element_from_point(x:, y:)
+      r_o = _raw_evaluate("document.elementFromPoint(#{x}, #{y})", context_id: main_frame.context_id)
+      while r_o && (r_o['description'] =~ /^iframe/)
+        frame_node = command('DOM.describeNode', objectId: r_o['objectId'])
+        frame = @frames.get(frame_node.dig('node', 'frameId'))
+        fo = frame_offset(frame)
+        r_o = _raw_evaluate("document.elementFromPoint(#{x - fo[:x]}, #{y - fo[:y]})", context_id: frame.context_id)
+      end
+      r_o
+    end
+
     def frame_url
       wait_for_loaded
       _raw_evaluate('window.location.href')
@@ -361,6 +367,14 @@ module Capybara::Apparition
 
   private
 
+    def frame_offset(frame)
+      return { x: 0, y: 0 } if frame.id == main_frame.id
+
+      result = command('DOM.getBoxModel', objectId: frame.element_id)
+      x, y = result['model']['content']
+      { x: x, y: y }
+    end
+
     def register_event_handlers
       @session.on 'Page.javascriptDialogOpening' do |params|
         type = params['type'].to_sym
@@ -437,7 +451,7 @@ module Capybara::Apparition
       #   end
       # end
 
-      @session.on('Page.domContentEventFired') do |params|
+      @session.on('Page.domContentEventFired') do
         # TODO: Really need something better than this
         main_frame.loaded! if @status_code != 200
       end
@@ -497,7 +511,9 @@ module Capybara::Apparition
       @session.on 'Network.loadingFailed' do |params|
         req = @network_traffic.find { |request| request.request_id == params['requestId'] }
         req&.blocked_params = params if params['blockedReason']
-        puts "Loading Failed - request: #{params['requestId']} : #{params['errorText']}" if params['type'] == 'Document'
+        if params['type'] == 'Document'
+          puts "Loading Failed - request: #{params['requestId']} : #{params['errorText']}" if ENV['DEBUG']
+        end
       end
 
       @session.on 'Network.requestIntercepted' do |params|
@@ -546,7 +562,7 @@ module Capybara::Apparition
     def process_intercepted_request(interception_id, request, navigation)
       headers, url = request.values_at('headers', 'url')
 
-      unless @temp_headers.empty? || navigation
+      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
@@ -711,7 +727,7 @@ module Capybara::Apparition
           return properties.each_with_object(object_cache[stable_id]) do |property, memo|
             if property['enumerable']
               memo[property['name']] = decode_result(property['value'], object_cache)
-            else
+            else # rubocop:disable Style/EmptyElse
               # TODO: Do we need to cleanup these resources?
               #     releasePromises.push(helper.releaseObject(@element._client, property.value))
             end

data/lib/capybara/apparition/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Apparition
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/lib/capybara/apparition.rb

@@ -16,5 +16,5 @@ module Capybara
 end
 
 Capybara.register_driver :apparition do |app|
-  Capybara::Apparition::Driver.new(app)
+  Capybara::Apparition::Driver.new(app, headless: true)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apparition
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Thomas Walpole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara