eyes_selenium 3.15.7.beta → 3.15.8.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f310314bd69c6cdf7997b6b2a4198cd5bde9c8949d200e70386f4814c876078e
-  data.tar.gz: 5530cd7dbd51d0cfea656393653e295c47d4f8410ea8bede644e74e863a09fa9
+  metadata.gz: 1c555292b295f24e141289f7534c4b035d7f1f0ad6b1a531e0c6110c0b07e1ae
+  data.tar.gz: ab114178948031d1933e216fcf74060c6d4ad16e3d1ec059ead5cb4c8e25746d
 SHA512:
-  metadata.gz: 15bddcc282aa913b87811ef6f991bb3f9102e89db9e0395d46731df102058f6c5db89ef630ebf0ffabc5452f31f1e17a1f3a1a14c1c91ab6aad1a328ef0658ae
-  data.tar.gz: dc35a47ff1db17acf792f766658f833340c0d4052b8ddb3cda56f3d4a63c1dc484321b22d4b951e771d29bafa072eb18731c99d66e636c5f981062d6d5990ddf
+  metadata.gz: f5206c76f8b5441aa4da66df2c39a0a742ff553056c47fec14333b94881e213e95aa56770e4eed3dc35a740d7301b5b5b9e56cf2c3cddf17419a3140272c803e
+  data.tar.gz: eaa114999ee42c6121621f0af46711f2f0cca9678de5c1d95ef909df1d1f394fee6f22ffd582e5a4683fdeb2243dd99ee451fcec7cb25f1583c7af56bbaab9f7

data/lib/applitools/selenium/browser_types.rb

@@ -2,7 +2,7 @@ module BrowserTypes
   extend self
   CHROME = :chrome
   FIREFOX = :firefox
-  IE11 = :ie
+  IE11 = :IE_11
   EDGE = :edge
   IE10 = :ie10
 

data/lib/applitools/selenium/scripts/get_element_xpath.rb

@@ -0,0 +1,25 @@
+module Applitools
+  module Selenium
+    module Scripts
+      GET_ELEMENT_XPATH_JS = <<'END'
+        var el = arguments[0];
+        var xpath = '';
+        do {
+          var parent = el.parentElement;
+          var index = 1;
+          if (parent !== null) {
+            var children = parent.children;
+            for (var childIdx in children) {
+              var child = children[childIdx];
+              if (child === el) break;
+              if (child.tagName === el.tagName) index++;
+            }
+          }
+          xpath = '/' + el.tagName + '[' + index + ']' + xpath;
+          el = parent;
+        } while (el !== null);
+        return '/' + xpath;
+END
+    end
+  end
+end

data/lib/applitools/selenium/visual_grid/render_browser_info.rb

@@ -7,7 +7,7 @@ module Applitools
         {
           platform: 'linux',
           browser_type: BrowserTypes::CHROME,
-          size_mode: 'full-page',
+          # size_mode: 'full-page',
           viewport_size: Applitools::RectangleSize.from_any_argument(width: 0, height: 0)
         }
       end

data/lib/applitools/selenium/visual_grid/render_info.rb

@@ -2,7 +2,7 @@ module Applitools
   module Selenium
     class RenderInfo
       include Applitools::Jsonable
-      json_fields :width, :height, :sizeMode, :emulationInfo
+      json_fields :width, :height, :sizeMode, :emulationInfo, :region, :selector
       # , :region, :emulationInfo
 
       def json_data
@@ -12,6 +12,8 @@ module Applitools
           sizeMode: size_mode
         }
         result['emulationInfo'] = json_value(emulation_info) if emulation_info
+        result['region'] = json_value(region) if size_mode == 'region'
+        result['selector'] = json_value(region) if size_mode == 'selector'
         result
       end
     end

data/lib/applitools/selenium/visual_grid/render_request.rb

@@ -4,7 +4,7 @@ module Applitools
     class RenderRequest
       include Applitools::Jsonable
       json_fields :renderId, :webhook, :url, :dom, :resources, :scriptHooks,
