eyes_selenium 3.15.34 → 3.15.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af47a3cf5f78a02f3ddd19d4ef5cb2e74996b39a734ac537b6b0bd844a5a3cd1
-  data.tar.gz: bcdfcd5b4d844f2b2e7a5c6476a4064ae95d0989b022f4ef72462880f3104815
+  metadata.gz: aab8529dcb077f8221beb47146b533b99972fed1bb8564526ce3e3080ccadab4
+  data.tar.gz: c019144e8b13f7c3f7217dac08d96fbc91e935e028502406c0e76f1518e8facc
 SHA512:
-  metadata.gz: e34b2b52f33d50c3a855306497cff6c071600cdd504fab00693edd5624a2b36f714a148ef53120f2d8fdc3e8286b6f836ca3bf5faf64955a9ab87768fef344d2
-  data.tar.gz: 332597fba9f007cd911ffcac3ee3f7abe1ad361c61488576ac8f50e87613e8f288c0a02d0475dd8b5b204593a021f28876337326604287862312382f905c896c
+  metadata.gz: 99b0b16d5160a1ccbff7915afedaf15b62965ca8a58980e73e198f3e1aa5986d4277dcf423cfaf14da1c61329e831f768af2e15c79fb202a47771da4b4169ad1
+  data.tar.gz: baf60a724aaf8819182a61b726cfbef865e49fe745fbb3c58a9ec589148f95d04aacb6e87b8534bcfcfe84be50a15eed8e8c1c4893b79811b88427b2f33c9255

data/lib/applitools/selenium/configuration.rb

@@ -1,10 +1,10 @@
 require 'applitools/selenium/stitch_modes'
-require 'applitools/selenium/stitch_modes'
 require 'applitools/selenium/browsers_info'
 
 module Applitools
   module Selenium
     class Configuration < Applitools::EyesBaseConfiguration
+
       DEFAULT_CONFIG = proc do
         {
           force_full_page_screenshot: false,
@@ -12,7 +12,8 @@ module Applitools
           stitch_mode: Applitools::Selenium::StitchModes::CSS,
           hide_scrollbars: false,
           hide_caret: false,
-          browsers_info: Applitools::Selenium::BrowsersInfo.new
+          browsers_info: Applitools::Selenium::BrowsersInfo.new,
+          accessibility_validation: Applitools::AccessibilityLevel::NONE
         }
       end
       class << self
@@ -30,6 +31,15 @@ module Applitools
 
       object_field :browsers_info, Applitools::Selenium::BrowsersInfo
       int_field :concurrent_sessions
+      enum_field :accessibility_validation, Applitools::AccessibilityLevel.enum_values
+
+      def match_level_keys
+        super << :accessibility_validation
+      end
+
+      def default_match_settings
+        super.merge(accessibility_validation: accessibility_validation)
+      end
 
       def add_browser(*args)
         case args.size

data/lib/applitools/selenium/css_translate_position_provider.rb

@@ -38,7 +38,9 @@ module Applitools::Selenium
     #
     # @param [Applitools::Location] value The location.
     def restore_state(value)
-      transforms = value.values.compact.select { |el| !el.empty? }
+      Applitools::Utils::EyesSeleniumUtils.set_current_transforms(executor, "translate(10px, 0px)")
+
+      transforms = value.values.compact.map(&:to_s).select { |el| !el.empty? }
       Applitools::Utils::EyesSeleniumUtils.set_transforms(executor, value)
       if transforms.empty?
         self.last_state_position = Applitools::Location::TOP_LEFT

data/lib/applitools/selenium/eyes.rb

@@ -6,11 +6,11 @@ module Applitools
         options = Applitools::Utils.extract_options!(args)
         server_url = options.delete(:server_url)
         server_url = args.first unless server_url
-        runner = options.delete(:visual_grid_runner)
+        runner = options.delete(:visual_grid_runner) || options.delete(:runner)
         if runner.is_a? Applitools::Selenium::VisualGridRunner
           super Applitools::Selenium::VisualGridEyes.new(runner, server_url)
         else
-          super Applitools::Selenium::SeleniumEyes.new(server_url)
+          super Applitools::Selenium::SeleniumEyes.new(server_url, runner: runner || Applitools::ClassicRunner.new)
         end
       end
 

data/lib/applitools/selenium/full_page_capture_algorithm.rb

