eyes_selenium 3.15.29 → 3.15.30

data/lib/applitools/selenium/render_resources.rb

@@ -1,12 +1,13 @@
 module Applitools
   module Selenium
     class RenderResources < Hash
+      class ResourceMissingInCache < EyesError; end
       def []=(key, value)
-        raise Applitools::EyesIllegalArgument, "Expected key to be an instance of URI (but got #{key.class})" unless
+        raise Applitools::EyesIllegalArgument, "Expected key to be an instance of URI (but got #{key.class}) - #{key}" unless
             key.is_a? URI
-        raise Applitools::EyesIllegalArgument, "Expected key to be an instance of Applitools::Selenium::VGResource" \
-            " (but got #{value.class})" unless value.is_a? Applitools::Selenium::VGResource
-        return super
+        raise Applitools::EyesIllegalArgument, "Expected value to be an instance of Applitools::Selenium::VGResource" \
+            " (but got #{value.class}) - #{key}:#{value}" unless value.is_a? Applitools::Selenium::VGResource
+        super
       end
     end
   end

data/lib/applitools/selenium/selenium_eyes.rb

@@ -519,7 +519,7 @@ module Applitools::Selenium
     def dom_data
       return {} if prevent_dom_processing
       begin
-        Applitools::Selenium::DomCapture.get_window_dom(driver, logger)
+        Applitools::Selenium::DomCapture.full_window_dom(driver, server_connector, logger, position_provider)
       rescue Applitools::EyesError => e
         logger.error "DOM capture failed! #{e.message}"
         return {}

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

@@ -10,7 +10,7 @@ module Applitools
 
       attr_accessor :script, :running_tests, :all_blobs, :resource_urls, :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
+        :region_to_check, :script_hooks, :visual_grid_manager, :discovered_resources
 
       def initialize(name, script_result, visual_grid_manager, server_connector, region_selectors, size_mode,
         region, script_hooks, mod = nil)
@@ -131,30 +131,62 @@ module Applitools
 
       def prepare_data_for_rg(data)
         self.all_blobs = data["blobs"]
-        self.resource_urls = data["resourceUrls"]
+        self.resource_urls = data["resourceUrls"].map { |u| URI(u) }
         self.request_resources = Applitools::Selenium::RenderResources.new
+        discovered_resources = []
 
-        all_blobs.map { |blob| Applitools::Selenium::VGResource.parse_blob_from_script(blob)}.each do |blob|
-          request_resources[blob.url] = blob
-        end
+        @discovered_resources_lock = Mutex.new
 
-        resource_urls.each do |url|
-          resource_cache.fetch_and_store(URI(url)) do |s|
-            resp_proc = proc { |u| server_connector.download_resource(u) }
-            retry_count = 3
-            begin
-              retry_count -= 1
-              response = resp_proc.call(url)
-            end while response.status != 200 && retry_count > 0
-            s.synchronize do
-              Applitools::Selenium::VGResource.parse_response(url, response)
+        fetch_block = proc {}
+
+        handle_css_block = proc do |urls_to_fetch, url|
+          urls_to_fetch.each do |discovered_url|
+            target_url = URI.parse(discovered_url)
+            unless target_url.host
+              target_with_base = url.is_a?(URI) ? url.dup : URI.parse(url)
+              target_url = target_with_base.merge target_url
+              target_url.freeze
             end
+            next unless /^http/i =~ target_url.scheme
+            @discovered_resources_lock.synchronize do
+              discovered_resources.push target_url
+            end
+            resource_cache.fetch_and_store(target_url, &fetch_block)
           end
         end
 
+        fetch_block = proc do |_s, key|
+          resp_proc = proc { |u| server_connector.download_resource(u) }
+          retry_count = 3
+          begin
+            retry_count -= 1
+            response = resp_proc.call(key.dup)
+          end while response.status != 200 && retry_count > 0
+          Applitools::Selenium::VGResource.parse_response(key.dup, response, on_css_fetched: handle_css_block)
+        end
+
+        blobs = all_blobs.map { |blob| Applitools::Selenium::VGResource.parse_blob_from_script(blob) }.each do |blob|
+          request_resources[blob.url] = resource_cache[blob.url] = blob
+        end
+
+        blobs.each do |blob|
+          blob.on_css_fetched(handle_css_block)
+          blob.lookup_for_resources
+        end
+
+        resource_urls.each do |url|
+          resource_cache.fetch_and_store(url, &fetch_block)
+        end
+
         resource_urls.each do |u|
