eyes_selenium 3.15.40 → 3.15.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbee900cd3702aacc958add560a4ac3ecd307021f08926babf1b6269d0b5bacf
-  data.tar.gz: 9faadc80999564bfddae87dbb445239e9f8db6c9297f7eefc8e232e149aa00ba
+  metadata.gz: f93929f33d3e8aa38656484f5cda5c572289f4a7710ae041ac154da2ae5030e3
+  data.tar.gz: 01f2484ce2bb35a3e68d9833996bdf7d59fc7f244e2e688127283ce57d7c0b75
 SHA512:
-  metadata.gz: 89996f378e3540d53126e2392d18158eff4deec019a9a18d3030e65abb67b9265a29d220057ac15f56589bd88c903a8bc6685bccd73909a04ac6d1db190c16d6
-  data.tar.gz: 2513697371bdd3f4ee2dac36933b64cd7ae01730b28d1e7032f5a3c0e97a566279c01d731ce1891f82901685c6aa7a2dbfc269fa1a2345a205d6cf1fcec8a197
+  metadata.gz: 7e9110c797b43fb30b969b96c05c5f96033da7f6365b290376d6dbd96d70edeef018fa6bfa899cb3cf844552d3a5a93bec880bd634f4c9765b4348d61e9f7461
+  data.tar.gz: '0698188d685f8950b35ab1c80a26b96a3b402f03dc207ab09afde8f022192f23bfd8b0304c19440f34f18811f058178b5bacb97a5111a1d2e7fdb6de6d3e90f5'

data/lib/applitools/selenium/configuration.rb

@@ -14,7 +14,8 @@ module Applitools
           hide_scrollbars: false,
           hide_caret: false,
           browsers_info: Applitools::Selenium::BrowsersInfo.new,
-          accessibility_validation: Applitools::AccessibilityLevel::NONE
+          accessibility_validation: Applitools::AccessibilityLevel::NONE,
+          rendering_grid_force_put: (ENV['APPLITOOLS_RENDERING_GRID_FORCE_PUT'] || 'false').casecmp('true') == 0
         }
       end
       class << self
@@ -33,6 +34,7 @@ module Applitools
       object_field :browsers_info, Applitools::Selenium::BrowsersInfo
       int_field :concurrent_sessions
       enum_field :accessibility_validation, Applitools::AccessibilityLevel.enum_values
+      boolean_field :rendering_grid_force_put
 
       def match_level_keys
         super << :accessibility_validation

data/lib/applitools/selenium/css_parser/find_embedded_resources.rb

@@ -15,6 +15,7 @@ module Applitools
 
         def initialize(css)
           self.css = css
+          @nodes_by_type = {}
         end
 
         def imported_css
@@ -32,37 +33,61 @@ module Applitools
         private
 
         def url(node)
-          url = node[:tokens].select { |t| t[:node] == :url }.first
-          return url[:value] if url && !url.empty?
-          url = node[:tokens].select { |t| t[:node] == :function && t[:value] == 'url' }.first
-          url_index = node[:tokens].index(url)
-          url_string_node = url_index && node[:tokens][url_index + 1]
-          url_string_node &&
-            url_string_node[:node] == :string && !url_string_node[:value].empty? && url_string_node[:value]
+          result = []
+          node[:tokens].select { |t| t[:node] == :url }.uniq.each do |nd|
+            result << nd[:value] if nd && !nd.empty?
+          end
+          node[:tokens].select { |t| t[:node] == :function && t[:value] == 'url' }.uniq do |nd|
+            url_index = node[:tokens].index(nd)
+            url_string_node = url_index && node[:tokens][url_index + 1]
+            result << url_string_node &&
+              url_string_node[:node] == :string && !url_string_node[:value].empty? && url_string_node[:value]
+          end
+          result.compact
         end
 
         def fetch_urls(nodes)
-          nodes.map { |n| url(n) }.compact
+          nodes.map { |n| url(n) }.flatten.compact
         end
 
         def import_rules
-          css_nodes.select { |n| n[:node] == :at_rule && n[:name] == 'import' }
+          # css_nodes.select { |n| n[:node] == :at_rule && n[:name] == 'import' }
+          nodes_by_type[:import_rules]
         end
 
         def font_face_rules
-          css_nodes.select { |n| n[:node] == :at_rule && n[:name] == 'font-face' }
+          # css_nodes.select { |n| n[:node] == :at_rule && n[:name] == 'font-face' }
+          nodes_by_type[:font_face_rules]
         end
 
         def images_rules
