eyes_selenium 3.18.4 → 6.9.0

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

@@ -0,0 +1,93 @@
+# GENERATED FILE #
+
+module IosDeviceNameGenerated
+  extend self
+  IPad_7 = 'iPad (7th generation)'.freeze
+  IPad_9 = 'iPad (9th generation)'.freeze
+  IPad_10 = 'iPad (10th generation)'.freeze
+  IPad_mini_6 = 'iPad mini (6th generation)'.freeze
+  IPad_Air_4 = 'iPad Air (4th generation)'.freeze
+
+  # Deprecated: Use IosDeviceName::IPad_Pro_12_9_inch_3 instead.
+  # deprecate_constant :IPad_Pro_3 not allow to point to new version (
+  IPad_Pro_3 = 'iPad Pro (12.9-inch) (3rd generation)'.freeze
+  IPad_Pro_12_9_inch_3 = 'iPad Pro (12.9-inch) (3rd generation)'.freeze
+
+  # Deprecated: Use IosDeviceName::IPad_Pro_11_inch_4 instead.
+  # deprecate_constant :IPad_Pro_4 not allow to point to new version (
+  IPad_Pro_4 = 'iPad Pro (11-inch) (4th generation)'.freeze
+  IPad_Pro_11_inch_4 = 'iPad Pro (11-inch) (4th generation)'.freeze
+  IPhone_SE_2 = 'iPhone SE (2nd generation)'.freeze
+  IPhone_SE_3 = 'iPhone SE (3rd generation)'.freeze
+  IPhone_XR = 'iPhone XR'.freeze
+
+  # Deprecated: Use IosDeviceName::IPhone_Xs instead.
+  # deprecate_constant :IPhone_XS not allow to point to new version (
+  IPhone_XS = 'iPhone Xs'.freeze
+  IPhone_Xs = 'iPhone Xs'.freeze
+  IPhone_11 = 'iPhone 11'.freeze
+  IPhone_11_Pro_Max = 'iPhone 11 Pro Max'.freeze
+  IPhone_11_Pro = 'iPhone 11 Pro'.freeze
+  IPhone_12 = 'iPhone 12'.freeze
+  IPhone_12_mini = 'iPhone 12 mini'.freeze
+  IPhone_12_Pro_Max = 'iPhone 12 Pro Max'.freeze
+  IPhone_12_Pro = 'iPhone 12 Pro'.freeze
+  IPhone_13 = 'iPhone 13'.freeze
+  IPhone_13_mini = 'iPhone 13 mini'.freeze
+  IPhone_13_Pro_Max = 'iPhone 13 Pro Max'.freeze
+  IPhone_13_Pro = 'iPhone 13 Pro'.freeze
+  IPhone_14 = 'iPhone 14'.freeze
+  IPhone_14_Pro_Max = 'iPhone 14 Pro Max'.freeze
+  IPhone_14_Pro = 'iPhone 14 Pro'.freeze
+  IPhone_14_Plus = 'iPhone 14 Plus'.freeze
+  IPhone_15 = 'iPhone 15'.freeze
+  IPhone_15_Pro_Max = 'iPhone 15 Pro Max'.freeze
+  IPhone_15_Pro = 'iPhone 15 Pro'.freeze
+  IPhone_15_Plus = 'iPhone 15 Plus'.freeze
+  IPhone_16 = 'iPhone 16'.freeze
+  IPhone_16_Pro_Max = 'iPhone 16 Pro Max'.freeze
+  IPhone_16_Pro = 'iPhone 16 Pro'.freeze
+  IPhone_16_Plus = 'iPhone 16 Plus'.freeze
+
+  def enum_values
+    [
+      IPad_7,
+      IPad_9,
+      IPad_10,
+      IPad_mini_6,
+      IPad_Air_4,
+      IPad_Pro_3, # Deprecated: Use IosDeviceName::IPad_Pro_12_9_inch_3 instead.
+      IPad_Pro_12_9_inch_3,
+      IPad_Pro_4, # Deprecated: Use IosDeviceName::IPad_Pro_11_inch_4 instead.
+      IPad_Pro_11_inch_4,
+      IPhone_SE_2,
+      IPhone_SE_3,
+      IPhone_XR,
+      IPhone_XS, # Deprecated: Use IosDeviceName::IPhone_Xs instead.
+      IPhone_Xs,
+      IPhone_11,
+      IPhone_11_Pro_Max,
+      IPhone_11_Pro,
+      IPhone_12,
+      IPhone_12_mini,
+      IPhone_12_Pro_Max,
+      IPhone_12_Pro,
+      IPhone_13,
+      IPhone_13_mini,
+      IPhone_13_Pro_Max,
+      IPhone_13_Pro,
+      IPhone_14,
+      IPhone_14_Pro_Max,
+      IPhone_14_Pro,
+      IPhone_14_Plus,
+      IPhone_15,
+      IPhone_15_Pro_Max,
+      IPhone_15_Pro,
+      IPhone_15_Plus,
+      IPhone_16,
+      IPhone_16_Pro_Max,
+      IPhone_16_Pro,
+      IPhone_16_Plus,
+    ]
+  end
+end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'state_machine'
+require 'state_machines'
 require 'digest'
 require 'applitools/selenium/visual_grid/render_task'
 

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

