eyes_selenium 3.15.4.beta → 3.15.5.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 528f158809bd96603814c886253b93137ec2d7c06b362838a0c3d3a92d506f77
-  data.tar.gz: d338946ba20679c7a9e76cfa225fcedb95da3ad3f7e00eb1bda6bb5c347ec0f7
+  metadata.gz: f9f3e9f6703e578f4b9e17e20053870636dd99c5f4dbebf773f0405055b2568c
+  data.tar.gz: 05e2240ea7364269af763aae6d3ae1a5c8b0e8633c89583282aee82243955c21
 SHA512:
-  metadata.gz: 7b3c248b7052e22be4a1bb3b30bead9398830b4e1cf4fc83ff4aa782f69c2394bae9582bd76842d843d996e5a8b31502b3c56e17dc1511083b96798842a3239e
-  data.tar.gz: 5f620abb599c9d298aaf545a4f29972d31c88cf3b5288ef8b488b8df6cc6b310619a1daa9a42612148e21e9577eae881d68b87563912e3989ace0801ecd49099
+  metadata.gz: 82b06500557dfa412815a588ffd424845f60965503d302b376140efd9cacff2e6b50143879338a86a1c86bc1bc185cb8df707cfc434279958c970558405cf836
+  data.tar.gz: 294c5ad3389d4557ebbe542dc4b7eb15727ede34dfd2ee57f3144a0b510fab504086907deea1b96d77fe5ab486c0ed0cdd047a08fd01f0f6358ce9d025f60e4d

data/lib/applitools/selenium/configuration.rb

@@ -8,7 +8,7 @@ module Applitools
       DEFAULT_CONFIG = proc do
         {
           force_full_page_screenshot: false,
-          wait_before_screenshots: 100,
+          wait_before_screenshots: 0.1,
           stitch_mode: Applitools::Selenium::StitchModes::CSS,
           hide_scrollbars: false,
           hide_caret: false,
@@ -29,7 +29,6 @@ module Applitools
       boolean_field :send_dom
 
       object_field :browsers_info, Applitools::Selenium::BrowsersInfo
-
       int_field :concurrent_sessions
 
       def add_browser(*args)
@@ -45,7 +44,7 @@ module Applitools
         end
         yield(Applitools::Selenium::RenderBrowserInfoFluent.new(browser)) if block_given?
         browsers_info.add browser
-        self.viewport_size = browser.viewport_size unless viewport_size
+        # self.viewport_size = browser.viewport_size unless viewport_size
         self
       end
 
@@ -58,10 +57,26 @@ module Applitools
       def deep_clone
         new_config = self.class.new
         config_keys.each do |k|
-          new_config.send("#{k}=", self.send(k).clone)
+          new_config.send(
+            "#{k}=", case value = self.send(k)
+                     when Symbol, FalseClass, TrueClass, Fixnum, Float
+                       value
+                     else
+                       value.clone
+                     end
+          )
         end
         new_config
       end
+
+      def viewport_size
+        user_defined_vp = super
+        user_defined_vp = nil if user_defined_vp.respond_to?(:square) && user_defined_vp.square == 0
+        return user_defined_vp if user_defined_vp
+        from_browsers_info = browsers_info.select {|bi| bi.viewport_size.square > 0 }.first
+        return from_browsers_info.viewport_size if from_browsers_info
+        nil
+      end
     end
   end
 end

data/lib/applitools/selenium/selenium_eyes.rb

@@ -103,12 +103,14 @@ module Applitools::Selenium
     attr_reader :driver
 
     def_delegators 'Applitools::EyesLogger', :logger, :log_handler, :log_handler=
+    def_delegators 'config', *Applitools::Selenium::Configuration.methods_to_delegate
 
     # Creates a new (possibly disabled) Eyes instance that interacts with the
     # Eyes Server at the specified url.
     #
     # @param server_url The Eyes Server URL.
     def initialize(server_url = nil)
+      ensure_config
       super
       self.base_agent_id = "eyes.selenium.ruby/#{Applitools::VERSION}".freeze
       self.check_frame_or_element = false
@@ -136,6 +138,12 @@ module Applitools::Selenium
       self.prevent_dom_processing = false
     end
 
+
+    def ensure_config
+      self.config = Applitools::Selenium::Configuration.new
+    end
+
+
     # Starts a test
     #
     # @param options [Hash] options
@@ -154,7 +162,7 @@ module Applitools::Selenium
       options[:viewport_size] = Applitools::RectangleSize.from_any_argument options[:viewport_size] if
           options[:viewport_size]
       Applitools::ArgumentGuard.not_nil original_driver, 'options[:driver]'
-      Applitools::ArgumentGuard.hash options, 'open(options)', [:app_name, :test_name]
+      # Applitools::ArgumentGuard.hash options, 'open(options)', [:app_name, :test_name]
 
       if disabled?
         logger.info('Ignored')

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

@@ -105,7 +105,6 @@ module Applitools
       end
 
       def set_viewport_size(*_args)
-
       end
 
       def viewport_size

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

@@ -34,6 +34,12 @@ module Applitools
         self.driver = options.delete(:driver)
         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)
 
         logger.info("getting all browsers info...")
