eyes_selenium 3.15.14 → 3.15.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ddb498303bad15a5374f2878353e432c70c9e5984f186d0f352aa171be9fbf
-  data.tar.gz: 5668c077523d008445515f258d757dfa4b0b82da0da4867fb15a5db31a40611f
+  metadata.gz: b56e73c95e87c0156bb7972b15dd18abda92fe0b839b12bc0439f1c251810339
+  data.tar.gz: b491c7ef0ee74076b3880888f8fa52994395ef620c74f81a256caaa6fe489270
 SHA512:
-  metadata.gz: '0983c4bf577cafdcead8374e671af370cf4c9d800d0a049d3d5e589d7b01e8956b0471259573f8c056bfa1070698d5bd735274da21769a72fd07177fe6f38921'
-  data.tar.gz: df02fa514fdb06a7b0dbaece7b77e490d53350bb8f565c7d8368fa9f6647e5428f60c948b88ea7a05b8dad2e8f51e8447a7c0d15f41cf58ac481e54100445134
+  metadata.gz: e74a81d70aee821c5f5016b988fc70130aa7d53cf73ad30a49c020752d62ce4570dae56ec07558e7f5f91ec0e13aec2fc85fda0317f1e49e26477eef58ae8caa
+  data.tar.gz: 00660a727243097379a333ab2e15df66097808658dced225f63734cdf5e89860754e480c060a444f8d2b39f5aef32c451b466c3017e8ed37053a34ef9b01080c

data/lib/applitools/selenium/target.rb

@@ -19,7 +19,7 @@ module Applitools
       end
 
       attr_accessor :element, :frames, :region_to_check, :coordinate_type, :options, :ignored_regions,
-        :floating_regions, :frame_or_element
+        :floating_regions, :frame_or_element, :regions
 
       private :frame_or_element, :frame_or_element=
 
@@ -32,6 +32,7 @@ module Applitools
           send_dom: nil,
           script_hooks: { beforeCaptureScreenshot: '' }
         }
+        self.regions = {}
         reset_for_fullscreen
       end
 
@@ -55,18 +56,26 @@ module Applitools
                              when Applitools::Region
                                proc { args.first.padding(requested_padding) }
                              when Applitools::Selenium::Element, ::Selenium::WebDriver::Element
-                               proc do
+                               proc do |_driver, return_element = false|
                                  region = args.first
-                                 Applitools::Region.from_location_size(
-                                   region.location, region.size
-                                 ).padding(requested_padding)
+                                 padding_proc = proc do |region|
+                                   Applitools::Region.from_location_size(
+                                       region.location, region.size
+                                   ).padding(requested_padding)
+                                 end
+                                 next region, padding_proc if return_element
+                                 padding_proc.call(region)
                                end
                              else
-                               proc do |driver|
+                               proc do |driver, return_element = false|
                                  region = driver.find_element(*args)
-                                 Applitools::Region.from_location_size(
-                                   region.location, region.size
-                                 ).padding(requested_padding)
+                                 padding_proc = proc do |region|
+                                   Applitools::Region.from_location_size(
+                                       region.location, region.size
+                                   ).padding(requested_padding)
+                                 end
+                                 next region, padding_proc if return_element
+                                 padding_proc.call(region)
                                end
                              end
 
@@ -105,14 +114,30 @@ module Applitools
                             end
         value = case args.first
                 when Applitools::FloatingRegion
-                  proc { args.first.padding(requested_padding) }
-                when ::Selenium::WebDriver::Element, Applitools::Selenium::Element, ::Applitools::Region
-                  proc { Applitools::FloatingRegion.any(args.shift, *args).padding(requested_padding) }
+                  args.first.padding(requested_padding)
+                when ::Applitools::Region
+                  Applitools::FloatingRegion.any(args.shift, *args).padding(requested_padding)
+                when ::Selenium::WebDriver::Element, Applitools::Selenium::Element
+                  proc do |_driver, return_element = false|
+                    args_dup = args.dup
+                    region = args_dup.shift
+                    padding_proc = proc do |region|
+                      Applitools::FloatingRegion.any(region, *args_dup).padding(requested_padding)
+                    end
+                    next region, padding_proc if return_element
+                    padding_proc.call(region)
+                  end
                 else