-          css_nodes.select { |n| n[:node] == :style_rule }.map { |n| n[:children] }
-                   .flatten
-                   .select { |n| n[:node] == :property && (n[:name] == 'background' || n[:name] == 'background-image') }
+          # css_nodes.select { |n| n[:node] == :style_rule }.map { |n| n[:children] }
+          #          .flatten
+          #          .select { |n| n[:node] == :property && (n[:name] == 'background' || n[:name] == 'background-image') }
+          nodes_by_type[:images_rules]
         end
 
         def css_nodes
           @css_nodes ||= parse_nodes
         end
 
+        def nodes_by_type
+          return @nodes_by_type unless @nodes_by_type.empty?
+          css_nodes.each do |n|
+            @nodes_by_type[:import_rules] ||= []
+            @nodes_by_type[:font_face_rules] ||= []
+            @nodes_by_type[:images_rules] ||= []
+            @nodes_by_type[:import_rules] << n if n[:node] == :at_rule && n[:name] == 'import'
+            @nodes_by_type[:font_face_rules] << n if n[:node] == :at_rule && n[:name] == 'font-face'
+            @nodes_by_type[:images_rules] << n if n[:node] == :style_rule
+          end
+          @nodes_by_type[:images_rules].map! { |n| n[:children] }.flatten!
+          @nodes_by_type[:images_rules] = @nodes_by_type[:images_rules].select do |n|
+            n[:node] == :property && (n[:name] == 'background' || n[:name] == 'background-image')
+          end
+          @nodes_by_type
+        end
+
         def parse_nodes
           Crass.parse css
         end

data/lib/applitools/selenium/dom_capture/dom_capture.rb

@@ -72,7 +72,10 @@ module Applitools
           next if /^blob:/ =~ url
 
           begin
-            missing_css_response = server_connector.download_resource(url)
+            missing_css_response = server_connector.download_resource(
+              url,
+              Applitools::Utils::EyesSeleniumUtils.user_agent(driver)
+            )
             response_headers = missing_css_response.headers
             raise Applitools::EyesError, "Wrong response header: #{response_headers['content-type']}" unless
                 %r{^text/css.*}i =~ response_headers['content-type']

data/lib/applitools/selenium/target.rb

@@ -303,11 +303,13 @@ module Applitools
         self
       end
 
-      def script_hook(hook)
+      def before_render_screenshot_hook(hook)
         options[:script_hooks][:beforeCaptureScreenshot] = hook
         self
       end
 
+      alias script_hook before_render_screenshot_hook
+
       def finalize
         return self unless frame_or_element
         region = frame_or_element

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

@@ -5,7 +5,7 @@ module Applitools
       USE_DEFAULT_MATCH_TIMEOUT = -1
 
       attr_accessor :browser_info, :test_result, :driver, :dummy_region_provider, :dont_get_title,
-        :current_uuid, :render_statuses, :device_name, :driver_lock
+        :current_uuid, :render_statuses, :device_name, :driver_lock, :title
       public :server_connector
 
       class RegionProvider
@@ -33,6 +33,7 @@ module Applitools
         self.device_name = browser_info && browser_info.emulation_info && browser_info.emulation_info.device_name
         logger.info "opening EyesConnector for #{config.short_description} with viewport size: #{browser_info}"
         config.viewport_size = browser_info.viewport_size
+        title
         open_base
         # ensure_running_session
       end
@@ -138,7 +139,7 @@ module Applitools
       end
 
       def title
-        return driver.title unless dont_get_title
+        @title ||= driver.title unless dont_get_title
       rescue StandardError => e
         logger.warn "failed (#{e.message})"
         self.dont_get_title = false

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

@@ -6,12 +6,13 @@ module Applitools
     class RenderRequest
       include Applitools::Jsonable
       json_fields :renderId, :webhook, :url, :dom, :resources, :scriptHooks,
-        :selectorsToFindRegionsFor, :sendDom
+        :selectorsToFindRegionsFor, :sendDom, :agentId
 
       json_fields :renderInfo, :browser
 
       def initialize(*args)
         options = Applitools::Utils.extract_options! args
+        self.agent_id = "eyes.selenium.visualgrid.ruby/#{Applitools::VERSION}"
         self.script_hooks = {}
         self.selectors_to_find_regions_for = []
         options.keys.each do |k|

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

@@ -21,10 +21,10 @@ module Applitools
 
       attr_accessor :script, :running_tests, :resource_cache, :put_cache, :server_connector,
         :rendering_info, :request_resources, :dom_url_mod, :result, :region_selectors, :size_mode,