-                  :selectorsToFindRegionsFor, :send_dom
+                  :selectorsToFindRegionsFor, :sendDom
 
       json_fields :renderInfo, :browser
 

data/lib/applitools/selenium/visual_grid/render_task.rb

@@ -9,8 +9,9 @@ module Applitools
       MAX_ITERATIONS = 100
 
       attr_accessor :script, :running_test, :all_blobs, :resource_urls, :resource_cache, :put_cache, :server_connector,
-                    :rendering_info, :request_resources, :dom_url_mod, :result
-      def initialize(name, script, running_test, resource_cache, put_cache, rendering_info, server_connector, mod = nil)
+                    :rendering_info, :request_resources, :dom_url_mod, :result, :region_selectors, :size_mode, :region_to_check
+
+      def initialize(name, script, running_test, resource_cache, put_cache, rendering_info, server_connector, region_selectors, size_mode, region, mod = nil)
         self.result = nil
         self.script = script
         self.running_test = running_test
@@ -18,6 +19,10 @@ module Applitools
         self.put_cache = put_cache
         self.server_connector = server_connector
         self.rendering_info = rendering_info
+        self.region_selectors = region_selectors
+        self.size_mode = size_mode
+        self.region_to_check = region
+
         self.dom_url_mod = mod
         super(name) do
           perform
@@ -38,6 +43,7 @@ module Applitools
           # rescue StandardError => _e
           #   response = server_connector.render(rendering_info['serviceUrl'], rendering_info['accessToken'], requests)
           rescue StandardError => e
+            Applitools::EyesLogger.error(e.message)
             fetch_fails += 1
             sleep 2
           end
@@ -146,7 +152,8 @@ module Applitools
         r_info = Applitools::Selenium::RenderInfo.new.tap do |r|
           r.width = running_test.browser_info.viewport_size.width
           r.height = running_test.browser_info.viewport_size.height
-          r.size_mode = running_test.browser_info.size_mode
+          r.size_mode = size_mode
+          r.region = region_to_check
           r.emulation_info = running_test.browser_info.emulation_info if running_test.browser_info.emulation_info
         end
 
@@ -162,9 +169,8 @@ module Applitools
           render_info: r_info,
           browser: {name: running_test.browser_info.browser_type, platform: running_test.browser_info.platform},
           script_hooks: nil,
-          selectors_to_find_region_for: nil,
-          send_dom: running_test.eyes.config.send_dom,
-          task: nil
+          selectors_to_find_regions_for: region_selectors,
+          send_dom: running_test.eyes.config.send_dom.nil? ? false.to_s : running_test.eyes.config.send_dom.to_s
         )
       end
 

data/lib/applitools/selenium/visual_grid/running_test.rb

@@ -153,7 +153,7 @@ module Applitools
         watch_open[open_task] = false
       end
 
-      def check(tag, target, script_result, visual_grid_manager, mod = nil)
+      def check(tag, target, script_result, visual_grid_manager, region_selectors, size_mod, region_to_check, mod = nil)
         render_task = RenderTask.new(
           "Render #{eyes.config.short_description} - #{tag}",
           script_result,
@@ -162,6 +162,9 @@ module Applitools
           visual_grid_manager.put_cache,
           visual_grid_manager.rendering_info(eyes.server_connector),
           eyes.server_connector,
+          region_selectors,
+          size_mod,
+          region_to_check,
           mod
         )
 

data/lib/applitools/selenium/visual_grid/visual_grid_eyes.rb

@@ -11,6 +11,9 @@ module Applitools
 
       attr_accessor :api_key, :server_url, :proxy, :opened
 
+      attr_accessor :size_mod, :region_to_check
+      private :size_mod, :size_mod=, :region_to_check, :region_to_check=
+
       def_delegators 'config', *Applitools::Selenium::Configuration.methods_to_delegate
       def_delegators 'config', *Applitools::EyesBaseConfiguration.methods_to_delegate
 
@@ -74,8 +77,14 @@ module Applitools
           sleep wait_before_screenshots
           script_result = driver.execute_async_script(script).freeze
           mod = Digest::SHA2.hexdigest(script_result)
