eyes_selenium 3.18.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ccb7f5efa22529a7e4c6ccb5eb34ef10683b69
-  data.tar.gz: 208dde54c3bbe68af480611a83cfe9e3be4da657
+  metadata.gz: 6113bd2ae73e1528d34e7baa3b214229c4b8a769
+  data.tar.gz: 6125a07ef83c8ab83fa807ca8c9d23b60df8ee34
 SHA512:
-  metadata.gz: 03ea9618ef302c13cff3e4ced73d754c1c6b739eea21cb4b68ea8fce2833783385a45af4797d42eccc8e69e39e048df90259e55362100d2f0aed999e915fe7e8
-  data.tar.gz: bf3feae675187d86d481ef51b9650a651f6b95ae229d0ec3d15641031f8327c3628aaf98df687b7c03fb96cd0226081889f51f126632993c5009f801e9c9912f
+  metadata.gz: 1f0dae57a3d2970bd92d04bfc8f07937ce53dbe76797da7e27481a9cfaa5597957d7722eea7a1ecaf860dbf0e9f70d17db5a67cac108a253d8b27c1a9c04c3fa
+  data.tar.gz: 4aa3ec4b57e6b645ecfcffcb45d24dc083d7b8c6b3c2dd498d1970a85eef33624b903ad4194b8773b984ad217ddf7108a91f8b02b4c493e6f36dfb47b511dbc8

data/lib/applitools/selenium/browser_types.rb

@@ -12,21 +12,21 @@ module BrowserTypes
 end
 module BrowserType
   extend self
-  CHROME = :'chrome-0'
-  CHROME_ONE_VERSION_BACK = :'chrome-1'
-  CHROME_TWO_VERSIONS_BACK = :'chrome-2'
+  CHROME = :'chrome'
+  CHROME_ONE_VERSION_BACK = :'chrome-one-version-back'
+  CHROME_TWO_VERSIONS_BACK = :'chrome-two-versions-back'
 
-  FIREFOX = :'firefox-0'
-  FIREFOX_ONE_VERSION_BACK = :'firefox-1'
-  FIREFOX_TWO_VERSIONS_BACK = :'firefox-2'
+  FIREFOX = :'firefox'
+  FIREFOX_ONE_VERSION_BACK = :'firefox-one-version-back'
+  FIREFOX_TWO_VERSIONS_BACK = :'firefox-two-versions-back'
 
-  SAFARI = :'safari-0'
-  SAFARI_ONE_VERSION_BACK = :'safari-1'
-  SAFARI_TWO_VERSIONS_BACK = :'safari-2'
+  SAFARI = :'safari'
+  SAFARI_ONE_VERSION_BACK = :'safari-one-version-back'
+  SAFARI_TWO_VERSIONS_BACK = :'safari-two-versions-back'
   IOS_SAFARI = :safari
 
   EDGE_CHROMIUM = :'edgechromium'
-  EDGE_CHROMIUM_ONE_VERSION_BACK = :'edgechromium-1'
+  EDGE_CHROMIUM_ONE_VERSION_BACK = :'edgechromium-one-version-back'
 
   IE_11 = :ie
   EDGE_LEGACY = :edgelegacy

data/lib/applitools/selenium/browsers_info.rb

@@ -21,6 +21,14 @@ module Applitools
         end
         yield(default)
       end
+
+      def to_hash
+        return nil if empty?
+        map(&:to_hash)
+        # require 'pry'
+        # binding.pry
+      end
+
     end
   end
 end

data/lib/applitools/selenium/concerns/selenium_eyes.rb

@@ -50,12 +50,8 @@ module Applitools
           fully = args.select { |a| a.is_a?(TrueClass) || a.is_a?(FalseClass) }.first
           target = Applitools::Selenium::Target.window.tap do |t|
             t.timeout(match_timeout || USE_DEFAULT_MATCH_TIMEOUT)
-            if is_a?(Applitools::Selenium::VisualGridEyes)
-              t.fully(true)
-            else
-              t.fully(force_full_page_screenshot)
-            end
-            t.fully(fully) unless fully.nil?
+            # fully = force_full_page_screenshot if fully.nil?
+            t.fully(fully) if !fully.nil?
           end
           check(tag, target)
         end

data/lib/applitools/selenium/configuration.rb