-        :region_to_check, :script_hooks, :visual_grid_manager, :discovered_resources
+        :region_to_check, :script_hooks, :visual_grid_manager, :discovered_resources, :ua_string, :force_put
 
       def initialize(name, script_result, visual_grid_manager, server_connector, region_selectors, size_mode,
-        region, script_hooks, mod = nil)
+        region, script_hooks, force_put, ua_string, mod = nil)
 
         self.result = nil
         self.script = script_result
@@ -37,9 +37,10 @@ module Applitools
         self.size_mode = size_mode
         self.region_to_check = region
         self.script_hooks = script_hooks if script_hooks.is_a?(Hash)
-
+        self.ua_string = ua_string
         self.dom_url_mod = mod
         self.running_tests = []
+        self.force_put = force_put
         @discovered_resources_lock = Mutex.new
         super(name) do
           perform
@@ -72,6 +73,22 @@ module Applitools
             cache_key = URI(dom_resource.url)
             cache_key.query = "modifier=#{dom_url_mod}" if dom_url_mod
 
+            if force_put
+              request_resources.each do |r, _v|
+                put_cache.fetch_and_store(URI(r)) do |_s|
+                  server_connector.render_put_resource(
+                    rendering_info['serviceUrl'],
+                    rendering_info['accessToken'],
+                    request_resources[r],
+                    running_render
+                  )
+                end
+              end
+              request_resources.each do |r, _v|
+                put_cache[r]
+              end
+            end
+
             if need_more_resources
               running_render['needMoreResources'].each do |resource_url|
                 put_cache.fetch_and_store(URI(resource_url)) do |_s|
@@ -148,7 +165,6 @@ module Applitools
       def prepare_data_for_rg(data)
         self.request_resources = Applitools::Selenium::RenderResources.new
         dom = parse_frame_dom_resources(data)
-
         prepare_rg_requests(running_tests, dom)
       end
 
@@ -159,7 +175,7 @@ module Applitools
 
         fetch_block = proc {}
 
-        handle_css_block = proc do |urls_to_fetch, url|
+        handle_resources_block = proc do |urls_to_fetch, url|
           urls_to_fetch.each do |discovered_url|
             target_url = self.class.apply_base_url(URI.parse(discovered_url), url)
             next unless /^http/i =~ target_url.scheme
@@ -171,7 +187,7 @@ module Applitools
         end
 
         fetch_block = proc do |_s, key|
-          resp_proc = proc { |u| server_connector.download_resource(u) }
+          resp_proc = proc { |u| server_connector.download_resource(u, ua_string) }
           retry_count = 3
           response = nil
           loop do
@@ -179,7 +195,11 @@ module Applitools
             response = resp_proc.call(key.dup)
             break unless response.status != 200 && retry_count > 0
           end
-          Applitools::Selenium::VGResource.parse_response(key.dup, response, on_css_fetched: handle_css_block)
+          Applitools::Selenium::VGResource.parse_response(
+            key.dup,
+            response,
+            on_resources_fetched: handle_resources_block
+          )
         end
 
         data['frames'].each do |f|
@@ -192,7 +212,7 @@ module Applitools
         end
 
         blobs.each do |blob|
-          blob.on_css_fetched(handle_css_block)
+          blob.on_resources_fetched(handle_resources_block)
           blob.lookup_for_resources
         end
 

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

@@ -133,7 +133,7 @@ module Applitools
       attr_accessor :open_queue, :task_queue, :render_queue, :close_queue, :watch_open, :watch_task,
         :watch_render, :watch_close
 
-      attr_accessor :eyes, :browser_info, :test_result, :pending_exceptions, :driver, :task_lock
+      attr_accessor :eyes, :browser_info, :test_result, :pending_exceptions, :driver, :task_lock, :test_uuid
 
       def initialize(eyes, browser_info, driver)
         Applitools::ArgumentGuard.is_a? eyes, 'eyes', Applitools::Selenium::EyesConnector
@@ -185,7 +185,8 @@ module Applitools
         watch_open[open_task] = false
       end
 
-      def check(tag, target, render_task)
+      def check(tag, target, render_task, title)
+        eyes.title = title
         result_index = render_task.add_running_test(self)
 
         check_task = VGTask.new("perform check #{tag} #{target}") do

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

@@ -2,12 +2,14 @@
 
 require 'base64'
 require 'digest'
+require 'nokogiri'
+
 module Applitools
   module Selenium
     class VGResource
       include Applitools::Jsonable
       json_fields :contentType, :hash, :hashFormat
