eyes_selenium 2.38.0 → 2.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f99be729477dfe4620d7e5a34ac8bdf7c72b0d0
-  data.tar.gz: 960476bb8f22adb7348a2ff3c17b9785bb9c3bf7
+  metadata.gz: fd32f2f7bfa22643fd6639e2d9cf44564d6fede3
+  data.tar.gz: 2a2b3b5458dcd6d581d54601055ec7683bcdfc8e
 SHA512:
-  metadata.gz: 479fedebff785cec3a5bcc440fc9bb700713ecc70c84e2e5eef786ff9e4cb3306753ffef4766534fa7f5df95ef1f4d89a56028dd8760bb16b2b958ae2b760868
-  data.tar.gz: 2001fcb0b69a988b981bd3952e85121e968ab210d8c969593439d36d2b75351a318f3ac2f46e8c22725951f68bdda113816b0ff740d458328f3d3010b339cda9
+  metadata.gz: 3c1370db2044afad9f6357f18fa9f6f4fc211d84a31a62c27a83f4611c5230531dd727636519e7e1be7bd6a05e59b0766476ee8aa395a7257fb8892dbf7ca7c7
+  data.tar.gz: 533e01b894784508b098e54859e77bb602c5499a82de81fa6c187404bf94594a096459fdc27f324944a83558cd22612281d32ba5fc84603d474211da91adb33c

data/.rubocop.yml

@@ -23,6 +23,9 @@ Metrics/AbcSize:
 Metrics/BlockNesting:
   Max: 4
 
+Metrics/BlockLength:
+  Max: 50
+
 Style/SignalException:
   EnforcedStyle: only_raise
 

data/examples/watir_test_script.rb

@@ -9,11 +9,11 @@ eyes = Applitools::Eyes.new
 eyes.api_key = ENV['APPLITOOLS_API_KEY']
 eyes.log_handler = Logger.new(STDOUT)
 
-browser = Watir::Browser.new
+browser = Watir::Browser.new :chrome
 
 begin
   eyes.test(app_name: 'Ruby SDK', test_name: 'Applitools website test', viewport_size: { width: 900, height: 600 },
-    driver: browser) do |driver|
+    driver: browser.driver) do |driver|
     driver.get 'http://www.applitools.com'
     eyes.check_window('initial')
     eyes.check_region(:css, '.pricing', 'Pricing button')

data/eyes_selenium.gemspec

@@ -8,8 +8,9 @@ CURRENT_RYBY_VERSION = Gem::Version.new RUBY_VERSION
 RUBY_1_9_3 = Gem::Version.new '1.9.3'
 RUBY_2_0_0 = Gem::Version.new '2.0.0'
 RUBY_2_2_2 = Gem::Version.new '2.2.2'
+RUBY_2_4_0 = Gem::Version.new '2.4.0'
 
-RUBY_KEY = [RUBY_1_9_3, RUBY_2_0_0, RUBY_2_2_2].select { |v| v <= CURRENT_RYBY_VERSION }.last
+RUBY_KEY = [RUBY_1_9_3, RUBY_2_0_0, RUBY_2_2_2, RUBY_2_4_0].select { |v| v <= CURRENT_RYBY_VERSION }.last
 
 EYES_GEM_SPECS = {
   RUBY_1_9_3 => proc do |spec|
@@ -19,13 +20,28 @@ EYES_GEM_SPECS = {
     spec.add_development_dependency 'rubocop', ['~> 0.41.1']
     spec.add_development_dependency 'cmdparse', ['= 2.0.2']
     spec.add_development_dependency 'net-ssh', ['<= 3.0.0']
+    spec.add_development_dependency 'net-http-persistent', ['< 3.0.0']
+    spec.add_development_dependency 'sauce'
+    spec.add_dependency 'nokogiri', '~> 1.6.0'
+    spec.add_dependency 'public_suffix', '< 1.5.0'
+    spec.add_dependency 'appium_lib', '< 9.1'
   end,
   RUBY_2_0_0 => proc do |spec|
     spec.add_development_dependency 'rack', ['~> 1.6.0']
-    spec.add_development_dependency 'rubocop'
+    spec.add_development_dependency 'rubocop', ['<= 0.46.0']
+    spec.add_development_dependency 'net-http-persistent', ['< 3.0.0']
+    spec.add_development_dependency 'sauce'
+    spec.add_dependency 'nokogiri', '~> 1.6.0'
+    spec.add_development_dependency 'appium_lib', '< 9.1'
   end,
   RUBY_2_2_2 => proc do |spec|
-    spec.add_development_dependency 'rubocop'
+    spec.add_development_dependency 'rubocop', ['<= 0.46.0']
+    spec.add_development_dependency 'sauce'
+    spec.add_development_dependency 'appium_lib'
+  end,
+  RUBY_2_4_0 => proc do |spec|
+    spec.add_development_dependency 'appium_lib'
+    spec.add_development_dependency 'rubocop', ['<= 0.46.0']
   end
 }.freeze
 
@@ -45,6 +61,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'selenium-webdriver', '>= 2.45.0'
+  spec.add_dependency 'poltergeist', '~> 1.9'
   spec.add_dependency 'oily_png', '~> 1.2'
   spec.add_dependency 'chunky_png', '= 1.3.6'
   spec.add_dependency 'faraday'
@@ -53,10 +70,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'capybara'
-  spec.add_development_dependency 'sauce'
   spec.add_development_dependency 'rspec', '>= 3'
   spec.add_development_dependency 'watir-webdriver'
-  spec.add_development_dependency 'appium_lib'
+
   EYES_GEM_SPECS[RUBY_KEY].call spec
 
   # Exclude debugging support on Travis CI, due to its incompatibility with jruby and older rubies.

data/lib/applitools/eyes.rb

@@ -1,3 +1,5 @@
+require 'capybara/poltergeist'
+
 require_relative 'version'
 require_relative 'eyes_logger'
 
@@ -74,7 +76,7 @@ class Applitools::Eyes
   #                            the default value.
   # +debug_screenshot+:: +boolean+ If true saves every taken screenshot in current folder. File name has following
   #                      format: +TAG_YYYY_MM_DD_HH_MI__N.png+, where +TAG+ - the tag specified for the test,
-  #                      +YYYY_MM_DD_HH_MI+ - date && time, +N+ - screenshot number (makes sence only when
+  #                      +YYYY_MM_DD_HH_MI+ - date && time, +N+ - screenshot number (makes sense only when
   #                      +force_fullpage_screenshot+ is true). Default value is false
 
   attr_reader :app_name, :test_name, :is_open, :viewport_size, :driver, :passed_driver
@@ -141,9 +143,19 @@ class Applitools::Eyes
       @driver = driver.driver_for_eyes self
     else
       unless driver.is_a?(Applitools::Selenium::Driver)
-        Applitools::EyesLogger.warn("Unrecognized driver type: (#{driver.class.name})!")
         is_mobile_device = driver.respond_to?(:capabilities) && driver.capabilities['platformName']
-        @driver = Applitools::Selenium::Driver.new(self, driver: driver, is_mobile_device: is_mobile_device)
+
+        @driver =
+          case driver
+          when Selenium::WebDriver
+            Applitools::Selenium::Driver.new(self, driver: driver, is_mobile_device: is_mobile_device)
+          when Capybara::Poltergeist::Driver # driver for PhantomJS
+            Applitools::Poltergeist::Driver.new(self, driver: driver, is_mobile_device: is_mobile_device)
+          else
+            Applitools::EyesLogger.warn("Unrecognized driver type: (#{driver.class.name})!")
+            Applitools::Selenium::Driver.new(self, driver: driver, is_mobile_device: is_mobile_device)
+          end
+
       end
     end
 

data/lib/applitools/eyes_logger.rb

@@ -3,11 +3,9 @@ require 'forwardable'
 
 module Applitools::EyesLogger
   class NullLogger < Logger
-    def initialize(*_args)
-    end
+    def initialize(*_args) end
 
-    def add(*_args, &_block)
-    end
+    def add(*_args, &_block) end
   end
 
   extend Forwardable

data/lib/applitools/poltergeist/applitools_compatible.rb

@@ -0,0 +1,28 @@
+# This module is used for compatibility with Applitools API.
+# Should be extended by Poltergeist driver instance.
+module Applitools::Poltergeist
+  module ApplitoolsCompatible
+    # Implementation of `screenshot_as` method for PhantomJS.
+    # Realisation uses Poltergeist binding to `renderBase64` PhantomJS method.
+    def screenshot_as(fmt)
+      Base64.decode64(browser.render_base64(fmt))
+    end
+
+    # Poltergeist driver does not have `manage` and `window` methods.
+    # In Applitools these methods are used in a chain to get size by `size` method call.
+    %w(manage window).each do |method_name|
+      define_method(method_name) { self }
+    end
+
+    # Method provides opened window size in Applitools format.
+    def size
+      size = window_size(current_window_handle)
+      Applitools::Base::Dimension.new(size[0], size[1])
+    end
+
+    # Method changes opened window size in a way how original Applitools::Selenium::Driver does.
+    def size=(new_size)
+      resize(new_size.width, new_size.height)
+    end
+  end
+end

data/lib/applitools/poltergeist/driver.rb

@@ -0,0 +1,11 @@
+# Applitools::Poltergeist::Driver is a small class implemented
+# for compatibility with Applitools API.
+# It gives required for Applitools methods to Poltergeist driver.
+module Applitools::Poltergeist
+  class Driver < Applitools::Selenium::Driver
+    def initialize(eyes, options)
+      options[:driver].extend Applitools::Poltergeist::ApplitoolsCompatible
+      super(eyes, options)
+    end
+  end
+end

data/lib/applitools/selenium/driver.rb

@@ -6,8 +6,6 @@ module Applitools::Selenium
   class Driver < SimpleDelegator
     extend Forwardable
 
-    include Selenium::WebDriver::DriverExtensions::HasInputDevices
-
     RIGHT_ANGLE = 90
     IOS = 'IOS'.freeze
     ANDROID = 'ANDROID'.freeze

data/lib/applitools/selenium/element.rb

@@ -12,6 +12,8 @@ module Applitools::Selenium
       @web_element ||= __getobj__
     end
 
+    protected :web_element
+
     def click
       current_control = region
       offset = current_control.middle_offset
@@ -25,8 +27,13 @@ module Applitools::Selenium
     end
 
     def ==(other)
-      other.is_a?(web_element.class) && web_element == other
+      if other.is_a? self.class
+        super other.web_element
+      else
+        super other
+      end
     end
+
     alias eql? ==
 
     def send_keys(*args)

data/lib/applitools/selenium/viewport_size.rb

@@ -72,8 +72,10 @@ module Applitools::Selenium
 
       browser_size_calculation_count = 0
       while browser_size_calculation_count < BROWSER_SIZE_CALCULATION_RETRIES
-        raise Applitools::TestFailedError.new 'Failed to set browser size!' \
-        " (current size: #{browser_size})" unless resize_attempt
+        unless resize_attempt
+          raise Applitools::TestFailedError.new 'Failed to set browser size!' \
+            " (current size: #{browser_size})"
+        end
         browser_size_calculation_count += 1
         if viewport_size == size
           Applitools::EyesLogger.debug "Actual viewport size #{viewport_size}"
@@ -107,11 +109,12 @@ module Applitools::Selenium
       return dimension if dimension.is_a? ::Selenium::WebDriver::Dimension
       return Applitools::Base::Dimension.for(dimension) if dimension.respond_to?(:width) &
           dimension.respond_to?(:height)
-      return Applitools::Base::Dimension.new(
-        dimension[:width],
-        dimension[:height]
-      ) if dimension.is_a?(Hash) && (dimension.keys & [:width, :height]).size == 2
-
+      if dimension.is_a?(Hash) && (dimension.keys & [:width, :height]).size == 2
+        return Applitools::Base::Dimension.new(
+          dimension[:width],
+          dimension[:height]
+        )
+      end
       raise ArgumentError,
         "expected #{@dimension.inspect}:#{@dimension.class} to respond to #width and #height," \
         ' or be  a hash with these keys.'

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '2.38.0'.freeze
+  VERSION = '2.39.0'.freeze
 end

data/lib/eyes_selenium.rb

@@ -30,11 +30,11 @@ require_relative 'applitools/version'
 Applitools.require_dir 'base'
 Applitools.require_dir 'utils'
 Applitools.require_dir 'selenium'
+Applitools.require_dir 'poltergeist'
 
 require_relative 'applitools/eyes'
 require_relative 'applitools/selenium_webdriver'
 require_relative 'applitools/appium_driver'
-require_relative 'applitools/watir_browser'
 
 if defined? Sauce
   require 'applitools/sauce'

data/spec/driver_passthrough_spec.rb

@@ -37,6 +37,16 @@ describe 'passthrough methods' do
         expect(link).not_to be_nil
         expect(link).to be_a(Applitools::Selenium::Element)
       end
+
+      # From the Selenium tests
+      # @see https://github.com/SeleniumHQ/selenium/blob/7e2cca5/rb/spec/integration/selenium/webdriver/element_spec.rb#L192
+      it 'should know when two elements are equal' do
+        body = @driver.find_element(tag_name: 'body')
+        xbody = @driver.find_element(xpath: '//body')
+
+        expect(body).to eq(xbody)
+        expect(body).to eql(xbody)
+      end
     end
 
     context 'all elements' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 2.38.0
+  version: 2.39.0
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.45.0
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sauce
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +303,8 @@ files:
 - lib/applitools/eyes.rb
 - lib/applitools/eyes_logger.rb
 - lib/applitools/method_tracer.rb
+- lib/applitools/poltergeist/applitools_compatible.rb
+- lib/applitools/poltergeist/driver.rb
 - lib/applitools/sauce.rb
 - lib/applitools/selenium/browser.rb
 - lib/applitools/selenium/capybara/capybara_settings.rb
@@ -334,7 +322,6 @@ files:
 - lib/applitools/utils/image_utils.rb
 - lib/applitools/utils/utils.rb
 - lib/applitools/version.rb
-- lib/applitools/watir_browser.rb
 - lib/eyes_selenium.rb
 - spec/driver_passthrough_spec.rb
 - spec/fixtures/static_test_file.html
@@ -359,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Applitools Ruby SDK

data/lib/applitools/watir_browser.rb

@@ -1,8 +0,0 @@
-if defined? Watir::Browser
-  Watir::Browser.class_eval do
-    def driver_for_eyes(eyes)
-      is_mobile_device = driver.capabilities['platformName'] ? true : false
-      Applitools::Selenium::Driver.new(eyes, driver: driver, is_mobile_device: is_mobile_device)
-    end
-  end
-end