@@ -58,7 +58,8 @@ module Applitools
       end
 
       def init_or_renew_threads
-        (concurrency - @thread_group.list.count).times do
+        one_concurrency = 1 # Thread's moved to universal server
+        (one_concurrency - @thread_group.list.count).times do
           logger.debug 'starting new thread (task worker)'
           next_thread
         end

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

@@ -2,7 +2,7 @@
 
 require 'base64'
 require 'digest'
-require 'nokogiri'
+# require 'nokogiri'
 
 module Applitools
   module Selenium
@@ -58,11 +58,12 @@ module Applitools
 
       def lookup_for_svg_resources
         return unless %r{^image/svg\+xml} =~ content_type && handle_discovered_resources_block
-        attrs = Nokogiri::XML(content)
-                        .xpath("//@*[namespace-uri(.) = 'http://www.w3.org/1999/xlink'] | //@href")
-                        .select { |a| a.name == 'href' }
-                        .map(&:value)
-                        .select { |a| /^(?!#).*/.match(a) }
+        attrs = []
+        # attrs = Nokogiri::XML(content)
+        #                 .xpath("//@*[namespace-uri(.) = 'http://www.w3.org/1999/xlink'] | //@href")
+        #                 .select { |a| a.name == 'href' }
+        #                 .map(&:value)
+        #                 .select { |a| /^(?!#).*/.match(a) }
         handle_discovered_resources_block.call(attrs, url)
       end
 

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

@@ -7,6 +7,13 @@ require 'securerandom'
 module Applitools
   module Selenium
     class VisualGridEyes
+      # new open, with eyes-manager
+      include Applitools::UniversalEyesOpen
+      # all checks here
+      include Applitools::UniversalEyesChecks
+      # add extract_text, extract_text_regions, locate
+      include Applitools::UniversalNewApi
+
       include Applitools::Selenium::Concerns::SeleniumEyes
       USE_DEFAULT_MATCH_TIMEOUT = -1
       extend Forwardable
@@ -15,6 +22,7 @@ module Applitools
 
       attr_accessor :visual_grid_manager, :driver, :current_url, :current_config, :fetched_cache_map,
         :utils,
+        :enable_patterns,
         :config, :driver_lock, :test_uuid, :dont_get_title
       attr_accessor :test_list
 
@@ -26,6 +34,10 @@ module Applitools
       def_delegators 'config', *Applitools::Selenium::Configuration.methods_to_delegate
       def_delegators 'config', *Applitools::EyesBaseConfiguration.methods_to_delegate
 
+      alias runner visual_grid_manager
+      attr_accessor :universal_eyes, :universal_driver
+      attr_accessor :debug_screenshots, :save_failed_tests, :scale_ratio, :disabled, :stitching_overlap, :compare_with_parent_branch
+
       def initialize(visual_grid_manager, server_url = nil)
         ensure_config
         @server_connector = Applitools::Connectivity::ServerConnector.new(server_url)
@@ -41,8 +53,16 @@ module Applitools
         self.utils = Applitools::Utils::EyesSeleniumUtils
       end
 
+      def self.environment_sdk
+        {
+          name: :eyes_selenium,
+          currentVersion: Applitools::EyesSelenium::VERSION
+        }
+      end
+
       def ensure_config
         self.config = Applitools::Selenium::Configuration.new
+        self.send_dom = true
       end
 
       def full_agent_id
@@ -56,51 +76,61 @@ module Applitools
       end
 
       def open(*args)
-        self.test_uuid = SecureRandom.uuid
+        # visual_grid_manager.add_batch(batch.id) { visual_grid_manager.close_batch(batch.id) }
+        # self.test_uuid = SecureRandom.uuid
         options = Applitools::Utils.extract_options!(args)
-        Applitools::ArgumentGuard.hash(options, 'options', [:driver])
-
-        config.app_name = options[:app_name] if options[:app_name]
-        config.test_name = options[:test_name] if options[:test_name]
-        config.agent_run_id = "#{config.test_name}--#{SecureRandom.hex(10)}"
-
-        if config.viewport_size.nil? || config.viewport_size && config.viewport_size.empty?
-          config.viewport_size = Applitools::RectangleSize.from_any_argument(options[:viewport_size]) if options[:viewport_size]
-        end
-
-        self.driver = Applitools::Selenium::SeleniumEyes.eyes_driver(options.delete(:driver), self)
-        self.current_url = driver.current_url
-
-        if viewport_size
-          set_viewport_size(viewport_size)
-        else
-          self.viewport_size = get_viewport_size
-        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
-        logger.info('Creating test descriptors for each browser info...')
-        browsers_info_list.each(viewport_size) do |bi|
-          test = Applitools::Selenium::RunningTest.new(eyes_connector, bi, driver).tap do |t|
-            t.on_results_received do |results|
-              visual_grid_manager.aggregate_result(results)
-            end
-            t.test_uuid = test_uuid
-          end
-          test_list.push test
-        end
-        self.opened = true
-        driver
+        universal_open(options)
+        # Applitools::ArgumentGuard.hash(options, 'options', [:driver])
+        #
+        # config.app_name = options[:app_name] if options[:app_name]
+        # config.test_name = options[:test_name] if options[:test_name]
+        # config.agent_run_id = "#{config.test_name}--#{SecureRandom.hex(10)}"
+        #
+        # if config.viewport_size.nil? || config.viewport_size && config.viewport_size.empty?
+        #   config.viewport_size = Applitools::RectangleSize.from_any_argument(options[:viewport_size]) if options[:viewport_size]
+        # end
+        #
+        # self.driver = Applitools::Selenium::SeleniumEyes.eyes_driver(options.delete(:driver), self)
+        # self.current_url = driver.current_url
+        #
+        # if viewport_size
+        #   set_viewport_size(viewport_size)
+        # else
+        #   self.viewport_size = get_viewport_size
+        # 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
+        # logger.info('Creating test descriptors for each browser info...')
+        # browsers_info_list.each(viewport_size) do |bi|
+        #   test = Applitools::Selenium::RunningTest.new(eyes_connector, bi, driver).tap do |t|
+        #     t.on_results_received do |results|
+        #       visual_grid_manager.aggregate_result(results)
+        #     end
+        #     t.test_uuid = test_uuid
+        #   end
+        #   test_list.push test
+        # end
+        # self.opened = true
+        # driver
       end
 
       def get_viewport_size(web_driver = driver)
         Applitools::ArgumentGuard.not_nil 'web_driver', web_driver
-        self.utils.extract_viewport_size(driver)
+        # self.utils.extract_viewport_size(driver)
+        driver_config_json = universal_driver_config(web_driver)
+
+        Applitools::EyesLogger.debug 'extract_viewport_size()'
+        viewport_size = runner.universal_client.core_get_viewport_size(driver_config_json)
+        result = Applitools::RectangleSize.new viewport_size[:width], viewport_size[:height]
+
+        Applitools::EyesLogger.debug "Viewport size is #{result}."
+        result
       end
 
       def eyes_connector
@@ -127,6 +157,8 @@ module Applitools
         render_task = nil
         target.default_full_page_for_vg
 
+        return universal_check(tag, target)
+
         target_to_check = target.finalize
         begin
           check_in_frame(target_frames: target_to_check.frames) do
@@ -292,26 +324,67 @@ module Applitools
       end
 
       def close_async
-        test_list.each(&:close)
+        # test_list.each(&:close)
+        close(false)
       end
 
       def close(throw_exception = true)
-        return false if test_list.empty?
-        close_async
+        logger.info "close(#{throw_exception})"
+        logger.info 'Ending server session...'
 
-        until (states = test_list.map(&:state_name).uniq).count == 1 && states.first == :completed
-          sleep 0.5
-        end
+        raise Applitools::EyesNotOpenException.new 'Eyes not open' unless open?
+        universal_results = universal_eyes.close # Array even for one test
         self.opened = false
+        all_results = get_results(throw_exception)
+        # universal_results = universal_eyes.eyes_get_results # Array even for one test
+        # # require 'pry'
+        # # binding.pry
+        # raise Applitools::EyesError.new("Request failed: #{universal_results[:message]}") if server_error?(universal_results)
+        # results = universal_results.map {|result| Applitools::TestResults.new(result) }
+        # # results = results.first if results.size == 1
+        # # session_results_url = results.url
+        # all_results = results.compact
+
+
+        # return false if test_list.empty?
+        # close_async
+        #
+        # until (states = test_list.map(&:state_name).uniq).count == 1 && states.first == :completed
+        #   sleep 0.5
+        # end
+        # self.opened = false
+        #
+        # test_list.select { |t| t.pending_exceptions && !t.pending_exceptions.empty? }.each do |t|
+        #   t.pending_exceptions.each do |e|
+        #     raise e
+        #   end
+        # end
+        #
+        # all_results = test_list.map(&:test_result).compact
+        # failed_results = all_results.select { |r| !r.as_expected? }
+        #
+        # if throw_exception
+        #   all_results.each do |r|
+        #     raise Applitools::NewTestError.new new_test_error_message(r), r if r.new?
+        #     raise Applitools::DiffsFoundError.new diffs_found_error_message(r), r if r.unresolved? && !r.new?
+        #     raise Applitools::TestFailedError.new test_failed_error_message(r), r if r.failed?
+        #   end
+        # end
+
+        # failed_results.empty? ? all_results.first : failed_results.first
+        all_results.first
+      end
 
-        test_list.select { |t| t.pending_exceptions && !t.pending_exceptions.empty? }.each do |t|
-          t.pending_exceptions.each do |e|
-            raise e
-          end
-        end
+      def get_results(throw_exception = true)
+        logger.info "get_results(#{throw_exception})"
+        logger.info 'Getting results...'
 
-        all_results = test_list.map(&:test_result).compact
-        failed_results = all_results.select { |r| !r.as_expected? }
+        universal_results = universal_eyes.eyes_get_results # Array even for one test
+        # require 'pry'
+        # binding.pry
+        raise Applitools::EyesError.new("Request failed: #{universal_results[:message]}") if server_error?(universal_results)
+        results = universal_results.map {|result| Applitools::TestResults.new(result) }
+        all_results = results.compact
 
         if throw_exception
           all_results.each do |r|
@@ -320,17 +393,18 @@ module Applitools
             raise Applitools::TestFailedError.new test_failed_error_message(r), r if r.failed?
           end
         end
-
-        failed_results.empty? ? all_results.first : failed_results
+        all_results
       end
 
       def abort_async
         test_list.each(&:abort)
+        universal_sdk_abort
       end
 
       def abort_if_not_closed
         self.opened = false
         test_list.each(&:abort)
+        universal_sdk_abort
       end
 
       alias abort abort_if_not_closed
@@ -347,6 +421,8 @@ module Applitools
 
       # rubocop:disable Style/AccessorMethodName
       def set_viewport_size(value)
+        # require('pry')
+        # binding.pry
         self.utils.set_viewport_size driver, value
       rescue => e
         logger.error e.class.to_s
@@ -398,6 +474,14 @@ module Applitools
 
       def add_text_trigger(_control, _text); end
 
+      def disabled=(value)
+        @disabled = Applitools::Utils.boolean_value value
+      end
+
+      def disabled?
+        @disabled
+      end
+
       private :new_test_error_message, :diffs_found_error_message, :test_failed_error_message
 
       private

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

@@ -9,8 +9,8 @@ module Applitools
 
       alias queue render_queue
 
-      def initialize(concurrent_open_sessions = 10)
-        super()
+      def initialize(concurrent_open_sessions = 10, mask_log = false)
+        super(mask_log=mask_log)
         self.all_eyes = []
         self.render_queue = []
         @thread_pool = Applitools::Selenium::VGThreadPool.new(concurrent_open_sessions)
@@ -61,6 +61,10 @@ module Applitools
         super
       end
 
+      def universal_eyes_manager_config
+        Applitools::UniversalEyesManagerConfig.vg(@thread_pool.concurrency)
+      end
+
       private
 
       def all_running_tests

data/lib/eyes_selenium.rb

@@ -12,8 +12,11 @@ module Applitools
   module Selenium
     extend Applitools::RequireUtils
     class UnsupportedCoordinateType < EyesError; end
-    def self.load_dir
-      File.dirname(File.expand_path(__FILE__))
+    def self.require_dir(dir)
+      load_dir = File.dirname(File.expand_path(__FILE__))
+      Dir[File.join(load_dir, 'applitools', dir, '*.rb')].sort.each do |f|
+        require f
+      end
     end
   end
 end
@@ -21,6 +24,7 @@ end
 Applitools::Selenium.require_dir 'selenium/concerns'
 Applitools::Selenium.require_dir 'selenium/scripts'
 Applitools::Selenium.require_dir 'selenium'
+Applitools::Selenium.require_dir 'eyes_selenium'
 Applitools::Selenium.require_dir 'selenium/visual_grid'
 Applitools::Selenium.require_dir 'selenium/dom_capture'
 Applitools::Selenium.require_dir 'selenium/css_parser'
@@ -31,5 +35,22 @@ if defined? Selenium::WebDriver::Driver
       is_mobile_device = capabilities['platformName'] ? true : false
       Applitools::Selenium::Driver.new(eyes, driver: self, is_mobile_device: is_mobile_device)
     end
+
+    def universal_driver_config
+      hidden_server_url = bridge.http.send(:server_url).to_s
+      if respond_to?(:session_id)
+        {
+          serverUrl: hidden_server_url,
+          sessionId: session_id,
+          capabilities: capabilities.as_json
+        }
+      else
+        {
+          serverUrl: hidden_server_url,
+          sessionId: bridge.session_id,
+          capabilities: capabilities.as_json
+        }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.18.4
+  version: 6.9.0
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eyes_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.18.4
+        version: 6.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.18.4
+        version: 6.7.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: state_machine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: state_machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,6 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- Rakefile
+- eyes_selenium.gemspec
+- lib/applitools/eyes_selenium/version.rb
 - lib/applitools/selenium/border_aware_element_content_location_provider.rb
 - lib/applitools/selenium/browser.rb
 - lib/applitools/selenium/browser_types.rb
@@ -112,6 +102,7 @@ files:
 - lib/applitools/selenium/css_transform/css_transform.rb
 - lib/applitools/selenium/css_translate_element_position_provider.rb
 - lib/applitools/selenium/css_translate_position_provider.rb
+- lib/applitools/selenium/device_name_generated.rb
 - lib/applitools/selenium/devices.rb
 - lib/applitools/selenium/dom_capture/dom_capture.rb
 - lib/applitools/selenium/dom_capture/dom_capture_script.rb
@@ -141,8 +132,6 @@ files:
 - lib/applitools/selenium/scripts/.gitignore
 - lib/applitools/selenium/scripts/get_element_xpath.rb
 - lib/applitools/selenium/scripts/package.json
-- lib/applitools/selenium/scripts/process_page_and_poll.rb
-- lib/applitools/selenium/scripts/templates.rb
 - lib/applitools/selenium/scroll_position_provider.rb
 - lib/applitools/selenium/selenium_eyes.rb
 - lib/applitools/selenium/stitch_modes.rb
@@ -159,6 +148,7 @@ files:
 - lib/applitools/selenium/visual_grid/i_render_browser_info.rb
 - lib/applitools/selenium/visual_grid/ios_device_info.rb
 - lib/applitools/selenium/visual_grid/ios_device_name.rb
+- lib/applitools/selenium/visual_grid/ios_device_name_generated.rb
 - lib/applitools/selenium/visual_grid/render_browser_info.rb
 - lib/applitools/selenium/visual_grid/render_info.rb
 - lib/applitools/selenium/visual_grid/render_request.rb
@@ -174,7 +164,6 @@ files:
 - lib/applitools/selenium/visual_grid/visual_grid_eyes.rb
 - lib/applitools/selenium/visual_grid/visual_grid_runner.rb
 - lib/applitools/selenium/visual_grid/web_element_region.rb
-- lib/applitools/version.rb
 - lib/eyes_selenium.rb
 homepage: https://www.applitools.com
 licenses:
@@ -195,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Applitools Ruby Selenium SDK