eyes_selenium 4.6.3 → 6.0.4

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

@@ -1,54 +1,6 @@
+require_relative 'ios_device_name_generated'
+
 module IosDeviceName
+  include IosDeviceNameGenerated
   extend self
-  IPhone_14 = 'iPhone 14'
-  IPhone_14_Pro_Max = 'iPhone 14 Pro Max'
-  IPhone_13_Pro_Max = 'iPhone 13 Pro Max'
-  IPhone_13_Pro = 'iPhone 13 Pro'
-  IPhone_13 = 'iPhone 13'
-  IPhone_12_Pro_Max = 'iPhone 12 Pro Max'
-  IPhone_12_Pro = 'iPhone 12 Pro'
-  IPhone_12 = 'iPhone 12'
-  IPhone_12_mini = 'iPhone 12 mini'
-  IPhone_11_Pro = 'iPhone 11 Pro'
-  IPhone_11_Pro_Max = 'iPhone 11 Pro Max'
-  IPhone_11 = 'iPhone 11'
-  IPhone_XR = 'iPhone XR'
-  IPhone_XS =  'iPhone Xs'
-  IPhone_X = 'iPhone X'
-  IPhone_8 = 'iPhone 8'
-  IPhone_7 = 'iPhone 7'
-  IPad_Pro_3 = 'iPad Pro (12.9-inch) (3rd generation)'
-  IPad_7 = 'iPad (7th generation)'
-  IPad_9 = 'iPad (9th generation)'
-  IPad_Air_2 = 'iPad Air (2nd generation)'
-  IPhone_8_Plus = 'iPhone 8 Plus'
-  IPhone_SE = 'iPhone SE (1st generation)'
-
-  def enum_values
-    [
-      IPhone_14,
-      IPhone_14_Pro_Max,
-      IPhone_13_Pro_Max,
-      IPhone_13_Pro,
-      IPhone_13,
-      IPhone_12_Pro_Max,
-      IPhone_12_Pro,
-      IPhone_12,
-      IPhone_12_mini,
-      IPhone_11_Pro,
-      IPhone_11_Pro_Max,
-      IPhone_11,
-      IPhone_XR,
-      IPhone_XS,
-      IPhone_X,
-      IPhone_8,
-      IPhone_7,
-      IPad_Pro_3,
-      IPad_7,
-      IPad_9,
-      IPad_Air_2,
-      IPhone_8_Plus,
-      IPhone_SE
-    ]
-  end
 end

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