@@ -116,6 +116,8 @@ module Applitools::Selenium
       logger.info 'Done! Adding initial screenshot..'
       logger.info "Initial part:(0,0) [#{image.width} x #{image.height}]"
 
+      image.crop!(0,0,stitched_image.width < image.width ? stitched_image.width : image.width, stitched_image.height < image.height ? stitched_image.height : image.height)
+
       stitched_image.replace! image, 0, 0
       logger.info 'Done!'
 

data/lib/applitools/selenium/selenium_eyes.rb

@@ -109,7 +109,7 @@ module Applitools::Selenium
     # Eyes Server at the specified url.
     #
     # @param server_url The Eyes Server URL.
-    def initialize(server_url = nil)
+    def initialize(*args)
       ensure_config
       super
       self.base_agent_id = "eyes.selenium.ruby/#{Applitools::VERSION}".freeze
@@ -178,7 +178,7 @@ module Applitools::Selenium
 
       self.device_pixel_ratio = UNKNOWN_DEVICE_PIXEL_RATIO
       self.position_provider = self.class.position_provider(
-          stitch_mode, driver, disable_horizontal_scrolling, disable_vertical_scrolling, explicit_entire_size
+        stitch_mode, driver, disable_horizontal_scrolling, disable_vertical_scrolling, explicit_entire_size
       )
 
       self.eyes_screenshot_factory = lambda do |image|
@@ -191,6 +191,11 @@ module Applitools::Selenium
         self.viewport_size = nil if force_driver_resolution_as_viewport_size
         ensure_running_session
       end
+      if runner
+        runner.add_batch(batch.id) do
+          server_connector.close_batch(batch.id)
+        end
+      end
       @driver
     end
 
@@ -208,25 +213,25 @@ module Applitools::Selenium
     # @option value [Symbol] :css use Css to perform stitching.
     # @option value [Symbol] :scroll Scroll to perform stitching.
     # @return [Symbol] The type of stitching.
-    def stitch_mode=(value)
-      @stitch_mode = if value.to_s.upcase == Applitools::STITCH_MODE[:css].to_s
-                       Applitools::STITCH_MODE[:css]
-                     else
-                       Applitools::STITCH_MODE[:scroll]
-                     end
-      unless driver.nil?
-        self.position_provider = self.class.position_provider(
-            stitch_mode, driver, disable_horizontal_scrolling, disable_vertical_scrolling, explicit_entire_size
-        )
-      end
-      if stitch_mode == Applitools::STITCH_MODE[:css]
-        @css_transition_original_hide_scrollbars = hide_scrollbars
-        self.hide_scrollbars = true
-      else
-        self.hide_scrollbars = @css_transition_original_hide_scrollbars || false
-      end
-      value
-    end
+    # def stitch_mode=(value)
+    #   @stitch_mode = if value.to_s.upcase == Applitools::STITCH_MODE[:css].to_s
+    #                    Applitools::STITCH_MODE[:css]
+    #                  else
+    #                    Applitools::STITCH_MODE[:scroll]
+    #                  end
+    #   unless driver.nil?
+    #     self.position_provider = self.class.position_provider(
+    #         stitch_mode, driver, disable_horizontal_scrolling, disable_vertical_scrolling, explicit_entire_size
+    #     )
+    #   end
+    #   if stitch_mode == Applitools::STITCH_MODE[:css]
+    #     @css_transition_original_hide_scrollbars = hide_scrollbars
+    #     self.hide_scrollbars = true
+    #   else
+    #     self.hide_scrollbars = @css_transition_original_hide_scrollbars || false
+    #   end
+    #   value
+    # end
 
     # Takes a snapshot of the application under test and matches it with the expected output.
     #
@@ -860,10 +865,10 @@ module Applitools::Selenium
           max_height = explicit_entire_size.height
         end
         case stitch_mode
-        when :SCROLL
+        when Applitools::Selenium::StitchModes::SCROLL
           Applitools::Selenium::ScrollPositionProvider.new(driver, disable_horizontal, disable_vertical,
                                                            max_width, max_height)
-        when :CSS
+        when Applitools::Selenium::StitchModes::CSS
           Applitools::Selenium::CssTranslatePositionProvider.new(driver, disable_horizontal, disable_vertical,
                                                                  max_width, max_height)
         end

data/lib/applitools/selenium/target.rb

@@ -21,7 +21,7 @@ module Applitools
 
       attr_accessor :element, :frames, :region_to_check, :coordinate_type, :options, :ignored_regions,
         :floating_regions, :frame_or_element, :regions, :match_level, :layout_regions, :content_regions,