@@ -10,7 +10,7 @@ module Applitools
         {
           force_full_page_screenshot: false,
           wait_before_screenshots: 0.1,
-          stitch_mode: Applitools::Selenium::StitchModes::CSS,
+          # stitch_mode: Applitools::Selenium::StitchModes::CSS,
           hide_scrollbars: true,
           hide_caret: false,
           browsers_info: Applitools::Selenium::BrowsersInfo.new,

data/lib/applitools/selenium/css_transform/css_transform.rb

@@ -5,7 +5,7 @@ module Applitools
     private
 
     def get_position_from_transform(transform)
-      regexp = /^translate\(\s*(\-?)([\d, \.]+)px,\s*(\-?)([\d, \.]+)px\s*\)/
+      regexp = /^translate\(\s*(\-?)([\d, \.]+)px(?:,\s*(\-?)([\d, \.]+)px)?\s*\)/
       data = regexp.match(transform)
 
       raise Applitools::EyesError.new "Can't parse CSS transition: #{transform}!" unless data
@@ -13,7 +13,7 @@ module Applitools
       y = data[4].to_f.round
 
       x *= -1 unless data[1].empty?
-      y *= -1 unless data[3].empty?
+      y *= -1 unless data[3].nil? || data[3].empty?
 
       Applitools::Location.new(x, y)
     end

data/lib/applitools/selenium/devices.rb

@@ -1,45 +1,136 @@
 # frozen_string_literal: false
 module Devices
   extend self
+  BlackberryPlayBook = 'Blackberry PlayBook'.freeze
+  BlackBerryZ30 = 'BlackBerry Z30'.freeze
+  GalaxyA5 = 'Galaxy A5'.freeze
+  GalaxyNote10 = 'Galaxy Note 10'.freeze
+  GalaxyNote10Plus = 'Galaxy Note 10 Plus'.freeze
+  GalaxyNote2 = 'Galaxy Note 2'.freeze
+  GalaxyNote3 = 'Galaxy Note 3'.freeze
+  GalaxyNote4 = 'Galaxy Note 4'.freeze
+  GalaxyNote8 = 'Galaxy Note 8'.freeze
+  GalaxyNote9 = 'Galaxy Note 9'.freeze
+  GalaxyS3 = 'Galaxy S3'.freeze
+  GalaxyS5 = 'Galaxy S5'.freeze
+  GalaxyS8 = 'Galaxy S8'.freeze
+  GalaxyS8Plus = 'Galaxy S8 Plus'.freeze
+  GalaxyS9 = 'Galaxy S9'.freeze
+  GalaxyS9Plus = 'Galaxy S9 Plus'.freeze
+  GalaxyS10 = 'Galaxy S10'.freeze
+  GalaxyS10Plus = 'Galaxy S10 Plus'.freeze
+  GalaxyS20 = 'Galaxy S20'.freeze
+  IPad = 'iPad'.freeze
+  IPad6thGen = 'iPad 6th Gen'.freeze
+  IPad7thGen = 'iPad 7th Gen'.freeze
+  IPadAir2 = 'iPad Air 2'.freeze
+  IPadMini = 'iPad Mini'.freeze
+  IPadPro = 'iPad Pro'.freeze
+  IPhone11 = 'iPhone 11'.freeze
+  IPhone11Pro = 'iPhone 11 Pro'.freeze
+  IPhone11ProMax = 'iPhone 11 Pro Max'.freeze
   IPhone4 = 'iPhone 4'.freeze
   IPhone5SE = 'iPhone 5/SE'.freeze
   IPhone678 = 'iPhone 6/7/8'.freeze
   IPhone678Plus = 'iPhone 6/7/8 Plus'.freeze
   IPhoneX = 'iPhone X'.freeze
-  IPad = 'iPad'.freeze
-  IPadPro = 'iPad Pro'.freeze
-  BlackBerryZ30 = 'BlackBerry Z30'.freeze
+  IPhoneXR = 'iPhone XR'.freeze
+  IPhoneXS = 'iPhone XS'.freeze
+  IPhoneXSMax = 'iPhone XS Max'.freeze
+  KindleFireHDX = 'Kindle Fire HDX'.freeze
+  LaptopWithHIDPIScreen = 'Laptop with HiDPI screen'.freeze
+  LaptopWithMDPIScreen = 'Laptop with MDPI screen'.freeze
+  LaptopWithTouch = 'Laptop with touch'.freeze
+  LGG6 = 'LG G6'.freeze
+  LGOptimusL70 = 'LG Optimus L70'.freeze
+  MicrosoftLumia550 = 'Microsoft Lumia 550'.freeze
+  MicrosoftLumia950 = 'Microsoft Lumia 950'.freeze
+  Nexus10 = 'Nexus 10'.freeze
   Nexus4 = 'Nexus 4'.freeze
   Nexus5 = 'Nexus 5'.freeze
   Nexus5X = 'Nexus 5X'.freeze
   Nexus6 = 'Nexus 6'.freeze
   Nexus6P = 'Nexus 6P'.freeze
+  Nexus7 = 'Nexus 7'.freeze
+
+  NokiaLumia520 = 'Nokia Lumia 520'.freeze
+  NokiaN9 = 'Nokia N9'.freeze
+  OnePlus7T = 'OnePlus 7T'.freeze
+  OnePlus7TPro = 'OnePlus 7T Pro'.freeze
+  # OnePlus8 = 'OnePlus 8'.freeze
+  # OnePlus8Pro = 'OnePlus 8 Pro'.freeze
   Pixel2 = 'Pixel 2'.freeze
   Pixel2XL = 'Pixel 2 XL'.freeze
-  LGOptimusL70 = 'LG Optimus L70'.freeze
-  NokiaN9 = 'Nokia N9'.freeze
-  NokiaLumia520 = 'Nokia Lumia 520'.freeze
-  MicrosoftLumia550 = 'Microsoft Lumia 550'.freeze
-  MicrosoftLumia950 = 'Microsoft Lumia 950'.freeze
-  GalaxyS3 = 'Galaxy S III'.freeze
-  GalaxyS5 = 'Galaxy S5'.freeze
-  KindleFireHDX = 'Kindle Fire HDX'.freeze
-  IPadMini = 'iPad Mini'.freeze
-  BlackberryPlayBook = 'Blackberry PlayBook'.freeze
-  Nexus10 = 'Nexus 10'.freeze
-  Nexus7 = 'Nexus 7'.freeze
-  GalaxyNote3 = 'Galaxy Note 3'.freeze
-  GalaxyNote2 = 'Galaxy Note II'.freeze
-  LaptopWithTouch = 'Laptop with touch'.freeze
-  LaptopWithHDPIScreen = 'Laptop with HiDPI screen'.freeze
-  LaptopWithMDPIScreen = 'Laptop with MDPI screen'.freeze
+  Pixel3 = 'Pixel 3'.freeze
+  Pixel3XL = 'Pixel 3 XL'.freeze
+  Pixel4 = 'Pixel 4'.freeze
+  Pixel4XL = 'Pixel 4 XL'.freeze
+  Pixel5 = 'Pixel 5'.freeze
 
   def enum_values
     [
-      IPhone4, IPhone5SE, IPhone678, IPhone678Plus, IPhoneX, IPad, IPadPro, BlackBerryZ30, Nexus4, Nexus5, Nexus5X,
-      Nexus6, Nexus6P, Pixel2, Pixel2XL, LGOptimusL70, NokiaN9, NokiaLumia520, MicrosoftLumia550, MicrosoftLumia950,
-      GalaxyS3, GalaxyS5, KindleFireHDX, IPadMini, BlackberryPlayBook, Nexus10, Nexus7, GalaxyNote3, GalaxyNote2,
-      LaptopWithTouch, LaptopWithHDPIScreen, LaptopWithMDPIScreen
+      BlackberryPlayBook,
+      BlackBerryZ30,
+      GalaxyA5,
+      GalaxyNote10,
+      GalaxyNote10Plus,
+      GalaxyNote2,
+      GalaxyNote3,
+      GalaxyNote4,
+      GalaxyNote8,
+      GalaxyNote9,
+      GalaxyS3,
+      GalaxyS5,
+      GalaxyS8,
+      GalaxyS8Plus,
+      GalaxyS9,
+      GalaxyS9Plus,
+      GalaxyS10,
+      GalaxyS10Plus,
+      GalaxyS20,
+      IPad,
+      IPad6thGen,
+      IPad7thGen,
+      IPadAir2,
+      IPadMini,
+      IPadPro,
+      IPhone11,
+      IPhone11Pro,
+      IPhone11ProMax,
+      IPhone4,
+      IPhone5SE,
+      IPhone678,
+      IPhone678Plus,
+      IPhoneX,
+      IPhoneXR,
+      IPhoneXS,
+      IPhoneXSMax,
+      KindleFireHDX,
+      LaptopWithHIDPIScreen,
+      LaptopWithMDPIScreen,
+      LaptopWithTouch,
+      LGG6,
+      LGOptimusL70,
+      MicrosoftLumia550,
+      MicrosoftLumia950,
+      Nexus10,
+      Nexus4,
+      Nexus5,
+      Nexus5X,
+      Nexus6,
+      Nexus6P,
+      Nexus7,
+      NokiaLumia520,
+      NokiaN9,
+      OnePlus7T,
+      OnePlus7TPro,
+      Pixel2,
+      Pixel2XL,
+      Pixel3,
+      Pixel3XL,
+      Pixel4,
+      Pixel4XL,
+      Pixel5
     ]
   end
 end

data/lib/applitools/selenium/driver.rb

@@ -227,6 +227,22 @@ module Applitools::Selenium
       )
     end
 
+    def universal_driver_config
+      if respond_to?(:session_id)
+        {
+          serverUrl: server_url,
+          sessionId: session_id,
+          capabilities: capabilities.as_json
+        }
+      else
+        {
+          serverUrl: server_url,
+          sessionId: bridge.session_id,
+          capabilities: capabilities.as_json
+        }
+      end
+    end
+
     private
 
     attr_reader :cached_default_content_viewport_size
@@ -245,6 +261,10 @@ module Applitools::Selenium
       @driver ||= __getobj__
     end
 
+    def server_url
+      bridge.http.send(:server_url).to_s
+    end
+
     def extract_args(args)
       case args.size
       when 2

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) || options.delete(:runner)
+        runner = options.delete(:visual_grid_runner) || options.delete(:runner) || Applitools::ClassicRunner.new
         if runner.is_a? Applitools::Selenium::VisualGridRunner
           super Applitools::Selenium::VisualGridEyes.new(runner, server_url)
         else
-          super Applitools::Selenium::SeleniumEyes.new(server_url, runner: runner || Applitools::ClassicRunner.new)
+          super Applitools::Selenium::SeleniumEyes.new(server_url, runner: runner)
         end
       end
     end