+
+          region_x_paths = get_regions_x_paths(target)
+
+          # require 'pry'
+          # binding.pry
+
           test_list.each do |t|
-            t.check(tag, target, script_result.dup, visual_grid_manager, mod)
+            t.check(tag, target, script_result.dup, visual_grid_manager, region_x_paths, size_mod, region_to_check, mod)
           end
           test_list.each { |t| t.becomes_not_rendered}
         rescue StandardError => e
@@ -84,6 +93,58 @@ module Applitools
         end
       end
 
+      def get_regions_x_paths(target)
+        regions_hash = collect_selenium_regions(target).each do |k,v|
+          v.map! do |el|
+            if [::Selenium::WebDriver::Element, Applitools::Selenium::Element].include?(el.class)
+              xpath = driver.execute_script(Applitools::Selenium::Scripts::GET_ELEMENT_XPATH_JS, el)
+              web_element_region = Applitools::Selenium::WebElementRegion.new(xpath, k)
+              self.region_to_check = web_element_region if k ==:target && size_mod == 'selector'
+              web_element_region
+            end
+          end.compact!
+        end
+        regions_hash.values.flatten.compact
+      end
+
+      def collect_selenium_regions(target)
+        selenium_regions = {:target => []}
+        # ignore_regions = target.ignored_regions
+        # floating_regions = target.floating_regions
+        target_element = target.region_to_check
+        setup_size_mode(target_element)
+        # selenium_regions.map do |r|
+        #   element_or_region(r)
+        # end
+        selenium_regions[:target] << region_to_check if size_mod == 'selector'
+        selenium_regions
+      end
+
+      def setup_size_mode(target_element)
+        self.size_mod = 'full-page'
+
+        element_or_region = element_or_region(target_element)
+
+        case element_or_region
+        when ::Selenium::WebDriver::Element, Applitools::Selenium::Element
+          self.size_mod = 'selector'
+        when Applitools::Region
+          self.size_mod = 'region' unless element_or_region == Applitools::Region::EMPTY
+        else
+          self.size_mod = 'full-page'
+        end
+
+        self.region_to_check = element_or_region
+      end
+
+      def element_or_region(target_element)
+        if target_element.respond_to?(:call)
+          target_element.call(driver)
+        else
+          target_element
+        end
+      end
+
       def close(throw_exception = true)
         return false if test_list.empty?
         test_list.each do |t|

data/lib/applitools/selenium/visual_grid/web_element_region.rb

@@ -0,0 +1,14 @@
+module Applitools
+  module Selenium
+    class WebElementRegion
+      include Applitools::Jsonable
+      json_fields :selector, :category, :type
+
+      def initialize(selector, category)
+        self.selector = selector
+        self.category = category
+        self.type = 'xpath'
+      end
+    end
+  end
+end

data/lib/applitools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '3.15.7.beta'.freeze
+  VERSION = '3.15.8.beta'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.15.7.beta
+  version: 3.15.8.beta
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eyes_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.15.7.beta
+        version: 3.15.8.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.15.7.beta
+        version: 3.15.8.beta
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - lib/applitools/selenium/render_resources.rb
 - lib/applitools/selenium/rgrid_dom.rb
 - lib/applitools/selenium/sauce/driver.rb
+- lib/applitools/selenium/scripts/get_element_xpath.rb
 - lib/applitools/selenium/scripts/process_page_and_serialize.rb
 - lib/applitools/selenium/scroll_position_provider.rb
 - lib/applitools/selenium/selenium_eyes.rb
@@ -132,6 +133,7 @@ files:
 - lib/applitools/selenium/visual_grid/vg_task.rb
 - lib/applitools/selenium/visual_grid/visual_grid_eyes.rb
 - lib/applitools/selenium/visual_grid/visual_grid_runner.rb
+- lib/applitools/selenium/visual_grid/web_element_region.rb
 - lib/applitools/version.rb
 - lib/eyes_selenium.rb
 homepage: https://www.applitools.com