-        :strict_regions
+        :strict_regions, :accessibility_regions
 
       private :frame_or_element, :frame_or_element=
 
@@ -221,11 +221,20 @@ module Applitools
           replace_element(original_region, new_region, floating_regions)
         when :ignore
           replace_element(original_region, new_region, ignored_regions)
+        when :accessibility_regions
+          replace_element(original_region, new_region, accessibility_regions)
         end
       end
 
       def replace_element(original, new, array)
-        array[array.index(original)] = new
+        case new
+        when Array
+          index = array.index(original)
+          array.delete_at(index)
+          array.insert(index, *new)
+        when Applitools::Selenium::VGRegion
+          array[array.index(original)] = new
+        end
       end
 
       def match_level(*args)
@@ -306,6 +315,55 @@ module Applitools
         dup.region(region)
       end
 
+      def accessibility(*args)
+        options = Applitools::Utils.extract_options! args
+        unless options[:type]
+          raise Applitools::EyesError,
+            'You should call Target.accessibility(region, region_type: type). The region_type option is required'
+        end
+        unless Applitools::AccessibilityRegionType.enum_values.include?(options[:type])
+          raise Applitools::EyesIllegalArgument,
+            "The region type should be one of [#{Applitools::AccessibilityRegionType.enum_values.join(', ')}]"
+        end
+        handle_frames
+        padding_proc = proc do |region|
+          Applitools::AccessibilityRegion.new(
+            region, options[:type]
+          )
+        end
+
+        accessibility_regions << case args.first
+                                 when ::Selenium::WebDriver::Element
+                                   proc do |driver, return_element = false|
+                                     element = applitools_element_from_selenium_element(driver, args.first)
+                                     next element, padding_proc if return_element
+                                     padding_proc.call(element)
+                                   end
+                                 when Applitools::Selenium::Element
+                                   proc do |_driver, return_element = false|
+                                     next args.first, padding_proc if return_element
+                                     padding_proc.call(args.first)
+                                   end
+                                 when Applitools::Region
+                                   Applitools::AccessibilityRegion.new(
+                                       args.first, options[:type]
+                                   )
+                                 when String
+                                   proc do |driver, return_element = false|
+                                     element = driver.find_element(name_or_id: args.first)
+                                     next element, padding_proc if return_element
+                                     padding_proc.call(element)
+                                   end
+                                 else
+                                   proc do |driver, return_element = false|
+                                     elements = driver.find_elements(*args)
+                                     next elements, padding_proc if return_element
+                                     elements.map { |e| padding_proc.call(e) }
+                                   end
+                                 end
+        self
+      end
+
       private
 
       def reset_for_fullscreen
@@ -316,11 +374,16 @@ module Applitools
         reset_content_regions
         reset_layout_regions
         reset_strict_regions
+        reset_accessibility_regions
         options[:stitch_content] = false
         options[:timeout] = nil
         options[:trim] = false
       end
 
+      def reset_accessibility_regions
+        self.accessibility_regions = []
+      end
+
       def reset_ignore
         self.ignored_regions = []
       end

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

@@ -94,12 +94,12 @@ module Applitools
         render_status['selectorRegions']
       end
 
-      def match_level_keys
-        %w(match_level exact scale remainder).map(&:to_sym)
-      end
+      # def match_level_keys
+      #   %w(match_level exact scale remainder ).map(&:to_sym)
+      # end
 
       def update_default_settings(match_data)
-        match_level_keys.each do |k|
+        config.match_level_keys.each do |k|
           match_data.send("#{k}=", default_match_settings[k])
         end
       end
@@ -108,14 +108,14 @@ module Applitools
         "useragent: #{render_status['userAgent']}"
       end
 
-      def default_match_settings
-        {
-            match_level: match_level,
-            exact: exact,
-            scale: server_scale,
-            remainder: server_remainder
-        }
-      end
+      # def default_match_settings
+      #   {
+      #       match_level: match_level,
+      #       exact: exact,
+      #       scale: server_scale,
+      #       remainder: server_remainder
+      #   }
+      # end
 
       def set_viewport_size(*_args); end
 

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

@@ -53,6 +53,11 @@ module Applitools
           @need_convert_strict_regions_coordinates = true unless @strict_regions.empty?
         end
 