-          key = URI(u)
-          request_resources[key] = resource_cache[key]
+          begin
+            request_resources[u] = resource_cache[u]
+          rescue Applitools::Selenium::RenderResources
+          end
+        end
+
+        discovered_resources.each do |u|
+          request_resources[u] = resource_cache[u]
         end
 
         requests = Applitools::Selenium::RenderRequests.new
@@ -178,7 +210,7 @@ module Applitools
             dom: dom,
             resources: request_resources,
             render_info: r_info,
-            browser: {name: running_test.browser_info.browser_type, platform: running_test.browser_info.platform},
+            browser: {xname: running_test.browser_info.browser_type, platform: running_test.browser_info.platform},
             script_hooks: script_hooks,
             selectors_to_find_regions_for: region_selectors,
             send_dom: running_test.eyes.config.send_dom.nil? ? false.to_s : running_test.eyes.config.send_dom.to_s

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

@@ -2,6 +2,7 @@ require 'thread'
 module Applitools
   module Selenium
     class ResourceCache
+      class ResourceMissing < ::Applitools::EyesError; end
       attr_accessor :cache_map, :semaphore
 
       def initialize
@@ -11,7 +12,7 @@ module Applitools
 
       def contains?(url)
         semaphore.synchronize do
-          cache_map.keys.include?(url) && !cache_map[url].nil?
+          check_key(url)
         end
       end
 
@@ -19,8 +20,9 @@ module Applitools
         current_value = semaphore.synchronize do
           cache_map[key]
         end
-        return current_value unless cache_map[key].is_a? Applitools::Future
-        update_cache_map(key, cache_map[key].get)
+        raise ResourceMissing, key if current_value.nil?
+        return current_value unless current_value.is_a? Applitools::Future
+        update_cache_map(key, current_value.get)
       end
 
       def []=(key, value)
@@ -30,17 +32,23 @@ module Applitools
       end
 
       def fetch_and_store(key, &block)
-        return self[key] if self.contains? key
-        return unless block_given?
-        self[key] = Applitools::Future.new(semaphore) do |semaphore|
-          block.call(semaphore)
+        semaphore.synchronize do
+          return cache_map[key] if check_key(key)
+          return unless block_given?
+          cache_map[key] = Applitools::Future.new(semaphore) do |semaphore|
+            block.call(semaphore, key)
+          end
+          return true if cache_map[key].is_a? Applitools::Future
+          false
         end
-        return true if cache_map[key].is_a? Applitools::Future
-        false
       end
 
       private
 
+      def check_key(url)
+        cache_map.keys.include?(url) && !cache_map[url].nil?
+      end
+
       def update_cache_map(key, value)
         semaphore.synchronize do
           cache_map[key] = value

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

@@ -39,9 +39,7 @@ module Applitools
         @semaphore.synchronize do
           @stopped = true
         end
-        @thread_group.list.each do |t|
-          t.join
-        end
+        @thread_group.list.each(&:join)
         stopped?
       end
 
@@ -81,6 +79,7 @@ module Applitools
                 end
               end
             end
+            Applitools::EyesLogger.logger.info 'Worker is stopped'
           rescue => e
             Applitools::EyesLogger.logger.error "Failed to execute task - #{task_to_run.name}"
             Applitools::EyesLogger.logger.error e.message

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

@@ -5,29 +5,41 @@ module Applitools
     class VGResource
       include Applitools::Jsonable
       json_fields :contentType, :hash, :hashFormat
-      attr_accessor :url, :content
+      attr_accessor :url, :content, :handle_css_block
       alias :content_type :contentType
       alias :content_type= :contentType=
 
       class << self
-        def parse_blob_from_script(blob)
-          content = Base64.decode64(blob["value"])
-          # puts "#{blob['url']} ===> #{blob['type']}"
-          self.new blob["url"], blob["type"], content
+        def parse_blob_from_script(blob, options = {})
+          content = Base64.decode64(blob['value'])
+          new(blob['url'], blob['type'], content, options)
         end
 
-        def parse_response(url, response)
-          return self.new(url, 'application/empty-response', '') unless response.status == 200
-          self.new(url, response.headers['Content-Type'], response.body)
+        def parse_response(url, response, options = {})
+          return new(url, 'application/empty-response', '') unless response.status == 200
+          new(url, response.headers['Content-Type'], response.body, options)
         end
       end
 