-                  proc do |driver|
-                    Applitools::FloatingRegion.any(
-                      driver.find_element(args.shift, args.shift), *args
-                    ).padding(requested_padding)
+                  proc do |driver, return_element = false|
+                    args_dup = args.dup
+                    region = driver.find_element(args_dup.shift, args_dup.shift)
+                    padding_proc = proc do |region|
+                      Applitools::FloatingRegion.any(
+                          region, *args_dup
+                      ).padding(requested_padding)
+                    end
+                    next region, padding_proc if return_element
+                    padding_proc.call(region)
                   end
                 end
         floating_regions << value

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

@@ -39,10 +39,10 @@ module Applitools
         target_to_check = target.finalize
         timeout = target_to_check.options[:timeout] || USE_DEFAULT_MATCH_TIMEOUT
 
-        match_data = Applitools::MatchWindowData.new
+        match_data = Applitools::Selenium::VgMatchWindowData.new
         match_data.tag = name
         update_default_settings(match_data)
-        match_data.read_target(target_to_check, driver)
+        match_data.read_target(target_to_check, driver, selector_regions)
         check_result = check_window_base(
             dummy_region_provider, timeout, match_data
         )
@@ -81,6 +81,10 @@ module Applitools
         render_status['domLocation']
       end
 
+      def selector_regions
+        render_status['selectorRegions']
+      end
+
       def match_level_keys
         %w(match_level exact scale remainder).map(&:to_sym)
       end
@@ -160,13 +164,13 @@ module Applitools
         a_title = title
         # logger.info 'Done!'
         Applitools::AppOutputWithScreenshot.new(
-            Applitools::AppOutput.new(a_title, '').tap do |o|
-              o.location = region.location unless region.empty?
-              o.dom_url = dom_url
-              o.screenshot_url = screenshot_url if respond_to?(:screenshot_url) && !screenshot_url.nil?
-            end,
-            nil,
-            true
+          Applitools::AppOutput.new(a_title, '').tap do |o|
+            o.location = region.location unless region.empty?
+            o.dom_url = dom_url
+            o.screenshot_url = screenshot_url if respond_to?(:screenshot_url) && !screenshot_url.nil?
+          end,
+          nil,
+          true
         )
       end
     end

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

@@ -128,7 +128,7 @@ module Applitools
         self.all_blobs = data["blobs"]
         self.resource_urls = data["resourceUrls"]
         self.request_resources = Applitools::Selenium::RenderResources.new
-        # self.request_resources = {}
+
         all_blobs.map {|blob| Applitools::Selenium::VGResource.parse_blob_from_script(blob)}.each do |blob|
           request_resources[blob.url] = blob
         end

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

@@ -0,0 +1,65 @@
+module Applitools
+  module Selenium
+    class VgMatchWindowData < Applitools::MatchWindowData
+      attr_accessor :target, :selector_regions
+      def read_target(target, driver, selector_regions)
+        self.target = target
+        self.selector_regions = selector_regions
+        # options
+        target_options_to_read.each do |field|
+          a_value = target.options[field.to_sym]
+          send("#{field}=", a_value) unless a_value.nil?
+        end
+        # ignored regions
+        if target.respond_to? :ignored_regions
+          target.ignored_regions.each do |r|
+            @need_convert_ignored_regions_coordinates = true unless @need_convert_ignored_regions_coordinates
+            case r
+            when Proc
+              region, padding_proc = r.call(driver, true)
+              # require 'pry'
+              # binding.pry
+              region = selector_regions[target.regions[region]]
+              retrieved_region = Applitools::Region.new(region['x'], region['y'], region['width'], region['height'])
+              @ignored_regions << padding_proc.call(retrieved_region) if padding_proc.is_a? Proc
+            when Applitools::Region
+              @ignored_regions << r
+            end
+          end
+        end
+
+        # # floating regions
+        return unless target.respond_to? :floating_regions
+        target.floating_regions.each do |r|
+          case r
+          when Proc
+            region, padding_proc = r.call(driver, true)
+            region = selector_regions[target.regions[region]]
+            retrieved_region = Applitools::Region.new(region['x'], region['y'], region['width'], region['height'])
+            floating_region = padding_proc.call(retrieved_region) if padding_proc.is_a? Proc
+            raise Applitools::EyesError.new "Wrong floating region: #{region.class}" unless
+                floating_region.is_a? Applitools::FloatingRegion
+            @floating_regions << floating_region
+            @need_convert_floating_regions_coordinates = true
+          when Applitools::FloatingRegion
+            @floating_regions << r
+            @need_convert_floating_regions_coordinates = true
+          end
+        end
+      end
+
+      def convert_ignored_regions_coordinates
+        return unless @need_convert_ignored_regions_coordinates
+        self.ignored_regions = @ignored_regions.map(&:with_padding).map(&:to_hash)
+        @need_convert_ignored_regions_coordinates = false
+      end
+
+      def convert_floating_regions_coordinates
+        return unless @need_convert_floating_regions_coordinates
+        self.floating_regions = @floating_regions
+        @need_convert_floating_regions_coordinates = false
+      end
+
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Applitools
       class << self
         def parse_blob_from_script(blob)
           content = Base64.decode64(blob["value"])