+        if target.respond_to? :accessibility_regions
+          @accessibility_regions = obtain_regions_coordinates(target.accessibility_regions, driver)
+          @need_convert_accessibility_regions_coordinates = true unless @accessibility_regions.empty?
+        end
+
         # # floating regions
         return unless target.respond_to? :floating_regions
         target.floating_regions.each do |r|
@@ -97,7 +102,9 @@ module Applitools
             region = r.region
             region = selector_regions[target.regions[region]]
             raise RegionCoordinatesError.new(r, region['error']) if region['error']
-            result << Applitools::Region.new(region['x'], region['y'], region['width'], region['height'])
+            retrieved_region = Applitools::Region.new(region['x'], region['y'], region['width'], region['height'])
+            result_region = r.padding_proc.call(retrieved_region) if r.padding_proc.is_a? Proc
+            result << result_region
           end
         end
         result
@@ -132,6 +139,12 @@ module Applitools
         self.content_regions = @content_regions
         @need_convert_content_regions_coordinates = false
       end
+
+      def convert_accessibility_regions_coordinates
+        return unless @need_convert_accessibility_regions_coordinates
+        self.accessibility_regions = @accessibility_regions
+        @need_convert_accessibility_regions_coordinates = false
+      end
     end
   end
 end

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

@@ -48,6 +48,7 @@ module Applitools
 
         config.app_name = options[:app_name] if config.app_name.nil? || config.app_name && config.app_name.empty?
         config.test_name = options[:test_name] if config.test_name.nil? || config.test_name && config.test_name.empty?
+        config.viewport_size = Applitools::RectangleSize.from_any_argument(options[:viewport_size]) if config.viewport_size.nil? || config.viewport_size && config.viewport_size.empty?
 
         self.driver = options.delete(:driver)
         self.current_url = driver.current_url
@@ -59,6 +60,9 @@ module Applitools
         end
 
         visual_grid_manager.open(self)
+        visual_grid_manager.add_batch(batch.id) do
+          server_connector.close_batch(batch.id)
+        end
 
         logger.info("getting all browsers info...")
         browsers_info_list = config.browsers_info
@@ -169,6 +173,16 @@ module Applitools
         target.content_regions.each do |r|
           selenium_regions[element_or_region(r, target, :content_regions)] = :content
         end
+        target.accessibility_regions.each do |r|
+          case (r = element_or_region(r, target, :accessibility_regions))
+          when Array
+            r.each do |rr|
+              selenium_regions[rr] = :accessibility
+            end
+          else
+            selenium_regions[r] = :accessibility
+          end
+        end
         selenium_regions[region_to_check] = :target if size_mod == 'selector'
 
         selenium_regions
@@ -194,7 +208,13 @@ module Applitools
       def element_or_region(target_element, target, options_key)
         if target_element.respond_to?(:call)
           region, padding_proc = target_element.call(driver, true)
-          target.replace_region(target_element, Applitools::Selenium::VGRegion.new(region, padding_proc), options_key)
+          case region
+          when Array
+            regions_to_replace = region.map { |r| Applitools::Selenium::VGRegion.new(r, padding_proc) }
+            target.replace_region(target_element, regions_to_replace, options_key)
+          else
+            target.replace_region(target_element, Applitools::Selenium::VGRegion.new(region, padding_proc), options_key)
+          end
           region
         else
           target_element

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

@@ -1,12 +1,13 @@
 module Applitools
   module Selenium
-    class VisualGridRunner
+    class VisualGridRunner < ::Applitools::EyesRunner
       EMPTY_QUEUE = []
       attr_accessor :all_eyes, :resource_cache, :put_cache, :rendering_info, :render_queue
 
       alias queue render_queue
 
       def initialize(concurrent_open_sessions = 10)
+        super()
         self.all_eyes = []
         self.render_queue = []
         @thread_pool = Applitools::Selenium::VGThreadPool.new(concurrent_open_sessions)
@@ -41,13 +42,16 @@ module Applitools
         @rendering_info ||= connector.rendering_info
       end
 
-      def get_all_test_results
+      def get_all_test_results(throw_exception = false)
         while !(all_eyes.select {|e| e.open?}.empty?)
           sleep 0.5
         end
+        delete_all_batches
         all_eyes.map { |e| e.test_list.map(&:test_result) }.flatten
       end
 
+      def aggregate_results(*_args); end
+
       private
 
       def all_running_tests

data/lib/applitools/version.rb

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

metadata

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