@@ -0,0 +1,146 @@
+# GENERATED FILE #
+
+module IosDeviceNameGenerated
+  extend self
+  IPad_5 = 'iPad (5th generation)'.freeze
+  IPad_6 = 'iPad (6th generation)'.freeze
+  IPad_7 = 'iPad (7th generation)'.freeze
+  IPad_8 = 'iPad (8th generation)'.freeze
+  IPad_9 = 'iPad (9th generation)'.freeze
+  IPad_10 = 'iPad (10th generation)'.freeze
+  IPad_Air_2 = 'iPad Air 2'.freeze
+  IPad_Air_3 = 'iPad Air (3rd generation)'.freeze
+  IPad_Air_4 = 'iPad Air (4th generation)'.freeze
+  IPad_Air_5 = 'iPad Air (5th generation)'.freeze
+  IPad_mini_4 = 'iPad mini 4'.freeze
+  IPad_mini_5 = 'iPad mini (5th generation)'.freeze
+  IPad_mini_6 = 'iPad mini (6th generation)'.freeze
+  IPad_Pro_9_7_inch_1 = 'iPad Pro (9.7-inch)'.freeze
+  IPad_Pro_10_5_inch_1 = 'iPad Pro (10.5-inch)'.freeze
+  IPad_Pro_11_inch_1 = 'iPad Pro (11-inch) (1st generation)'.freeze
+  IPad_Pro_12_9_inch_1 = 'iPad Pro (12.9-inch) (1st generation)'.freeze
+  IPad_Pro_11_inch_2 = 'iPad Pro (11-inch) (2nd generation)'.freeze
+  IPad_Pro_12_9_inch_2 = 'iPad Pro (12.9-inch) (2nd generation)'.freeze
+  IPad_Pro_11_inch_3 = 'iPad Pro (11-inch) (3rd 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
+  IPad_Pro_12_9_inch_4 = 'iPad Pro (12.9-inch) (4th generation)'.freeze
+  IPad_Pro_12_9_inch_5 = 'iPad Pro (12.9-inch) (5th generation)'.freeze
+  IPad_Pro_12_9_inch_6 = 'iPad Pro (12.9-inch) (6th generation)'.freeze
+  IPhone_6s = 'iPhone 6s'.freeze
+  IPhone_6s_Plus = 'iPhone 6s Plus'.freeze
+  IPhone_7 = 'iPhone 7'.freeze
+  IPhone_7_Plus = 'iPhone 7 Plus'.freeze
+  IPhone_8 = 'iPhone 8'.freeze
+  IPhone_8_Plus = 'iPhone 8 Plus'.freeze
+  IPhone_X = 'iPhone X'.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_Xs_Max = 'iPhone Xs Max'.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_Plus = 'iPhone 14 Plus'.freeze
+  IPhone_14_Pro = 'iPhone 14 Pro'.freeze
+  IPhone_14_Pro_Max = 'iPhone 14 Pro Max'.freeze
+  IPhone_15 = 'iPhone 15'.freeze
+  IPhone_15_Plus = 'iPhone 15 Plus'.freeze
+  IPhone_15_Pro = 'iPhone 15 Pro'.freeze
+  IPhone_15_Pro_Max = 'iPhone 15 Pro Max'.freeze
+
+  # Deprecated: Use IosDeviceName::IPhone_SE_1 instead.
+  # deprecate_constant :IPhone_SE not allow to point to new version (
+  IPhone_SE = 'iPhone SE (1st generation)'.freeze
+  IPhone_SE_1 = 'iPhone SE (1st generation)'.freeze
+  IPhone_SE_2 = 'iPhone SE (2nd generation)'.freeze
+  IPhone_SE_3 = 'iPhone SE (3rd generation)'.freeze
+  IPod_touch_7 = 'iPod touch (7th generation)'.freeze
+
+  def enum_values
+    [
+      IPad_5,
+      IPad_6,
+      IPad_7,
+      IPad_8,
+      IPad_9,
+      IPad_10,
+      IPad_Air_2,
+      IPad_Air_3,
+      IPad_Air_4,
+      IPad_Air_5,
+      IPad_mini_4,
+      IPad_mini_5,
+      IPad_mini_6,
+      IPad_Pro_9_7_inch_1,
+      IPad_Pro_10_5_inch_1,
+      IPad_Pro_11_inch_1,
+      IPad_Pro_12_9_inch_1,
+      IPad_Pro_11_inch_2,
+      IPad_Pro_12_9_inch_2,
+      IPad_Pro_11_inch_3,
+      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,
+      IPad_Pro_12_9_inch_4,
+      IPad_Pro_12_9_inch_5,
+      IPad_Pro_12_9_inch_6,
+      IPhone_6s,
+      IPhone_6s_Plus,
+      IPhone_7,
+      IPhone_7_Plus,
+      IPhone_8,
+      IPhone_8_Plus,
+      IPhone_X,
+      IPhone_XR,
+      IPhone_XS, # Deprecated: Use IosDeviceName::IPhone_Xs instead.
+      IPhone_Xs,
+      IPhone_Xs_Max,
+      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_Plus,
+      IPhone_14_Pro,
+      IPhone_14_Pro_Max,
+      IPhone_15,
+      IPhone_15_Plus,
+      IPhone_15_Pro,
+      IPhone_15_Pro_Max,
+      IPhone_SE, # Deprecated: Use IosDeviceName::IPhone_SE_1 instead.
+      IPhone_SE_1,
+      IPhone_SE_2,
+      IPhone_SE_3,
+      IPod_touch_7,
+    ]
+  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/visual_grid_eyes.rb

@@ -53,6 +53,13 @@ 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
@@ -317,23 +324,26 @@ module Applitools
       end
 
       def close_async
-        test_list.each(&:close)
+        # test_list.each(&:close)
+        close(false)
       end
 
       def close(throw_exception = true)
         logger.info "close(#{throw_exception})"
         logger.info 'Ending server session...'
 
+        raise Applitools::EyesNotOpenException.new 'Eyes not open' unless open?
         universal_results = universal_eyes.close # Array even for one test
-        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)
-        key_transformed_results = Applitools::Utils.deep_stringify_keys(universal_results)
-        results = key_transformed_results.map {|result| Applitools::TestResults.new(result) }
-        # results = results.first if results.size == 1
-        # session_results_url = results.url
-        all_results = results.compact
+        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?
@@ -351,7 +361,30 @@ module Applitools
         # end
         #
         # all_results = test_list.map(&:test_result).compact
-        failed_results = all_results.select { |r| !r.as_expected? }
+        # 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
+
+      def get_results(throw_exception = true)
+        logger.info "get_results(#{throw_exception})"
+        logger.info 'Getting results...'
+
+        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|
@@ -360,8 +393,7 @@ 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.first
+        all_results
       end
 
       def abort_async

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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 6.0.4
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eyes_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.3
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.3
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: state_machine
+  name: state_machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,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
@@ -98,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
@@ -127,7 +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/templates.rb
 - lib/applitools/selenium/scroll_position_provider.rb
 - lib/applitools/selenium/selenium_eyes.rb
 - lib/applitools/selenium/stitch_modes.rb
@@ -138,6 +142,7 @@ files:
 - lib/applitools/selenium/viewport_size.rb
 - lib/applitools/selenium/visual_grid/android_device_info.rb
 - lib/applitools/selenium/visual_grid/android_device_name.rb
+- lib/applitools/selenium/visual_grid/android_device_name_generated.rb
 - lib/applitools/selenium/visual_grid/chrome_emulation_info.rb
 - lib/applitools/selenium/visual_grid/desktop_browser_info.rb
 - lib/applitools/selenium/visual_grid/dom_snapshot_script.rb
@@ -146,6 +151,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
@@ -161,7 +167,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:
@@ -182,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Applitools Ruby Selenium SDK

data/lib/applitools/selenium/scripts/templates.rb

@@ -1,34 +0,0 @@
-module Applitools
-  module Selenium
-    module ScriptTemplates
-      extend self
-      def get_script_by_file_name(fname)
-        script = nil
-        return script unless Dir.exist?(Applitools::JS_PATH)
-        begin
-          Dir.chdir(Applitools::JS_PATH) do
-            script = File.open(File.join('@applitools', 'dom-snapshot', 'dist', "#{fname}.js"), 'r').read
-          end
-        rescue StandardError => e
-          puts e.class
-          puts e.message
-          script = ''
-        end
-        script
-      end
-
-      # JS_FILES_PATH = File.join(Applitools::JS_PATH, '@applitools', 'dom-snapshot', 'dist')
-      #       PROCESS_PAGE_AND_POLL_RB = <<"SCRIPT"
-      # module Applitools
-      #   module Selenium
-      #     module Scripts
-      #       PROCESS_PAGE_AND_POLL = <<'END'
-      # #{get_script_by_file_name('processPageAndSerializePoll')}
-      # END
-      #     end
-      #   end
-      # end
-      # SCRIPT
-    end
-  end
-end

data/lib/applitools/version.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: false
-
-module Applitools
-  VERSION = '4.6.3'.freeze
-  IMAGES_VERSION = '4.2.3'.freeze
-  UNIVERSAL_VERSION = '3.3.3'.freeze
-  UNIVERSAL_CORE_VERSION = '3.4.0'.freeze
-end