eyes_selenium 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49464fd2846206f3d89711efe90adf900793f036
-  data.tar.gz: bc4a1895ed93664a3b0bd36a264c3a2dca284430
+  metadata.gz: f93b8793605ac58e0e53ea8e917b514c7edf3b64
+  data.tar.gz: 9c641c00d1f5c417c6c657f6f7b0c3bcfa9e7d02
 SHA512:
-  metadata.gz: 0ab0179aaaa1ee9f9326532dc9440d4774aac8a85afe66f52c29064a65f500e74b861fbb567104bdf8c24f5ec1162fd795282aad8b60b31c50bd85dfc85f1d96
-  data.tar.gz: bc5593f084702c3a89c160e11ceff53d1c2d42258d522b394ec73338253dcc7d57ccb8c2564dbb840827439d10825903d5187a486a813b012a5f59a63f8d16fd
+  metadata.gz: 9846f6b0578ad8aee3bfb76bfcc40cdd1107040b87f516e12ce62d68b60f0a551c419838dbffaaeb84ad3643366a3e966666efea6e1349a3f94b38505ab0a892
+  data.tar.gz: 37271c08ea7a37e15a45f6e0f9a8b242cd3f6f77e0e1056ebff55eaba57d46987500d3e9c9216b9fc49b3d6f1694598aa4fd8db17b2e621dc15bab92bcb93ac3

data/lib/applitools/selenium/eyes.rb

@@ -226,30 +226,29 @@ module Applitools::Selenium
 
       self.eyes_screenshot_factory = lambda do |image|
         Applitools::Selenium::EyesWebDriverScreenshot.new(
-            image, driver: driver, force_offset: position_provider.force_offset
+          image, driver: driver, force_offset: position_provider.force_offset
         )
       end
 
       check_in_frame target_frames: target.frames do
         begin
           eyes_element = target.region_to_check.call(driver)
-
           region_visibility_strategy.move_to_region original_position_provider,
             Applitools::Location.new(eyes_element.location.x.to_i, eyes_element.location.y.to_i)
 
           check_window = false
-          if (!target.frames.empty?) && eyes_element.is_a?(Applitools::Region)
-            #check_current_frame
+          if !target.frames.empty? && eyes_element.is_a?(Applitools::Region)
+            # check_current_frame
             region_provider = region_provider_for_frame
 
           elsif eyes_element.is_a? Applitools::Selenium::Element
-            #check_element
+            # check_element
             region_provider = Applitools::Selenium::RegionProvider.new(
-                region_for_element(eyes_element),
-                target.coordinate_type
+              region_for_element(eyes_element),
+              target.coordinate_type
             )
           else
-            #check_window
+            # check_window
             region_provider = Applitools::Selenium::RegionProvider.new(
               region_for_element(eyes_element),
               target.coordinate_type
@@ -268,23 +267,18 @@ module Applitools::Selenium
 
             self.region_to_check = region_provider
 
-            region_provider = Object.new.tap do |prov|
-              prov.instance_eval do
-                define_singleton_method :region do
-                  Applitools::Region::EMPTY
-                end
-
-                define_singleton_method :coordinate_type do
-                  nil
-                end
-              end
-            end
+            region_provider = Applitools::Selenium::RegionProvider.new(
+              Applitools::Region::EMPTY,
+              nil
+            )
           end
 
           check_window_base(
             region_provider, name, false, target.options[:timeout] || USE_DEFAULT_MATCH_TIMEOUT,
-            ignore: target.ignored_regions.map {|i| i.call(driver)},
-            trim: target.options[:trim]
+            ignore: target.ignored_regions.map { |i| i.call(driver) },
+            trim: target.options[:trim],
+            match_level: default_match_settings[:match_level],
+            exact: default_match_settings[:exact]
           )
         ensure
           eyes_element.overflow = original_overflow unless original_overflow.nil?
@@ -312,13 +306,11 @@ module Applitools::Selenium
 
       yield if block_given?
 
-
       logger.info 'Switching back into top level frame...'
-      driver.switch_to.default_content()
-      unless original_frame_chain
-        logger.info 'Switching back into original frame...'
-        driver.switch_to.frames frame_chain: original_frame_chain
-      end
+      driver.switch_to.default_content
+      return unless original_frame_chain
+      logger.info 'Switching back into original frame...'
+      driver.switch_to.frames frame_chain: original_frame_chain
     end
 
     def region_for_element(element)
@@ -333,23 +325,23 @@ module Applitools::Selenium
       border_bottom_width = element.border_bottom_width
 
       Applitools::Region.new(
-          p.x + border_left_width,
-          p.y + border_top_width,
-          d.width - border_left_width - border_right_width,
-          d.height - border_top_width - border_bottom_width
+        p.x + border_left_width,
+        p.y + border_top_width,
+        d.width - border_left_width - border_right_width,
+        d.height - border_top_width - border_bottom_width
       )
     end
 
-    def region_provider_for_frame()
+    def region_provider_for_frame
       Object.new.tap do |provider|
         current_frame_size = lambda do
           frame_region = Applitools::Region.from_location_size(
-              Applitools::Location.new(0, 0), driver.frame_chain!.current_frame.size
+            Applitools::Location.new(0, 0), driver.frame_chain!.current_frame.size
           )
           begin
             frame_region.intersect Applitools::Region.from_location_size(
-                Applitools::Location.new(0, 0),
-                Applitools::Utils::EyesSeleniumUtils.entire_page_size(driver)
+              Applitools::Location.new(0, 0),
+              Applitools::Utils::EyesSeleniumUtils.entire_page_size(driver)
             )
             frame_region
           ensure
@@ -557,9 +549,11 @@ module Applitools::Selenium
           'or :frame_chain option or :frames_path option'
       end
 
-      if (needed_keys = (
-          options.keys & [:index, :name_or_id, :frame_element, :frame_chain, :frames_path, :target_frames])
-          ).length == 1
+      needed_keys = (
+        options.keys & [:index, :name_or_id, :frame_element, :frame_chain, :frames_path, :target_frames]
+      )
+
+      if needed_keys.length == 1
         frame_key = needed_keys.first
       else
         raise Applitools::EyesIllegalArgument.new 'You\'ve passed some extra keys!' /

data/lib/applitools/selenium/eyes_target_locator.rb

@@ -183,12 +183,12 @@ module Applitools::Selenium
         logger.info 'Switching to frame...'
         logger.info frame_name_or_id
         case frame_name_or_id
-          when String
-            frame(name_or_id: frame_name_or_id)
-          when Applitools::Selenium::Element
-            frame(frame_element: frame_name_or_id.reference)
-          else
-            Applitools::ArgumentGuard.raise_argument_error Applitools::EyesNoSuchFrame.new frame_name_or_id
+        when String
+          frame(name_or_id: frame_name_or_id)
+        when Applitools::Selenium::Element
+          frame(frame_element: frame_name_or_id.reference)
+        else
+          Applitools::ArgumentGuard.raise_argument_error Applitools::EyesNoSuchFrame.new frame_name_or_id
         end
 
         logger.info 'Done!'

data/lib/applitools/selenium/region_provider.rb

@@ -1,10 +1,10 @@
 module Applitools::Selenium
   class RegionProvider
-    #он нам нужен в селениум?
+    # Do we need it under Selenium module?
     attr_reader :region, :coordinate_type
     def initialize(region, coordinate_type)
       @region = region
       @coordinate_type = coordinate_type
     end
   end
-end
+end

data/lib/applitools/selenium/target.rb

@@ -3,40 +3,40 @@ module Applitools
     class Target
       class << self
         def window
-          self.new()
+          new
         end
 
         def region(element)
-          self.new().region(element)
+          new.region(element)
         end
       end
 
-      attr_accessor  :element, :frames, :region_to_check, :coordinate_type, :options, :ignored_regions
+      attr_accessor :element, :frames, :region_to_check, :coordinate_type, :options, :ignored_regions
 
-      def initialize()
+      def initialize
         self.frames = []
         self.options = {}
         reset_for_fullscreen
       end
 
       def ignore(*args)
-        if(args.first)
-          if args.first.is_a? Applitools::Selenium::Element
-            self.ignored_regions << proc do
-              args.first
-            end
-          else
-            self.ignored_regions << proc do |driver|
-              driver.find_element *args
-            end
-          end
+        if args.first
+          ignored_regions << if args.first.is_a? Applitools::Selenium::Element
+                               proc do
+                                 args.first
+                               end
+                             else
+                               proc do |driver|
+                                 driver.find_element(*args)
+                               end
+                             end
         else
           reset_ignore
         end
         self
       end
 
-      def float(*args)
+      def float(*_)
         self
       end
 
@@ -57,15 +57,15 @@ module Applitools
       end
 
       def region(*args)
-        if args.first.is_a? Applitools::Selenium::Element
-          self.region_to_check = proc do
-            args.first
-          end
-        else
-          self.region_to_check = proc do |driver|
-            driver.find_element *args
-          end
-        end
+        self.region_to_check = if args.first.is_a? Applitools::Selenium::Element
+                                 proc do
+                                   args.first
+                                 end
+                               else
+                                 proc do |driver|
+                                   driver.find_element(*args)
+                                 end
+                               end
         self.coordinate_type = Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative]
         options[:timeout] = nil
         reset_ignore
@@ -94,4 +94,3 @@ module Applitools
     end
   end
 end
-

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.4.1'.freeze
+  VERSION = '3.5.0'.freeze
 end

metadata

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