+          # puts "#{blob['url']} ===> #{blob['type']}"
           self.new blob["url"], blob["type"], content
         end
 

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

@@ -100,29 +100,48 @@ module Applitools
       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!
+        # 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
+        result = []
+        regions_hash = collect_selenium_regions(target).each do |el, v|
+          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, v)
+            self.region_to_check = web_element_region if v == :target && size_mod == 'selector'
+            result << web_element_region
+            target.regions[el] = result.size - 1
+          end
         end
-        regions_hash.values.flatten.compact
+        result
       end
 
       def collect_selenium_regions(target)
-        selenium_regions = {:target => []}
-        ignore_regions = target.ignored_regions
-        floating_regions = target.floating_regions
+        selenium_regions = {}
+        # 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'
+        target.ignored_regions.each do |r|
+          selenium_regions[element_or_region(r)] = :ignore
+        end
+        target.floating_regions.each do |r|
+          selenium_regions[element_or_region(r)] = :floating
+        end
+        selenium_regions[region_to_check] = :target if size_mod == 'selector'
+
+        # selenium_regions[:ignore] += [target.ignored_regions.map { |r| element_or_region(r) }].flatten.compact
+        # selenium_regions[:target] << region_to_check if size_mod == 'selector'
         selenium_regions
       end
 
@@ -145,7 +164,8 @@ module Applitools
 
       def element_or_region(target_element)
         if target_element.respond_to?(:call)
-          target_element.call(driver)
+          region, _padding_proc = target_element.call(driver, true)
+          region
         else
           target_element
         end
@@ -153,9 +173,7 @@ module Applitools
 
       def close(throw_exception = true)
         return false if test_list.empty?
-        test_list.each do |t|
-          t.close
-        end
+        test_list.each(&:close)
 
         while (!((states = test_list.map(&:state_name).uniq).count == 1 && states.first == :completed)) do
           sleep 0.5
@@ -180,9 +198,7 @@ module Applitools
       end
 
       def abort_if_not_closed
-        test_list.each do |t|
-          t.abort_if_not_closed
-        end
+        test_list.each(&:abort_if_not_closed)
       end
 
       def open?

data/lib/applitools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '3.15.14'.freeze
+  VERSION = '3.15.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.15.14
+  version: 3.15.15
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-17 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.14
+        version: 3.15.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.15.14
+        version: 3.15.15
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ files:
 - lib/applitools/selenium/visual_grid/resource_cache.rb
 - lib/applitools/selenium/visual_grid/running_test.rb
 - lib/applitools/selenium/visual_grid/thread_pool.rb
+- lib/applitools/selenium/visual_grid/vg_match_window_data.rb
 - lib/applitools/selenium/visual_grid/vg_resource.rb
 - lib/applitools/selenium/visual_grid/vg_task.rb
 - lib/applitools/selenium/visual_grid/visual_grid_eyes.rb