eyes_selenium 3.15.24 → 3.15.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c13515c08d5df301235c5ddaff6f9a4f522c6db6f664aea7edd834697e34f0cc
-  data.tar.gz: 27abc6fb23e9bca2deac8fbc3db72fdf3de1ff8cb5a38b05136ac80f998cef7b
+  metadata.gz: 88093a081f4f6f894ff270f5fd485d58a5ee72a5db793b3e81611ee7e374ab4b
+  data.tar.gz: 775674e679494be0b7ff1b69f0cce61a30e3ee22926bec75550a070a7a6ee276
 SHA512:
-  metadata.gz: 18b2abd60b6354cf1e95441d2c886977d580e8d7bc1a282c4219e250cd1ff308f6db9ffa96b31cd7f3c18c0612fe97079516d8f6527806effd8aeea48d049139
-  data.tar.gz: 96d2d5547c8a26d6bd83ca4e8a98490df332397964f227b377dd00adbcdb87377f0cb079e4bfe19a66fbd6ce07c1b089bcef83e8a455151514773e2547ca62d6
+  metadata.gz: 0010be372dcb9524baa55868a0a8b2a5804b9474586b79a2ac8070daab34397884327b82470cf88bb57814983ce4fb3a027f85815309589566be966eb99fec94
+  data.tar.gz: a147aa412ffdb8309e0616536797206b587c2f7dace5c52b70628b7be199d81e26584c711266191741bb7269c61b75568f2f30b963beea545da60c06c5b6144d

data/lib/applitools/selenium/target.rb

@@ -4,6 +4,7 @@ module Applitools
   module Selenium
     class Target
       include Applitools::FluentInterface
+      include Applitools::MatchLevelSetter
       class << self
         def frame(element)
           new.frame(element)
@@ -56,7 +57,18 @@ module Applitools
           ignored_regions << case args.first
                              when Applitools::Region
                                proc { args.first.padding(requested_padding) }
-                             when Applitools::Selenium::Element, ::Selenium::WebDriver::Element
+                             when ::Selenium::WebDriver::Element
+                               proc do |driver, return_element = false|
+                                 region = applitools_element_from_selenium_element(driver, args.first)
+                                 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
+                             when Applitools::Selenium::Element
                                proc do |_driver, return_element = false|
                                  region = args.first
                                  padding_proc = proc do |region|
@@ -118,7 +130,17 @@ module Applitools
                   args.first.padding(requested_padding)
                 when ::Applitools::Region
                   Applitools::FloatingRegion.any(args.shift, *args).padding(requested_padding)
-                when ::Selenium::WebDriver::Element, Applitools::Selenium::Element
+                when ::Selenium::WebDriver::Element
+                  proc do |driver, return_element = false|
+                    args_dup = args.dup
+                    region = applitools_element_from_selenium_element(driver, 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
+                when ::Applitools::Selenium::Element
                   proc do |_driver, return_element = false|
                     args_dup = args.dup
                     region = args_dup.shift
@@ -167,17 +189,17 @@ module Applitools
       end
 
       def exact(*args)
-        return match_level(Applitools::MatchLevel::EXACT) if args.empty?
-        raise Applitools::EyesError('Target.exact() is supposed to be called without args!')
-        # region = process_region(args)
-        # exact_regions << region
-        # self
+        match_level(Applitools::MatchLevel::EXACT, *args)
       end
 
       def process_region(*args)
         r = args.first
         case r
-        when Applitools::Region, ::Selenium::WebDriver::Element, Applitools::Selenium::Element
+        when ::Selenium::WebDriver::Element
+          proc do |driver|
+            applitools_element_from_selenium_element(driver, args.dup.first)
+          end
+        when Applitools::Region, Applitools::Selenium::Element
           proc { r }
         else
           proc do |driver|
@@ -188,7 +210,9 @@ module Applitools
       end
 
       def match_level(*args)
-        value = args.shift
+        match_level = args.shift
+        exact_options = args.shift || {}
+        (options[:match_level], options[:exact]) = match_level_with_exact(match_level, exact_options)
         self
       end
 
@@ -219,7 +243,11 @@ module Applitools
       def region(*args)
         handle_frames
         self.region_to_check = case args.first
-                               when Applitools::Selenium::Element, Applitools::Region, ::Selenium::WebDriver::Element
+                               when ::Selenium::WebDriver::Element
+                                 proc do |driver|
+                                   applitools_element_from_selenium_element(driver, args.first)
+                                 end
+                               when Applitools::Selenium::Element, Applitools::Region
                                  proc { args.first }
                                when String
                                  proc do |driver|
@@ -299,6 +327,11 @@ module Applitools
         frames << frame_or_element
         self.frame_or_element = nil
       end
+
+      def applitools_element_from_selenium_element(driver, selenium_element)
+        xpath = driver.execute_script(Applitools::Selenium::Scripts::GET_ELEMENT_XPATH_JS, selenium_element)
+        driver.find_element(:xpath, xpath)
+      end
     end
   end
 end

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

@@ -80,9 +80,6 @@ module Applitools
       end
 
       def check(tag, target)
-        script = <<-END
-          var callback = arguments[arguments.length - 1]; return (#{Applitools::Selenium::Scripts::PROCESS_RESOURCES})().then(JSON.stringify).then(callback, function(err) {callback(err.stack || err.toString())});
-        END
         script = <<-END
           #{Applitools::Selenium::Scripts::PROCESS_PAGE_AND_POLL} return __processPageAndPoll();
         END
@@ -121,16 +118,6 @@ 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!
-        # end
         result = []
         collect_selenium_regions(target).each do |el, v|
           if [::Selenium::WebDriver::Element, Applitools::Selenium::Element].include?(el.class)

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.15.24
+  version: 3.15.25
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-24 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.24
+        version: 3.15.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.15.24
+        version: 3.15.25
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement