eyes_selenium 3.2.2 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38109543a878245f5b8576910af990ede12cea75
-  data.tar.gz: d41a05ad3914b018a74922f1502932512b8699d5
+  metadata.gz: e79fbaad2e65435471ba70672dd81c0765cb2e67
+  data.tar.gz: 030f097040e4f3ab96bf0cb00313724f1f22c3d1
 SHA512:
-  metadata.gz: 86b7f6b18e4c951d025c7e7d603bc2795569a0da377fa9b9c5d5ede25f22d8b89170028a2c37d3e7a2d6aea1fe2fe313274b80011d19811bea3d970dc7468abb
-  data.tar.gz: 46d7ce59515dd15ae5c40586c636c58b90da2c80ab401b473055f1e65bb92b86051634cb4d13df57baca7bb9f2dff345f63fbc7ee203b8236bbebaf595cf429a
+  metadata.gz: e8ac42ec51804f6a0a4624729d97ffa153ea6443d53ed7016ad6bffb964fba1a4a9cfb119fe8e200cf9db9170eda199e5ee83238ed9cb285db9e2c29a0a8ea41
+  data.tar.gz: 672c0e3a7af3c8207ed8018ca0c9ad3a6909f82398a4d10711fdc524039d0b3b386e5cf7c3a55890d1ee6aa3bf102e5e340eb4f22a80264c02f9245d195a994d

data/lib/applitools/selenium/element.rb

@@ -175,6 +175,15 @@ module Applitools::Selenium
       driver.execute_script format(JS_SCROLL_TO_FORMATTED_STR, location.x, location.y), self
     end
 
+    def to_hash
+      {
+        left: location.x.to_i,
+        top: location.y.to_i,
+        width: size.width.to_i,
+        height: size.height.to_i
+      }
+    end
+
     private
 
     attr_reader :driver

data/lib/applitools/selenium/element_position_provider.rb

@@ -31,6 +31,8 @@ module Applitools::Selenium
       current_position
     end
 
+    alias force_offset state
+
     def restore_state(value)
       self.position = value
     end

data/lib/applitools/selenium/eyes.rb

@@ -217,6 +217,160 @@ module Applitools::Selenium
       Applitools::Utils::EyesSeleniumUtils.extract_viewport_size(driver)
     end
 
+    def check(name, target)
+      Applitools::ArgumentGuard.is_a? target, 'target', Applitools::Selenium::Target
+      original_overflow = nil
+      original_position_provider = position_provider
+
+      eyes_element = nil
+
+      self.eyes_screenshot_factory = lambda do |image|
+        Applitools::Selenium::EyesWebDriverScreenshot.new(
+            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
+            region_provider = region_provider_for_frame
+
+          elsif eyes_element.is_a? Applitools::Selenium::Element
+            #check_element
+            region_provider = Applitools::Selenium::RegionProvider.new(
+                region_for_element(eyes_element),
+                target.coordinate_type
+            )
+          else
+            #check_window
+            region_provider = Applitools::Selenium::RegionProvider.new(
+              region_for_element(eyes_element),
+              target.coordinate_type
+            )
+            check_window = true
+          end
+
+          if target.options[:stitch_content]
+            check_window ? self.force_full_page_screenshot = true : self.check_frame_or_element = true
+            if eyes_element.is_a? Applitools::Selenium::Element
+              self.position_provider = Applitools::Selenium::ElementPositionProvider.new driver, eyes_element
+
+              original_overflow = eyes_element.overflow
+              eyes_element.overflow = 'hidden'
+            end
+
+            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
+          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]
+          )
+        ensure
+          eyes_element.overflow = original_overflow unless original_overflow.nil?
+          self.check_frame_or_element = false
+          self.force_full_page_screenshot = false
+          self.position_provider = original_position_provider
+          self.region_to_check = nil
+          region_visibility_strategy.return_to_original_position position_provider
+        end
+      end
+    end
+
+    def check_in_frame(options)
+      frames = options.delete :target_frames
+
+      Applitools::ArgumentGuard.is_a? options, 'options', Hash
+      Applitools::ArgumentGuard.is_a? frames, 'target_frames: []', Array
+
+      return yield if block_given? && frames.empty?
+
+      original_frame_chain = driver.frame_chain
+      logger.info 'Switching to target frame according to frames path...'
+      driver.switch_to.frames(frames_path: frames)
+      logger.info 'Done!'
+
+      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
+    end
+
+    def region_for_element(element)
+      return element if element.is_a? Applitools::Region
+
+      p = element.location
+      d = element.size
+
+      border_left_width = element.border_left_width
+      border_top_width = element.border_top_width
+      border_right_width = element.border_right_width
+      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
+      )
+    end
+
+    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
+          )
+          begin
+            frame_region.intersect Applitools::Region.from_location_size(
+                Applitools::Location.new(0, 0),
+                Applitools::Utils::EyesSeleniumUtils.entire_page_size(driver)
+            )
+            frame_region
+          ensure
+            frame_region
+          end
+        end
+
+        provider.instance_eval do
+          define_singleton_method :region do
+            current_frame_size.call
+          end
+          define_singleton_method :coordinate_type do
+            Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative]
+          end
+        end
+      end
+    end
+
+    private :check_in_frame
+    private :region_for_element
+
     # Takes a snapshot of the application under test and matches a region of
     # a specific element with the expected region output.
     # @param [Applitools::Selenium::Element] element Represents a region to check.
@@ -397,12 +551,15 @@ module Applitools::Selenium
           options[:name_or_id] ||
           options[:frame_element] ||
           options[:frame_chain] ||
-          options[:frames_path]
+          options[:frames_path] ||
+          options[:target_frames]
         raise Applitools::EyesIllegalArgument.new 'You must pass :index or :name_or_id or :frame_element option' /
           'or :frame_chain option or :frames_path option'
       end
 
-      if (needed_keys = (options.keys & [:index, :name_or_id, :frame_element, :frame_chain, :frames_path])).length == 1
+      if (needed_keys = (
+          options.keys & [:index, :name_or_id, :frame_element, :frame_chain, :frames_path, :target_frames])
+          ).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

@@ -145,7 +145,7 @@ module Applitools::Selenium
         raise Applitools::EyesNoSuchFrame.new "No frame with name or id #{name_or_id} exists!" if frames.empty?
       end
       logger.info 'Done! Making preparations...'
-      on_will_switch.will_switch_to_frame(:frame, frames.first).last
+      on_will_switch.will_switch_to_frame(:frame, frames.first)
       logger.info 'Done! Switching to frame...'
       __getobj__.frame frames.first
 
@@ -181,7 +181,16 @@ module Applitools::Selenium
       logger.info 'EyesTargetLocator.frames(:frames_path => a_chain)'
       frames_path.each do |frame_name_or_id|
         logger.info 'Switching to frame...'
-        frame(name_or_id: frame_name_or_id)
+        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
+        end
+
         logger.info 'Done!'
       end
       logger.info 'Done switching into nested frames!'

data/lib/applitools/selenium/move_to_region_visibility_strategy.rb

@@ -25,6 +25,7 @@ module Applitools::Selenium
     end
 
     def return_to_original_position(position_provider)
+      return if original_position.nil?
       logger.info 'Returning to original position...'
       position_provider.restore_state original_position
       logger.info 'Done!'

data/lib/applitools/selenium/region_provider.rb

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

data/lib/applitools/selenium/target.rb

@@ -0,0 +1,97 @@
+module Applitools
+  module Selenium
+    class Target
+      class << self
+        def window
+          self.new()
+        end
+
+        def region(element)
+          self.new().region(element)
+        end
+      end
+
+      attr_accessor  :element, :frames, :region_to_check, :coordinate_type, :options, :ignored_regions
+
+      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
+        else
+          reset_ignore
+        end
+        self
+      end
+
+      def float(*args)
+        self
+      end
+
+      def fully
+        options[:stitch_content] = true
+        self
+      end
+
+      def timeout(value)
+        options[:timeout] = value
+        self
+      end
+
+      def frame(element)
+        frames << element
+        reset_for_fullscreen
+        self
+      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.coordinate_type = Applitools::EyesScreenshot::COORDINATE_TYPES[:context_relative]
+        options[:timeout] = nil
+        reset_ignore
+        self
+      end
+
+      def trim
+        options[:trim] = true
+        self
+      end
+
+      private
+
+      def reset_for_fullscreen
+        self.coordinate_type = nil
+        self.region_to_check = proc { Applitools::Region::EMPTY }
+        reset_ignore
+        options[:stitch_content] = false
+        options[:timeout] = nil
+        options[:trim] = false
+      end
+
+      def reset_ignore
+        self.ignored_regions = []
+      end
+    end
+  end
+end
+

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.2.2'.freeze
+  VERSION = '3.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.2
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-25 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.2.2
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -94,9 +94,11 @@ files:
 - lib/applitools/selenium/mouse.rb
 - lib/applitools/selenium/move_to_region_visibility_strategy.rb
 - lib/applitools/selenium/nop_region_visibility_strategy.rb
+- lib/applitools/selenium/region_provider.rb
 - lib/applitools/selenium/sauce/driver.rb
 - lib/applitools/selenium/scroll_position_provider.rb
 - lib/applitools/selenium/takes_screenshot_image_provider.rb
+- lib/applitools/selenium/target.rb
 - lib/applitools/selenium/viewport_size.rb
 - lib/applitools/version.rb
 - lib/eyes_selenium.rb