-      def initialize(url, content_type, content)
+      def initialize(url, content_type, content, options = {})
+        self.handle_css_block = options[:on_css_fetched] if options[:on_css_fetched].is_a? Proc
         self.url = URI(url)
         self.content_type = content_type
         self.content = content
         self.hash = Digest::SHA256.hexdigest(content)
         self.hashFormat = 'sha256'
+        lookup_for_resources
+      end
+
+      def on_css_fetched(block)
+        self.handle_css_block = block
+      end
+
+      def lookup_for_resources
+        if %r{^text/css}i =~ content_type && handle_css_block
+          parser = Applitools::Selenium::CssParser::FindEmbeddedResources.new(content)
+          handle_css_block.call(parser.imported_css + parser.fonts + parser.images, url)
+        end
       end
 
       def stringify

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

@@ -1,4 +1,6 @@
 require 'applitools/selenium/configuration'
+require 'timeout'
+
 module Applitools
   module Selenium
     class VisualGridEyes
@@ -88,30 +90,37 @@ module Applitools
         END
         begin
           sleep wait_before_screenshots
-
-          # script_result = driver.execute_async_script(script).freeze
-
-          dom_snapshot_start_time = Time.now()
-          result = {}
-          script_result = nil
-          loop do
-            script_result = driver.execute_script(script)
-            begin
-              result = Oj.load(script_result)
-              break if result['status'] == 'SUCCESS'
-              dom_snapshot_time = Time.now - dom_snapshot_start_time
-              raise Applitools::EyesError, 'Timeout error while getting dom snapshot!' if dom_snapshot_time > DOM_EXTRACTION_TIMEOUT
-            rescue Oj::ParseError => e
-              Applitools::EyesLogger.warn e.message
+          Applitools::EyesLogger.info 'Trying to get DOM snapshot...'
+
+          script_thread = Thread.new do
+            result = {}
+            while result['status'] != 'SUCCESS'
+              Thread.current[:script_result] = driver.execute_script(script)
+              begin
+                Thread.current[:result] = result = Oj.load(Thread.current[:script_result])
+                sleep 0.5
+                puts "*"
+              rescue Oj::ParseError => e
+                Applitools::EyesLogger.warn e.message
+              end
             end
           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!'
+
+          # require 'pry'
+          # binding.pry
+          # puts script_thread_result[:result]['value']
 
-          mod = Digest::SHA2.hexdigest(script_result)
+
+          mod = Digest::SHA2.hexdigest(script_thread_result[:script_result])
 
           region_x_paths = get_regions_x_paths(target)
           render_task = RenderTask.new(
             "Render #{config.short_description} - #{tag}",
-            result["value"],
+            script_thread_result[:result]['value'],
             visual_grid_manager,
             server_connector,
             region_x_paths,
@@ -124,10 +133,12 @@ module Applitools
             t.check(tag, target, render_task)
           end
           test_list.each { |t| t.becomes_not_rendered }
+          test_list.each { |t| t.becomes_not_rendered }
           visual_grid_manager.enqueue_render_task render_task
         rescue StandardError => e
-          Applitools::EyesLogger.error e.message
           test_list.each { |t| t.becomes_tested }
+          Applitools::EyesLogger.error e.class.to_s
+          Applitools::EyesLogger.error e.message
         end
       end
 
@@ -200,7 +211,7 @@ module Applitools
         return false if test_list.empty?
         test_list.each(&:close)
 
-        while (!((states = test_list.map(&:state_name).uniq).count == 1 && states.first == :completed)) do
+        until ((states = test_list.map(&:state_name).uniq).count == 1 && states.first == :completed) do
           sleep 0.5
         end
         self.opened = false

data/lib/applitools/version.rb

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

data/lib/eyes_selenium.rb

@@ -22,6 +22,8 @@ Applitools::Selenium.require_dir 'selenium/scripts'
 Applitools::Selenium.require_dir 'selenium/visual_grid'
 Applitools::Selenium.require_dir 'selenium'
 Applitools::Selenium.require_dir 'selenium/dom_capture'
+Applitools::Selenium.require_dir 'selenium/css_parser'
+
 
 if defined? Selenium::WebDriver::Driver
   Selenium::WebDriver::Driver.class_eval do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.15.29
+  version: 3.15.30
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-12 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.29
+        version: 3.15.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.15.29
+        version: 3.15.30
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: crass
+  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: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +93,7 @@ files:
 - lib/applitools/selenium/browsers_info.rb
 - lib/applitools/selenium/configuration.rb
 - lib/applitools/selenium/context_based_scale_provider.rb
+- lib/applitools/selenium/css_parser/find_embedded_resources.rb
 - 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