@@ -43,15 +49,20 @@ module Applitools
           test_list.push Applitools::Selenium::RunningTest.new(eyes_connector, bi, driver)
         end
         self.opened = true
+
         driver
       end
 
+      def get_viewport_size(web_driver = driver)
+        Applitools::ArgumentGuard.not_nil 'web_driver', web_driver
+        Applitools::Utils::EyesSeleniumUtils.extract_viewport_size(driver)
+      end
+
       def eyes_connector
         logger.info("creating VisualGridEyes server connector")
         ::Applitools::Selenium::EyesConnector.new(server_url).tap do |connector|
           connector.batch = batch_info
           connector.config = config.deep_clone
-          connector.proxy = proxy if proxy.is_a? Applitools::Connectivity::Proxy
         end
       end
 
@@ -60,6 +71,7 @@ module Applitools
           var callback = arguments[arguments.length - 1]; return (#{Applitools::Selenium::Scripts::PROCESS_RESOURCES})().then(JSON.stringify).then(callback, function(err) {callback(err.stack || err.toString())});
         END
         begin
+          sleep wait_before_screenshots
           script_result = driver.execute_async_script(script).freeze
           mod = Digest::SHA2.hexdigest(script_result)
           test_list.each do |t|
@@ -96,7 +108,8 @@ module Applitools
             raise Applitools::TestFailedError.new test_failed_error_message(r), r if r.failed?
           end
         end
-        test_list.map(&:test_result).first
+        failed_results = test_list.map(&:test_result).compact.select { |r| !r.as_expected? }
+        failed_results.empty? ? test_list.map(&:test_result).compact.first : failed_results
       end
 
       def open?
@@ -107,6 +120,16 @@ module Applitools
         test_list.map(&:test_result)
       end
 
+      def set_viewport_size(value)
+        begin
+          Applitools::Utils::EyesSeleniumUtils.set_viewport_size driver, value
+        rescue => e
+          logger.error e.class.to_s
+          logger.error e.message
+          raise Applitools::TestFailedError.new "#{e.class} - #{e.message}"
+        end
+      end
+
       def new_test_error_message(result)
         original_results = result.original_results
         "New test '#{original_results['name']}' " \

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

@@ -24,7 +24,7 @@ module Applitools
       end
 
       def stop
-        while all_running_tests.map { |t| t.score }.sum > 0 do
+        while all_running_tests.map(&:score).reduce(0, :+) > 0 do
           sleep 0.5
         end
         @thread_pool.stop
@@ -35,7 +35,10 @@ module Applitools
       end
 
       def get_all_test_results
-        all_eyes.select {|e| !e.open?}.map { |e| e.test_list.map(&:test_result) }.flatten
+        while !(all_eyes.select {|e| e.open?}.empty?)
+          sleep 0.5
+        end
+        all_eyes.map { |e| e.test_list.map(&:test_result) }.flatten
       end
 
       private

data/lib/applitools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '3.15.4.beta'.freeze
+  VERSION = '3.15.5.beta'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 3.15.4.beta
+  version: 3.15.5.beta
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-03 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.4.beta
+        version: 3.15.5.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.15.4.beta
+        version: 3.15.5.beta
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Applitools Ruby Selenium SDK