-      attr_accessor :url, :content, :handle_css_block
+      attr_accessor :url, :content, :handle_discovered_resources_block
       alias content_type contentType
       alias content_type= contentType=
 
@@ -24,7 +26,8 @@ module Applitools
       end
 
       def initialize(url, content_type, content, options = {})
-        self.handle_css_block = options[:on_css_fetched] if options[:on_css_fetched].is_a? Proc
+        self.handle_discovered_resources_block = options[:on_resources_fetched] if
+            options[:on_resources_fetched].is_a? Proc
         self.url = URI(url)
         self.content_type = content_type
         self.content = content
@@ -33,19 +36,35 @@ module Applitools
         lookup_for_resources
       end
 
-      def on_css_fetched(block)
-        self.handle_css_block = block
+      def on_resources_fetched(block)
+        self.handle_discovered_resources_block = block
       end
 
       def lookup_for_resources
-        return unless %r{^text/css}i =~ content_type && handle_css_block
+        lookup_for_css_resources
+        lookup_for_svg_resources
+      end
+
+      def lookup_for_css_resources
+        return unless %r{^text/css}i =~ content_type && handle_discovered_resources_block
         parser = Applitools::Selenium::CssParser::FindEmbeddedResources.new(content)
-        handle_css_block.call(parser.imported_css + parser.fonts + parser.images, url)
+        handle_discovered_resources_block.call(parser.imported_css + parser.fonts + parser.images, url)
+      end
+
+      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)
+        handle_discovered_resources_block.call(attrs, url)
       end
 
       def stringify
         url.to_s + content_type.to_s + hash
       end
+
+      private :lookup_for_svg_resources, :lookup_for_css_resources
     end
   end
 end

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

@@ -2,6 +2,7 @@
 
 require 'applitools/selenium/configuration'
 require 'timeout'
+require 'securerandom'
 
 module Applitools
   module Selenium
@@ -14,13 +15,13 @@ module Applitools
       def_delegators 'Applitools::EyesLogger', :logger, :log_handler, :log_handler=
 
       attr_accessor :visual_grid_manager, :driver, :current_url, :current_config, :fetched_cache_map,
-        :config, :driver_lock
+        :config, :driver_lock, :test_uuid, :dont_get_title
       attr_accessor :test_list
 
       attr_accessor :api_key, :server_url, :proxy, :opened
 
       attr_accessor :size_mod, :region_to_check
-      private :size_mod, :size_mod=, :region_to_check, :region_to_check=
+      private :size_mod, :size_mod=, :region_to_check, :region_to_check=, :test_uuid, :test_uuid=
 
       def_delegators 'config', *Applitools::Selenium::Configuration.methods_to_delegate
       def_delegators 'config', *Applitools::EyesBaseConfiguration.methods_to_delegate
@@ -46,6 +47,7 @@ module Applitools
       end
 
       def open(*args)
+        self.test_uuid = SecureRandom.uuid
         options = Applitools::Utils.extract_options!(args)
         Applitools::ArgumentGuard.hash(options, 'options', [:driver])
 
@@ -78,6 +80,7 @@ module Applitools
             t.on_results_received do |results|
               visual_grid_manager.aggregate_result(results)
             end
+            t.test_uuid = test_uuid
           end
           test_list.push test
         end
@@ -125,7 +128,6 @@ module Applitools
             end
             sleep 0.5
             script_thread_result = script_thread.join(DOM_EXTRACTION_TIMEOUT)
-
             raise ::Applitools::EyesError.new 'Timeout error while getting dom snapshot!' unless script_thread_result
             Applitools::EyesLogger.info 'Done!'
 
@@ -141,11 +143,22 @@ module Applitools
               size_mod,
               region_to_check,
               target_to_check.options[:script_hooks],
+              config.rendering_grid_force_put,
+              Applitools::Utils::EyesSeleniumUtils.user_agent(driver),
               mod
             )
           end
-          test_list.each do |t|
-            t.check(tag, target_to_check, render_task)
+
+          title = begin
+            driver.title
+          rescue StandardError => e
+            logger.warn "failed (#{e.message})"
+            ''
+          end
+
+
+          test_list.select { |t| t.test_uuid == test_uuid }.each do |t|
+            t.check(tag, target_to_check, render_task, title)
           end
           test_list.each(&:becomes_not_rendered)
           visual_grid_manager.enqueue_render_task render_task

data/lib/applitools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.15.40
+  version: 3.15.41
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-08 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.40
+        version: 3.15.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.15.40
+        version: 3.15.41
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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'
 description: Provides SDK for writing Applitools Selenium-based tests
 email:
 - team@applitools.com