eyes_selenium 2.32.0 → 2.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc57b143e0d3877d92cf53f89e53f58ea521db39
-  data.tar.gz: 450452fc879ddc89f77e7089a0d8623b1f8bc81d
+  metadata.gz: 0761083944ac62eddd2754e25e1a99df2f552d42
+  data.tar.gz: 618d2ce2130371f1215290c33adf565b76435b4e
 SHA512:
-  metadata.gz: d77c9ab86b00cb68b722358807c620517fbcfecb62fc102967ea6faafd9723704b19c2212c4f005e27bb965d7217059a05254d68f7cc7daef21676ac761515ab
-  data.tar.gz: 33e5a22b2d4bff707f18e19cda2b4949b4aee9c154c90148887cb2b8918ec1659e6d5b8c9da9db9832ef7dd24183a45870659151a7c6a2c100b57c1964d69389
+  metadata.gz: e307d5656b5e228b5497b505f44ec611d9b58e6adb767b6142e8aafa8b302ac8432fc3decca3f219d235534a4056200ca49beb4f7ae152b8e3aeb7eb9a3ce3df
+  data.tar.gz: 9ce50824573c8e1508e3f9a1af24343730db7a6f0f96ed53238bc364a93c0aaba96d77df2b71be9a755d36782befca19aa5ece72dcd44e4b479618be405158e6

data/eyes_selenium.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'rspec', '>= 3'
   spec.add_development_dependency 'watir-webdriver'
   spec.add_development_dependency 'appium_lib'

data/lib/applitools/selenium/browser.rb

@@ -181,14 +181,10 @@ module Applitools::Selenium
 
           process_screenshot_part(screenshot_part, size_factor)
         end
-
         screenshot = Applitools::Utils::ImageUtils.stitch_images(page_size, parts)
       end
-
       set_transform(original_transform) if @eyes.use_css_transition
-
       scroll_to(original_scroll_position)
-
       screenshot
     end
 

data/lib/applitools/selenium/driver.rb

@@ -40,7 +40,7 @@ module Applitools::Selenium
       @wait_before_screenshots = 0
       @eyes = eyes
       @browser = Applitools::Selenium::Browser.new(self, @eyes)
-      Applitools::EyesLogger.warn '"takes_screenshot" capability not found.' unless driver.respond_to? :screenshot_as
+      Applitools::EyesLogger.warn '"screenshot_as" method not found!' unless driver.respond_to? :screenshot_as
     end
 
     # Returns:
@@ -100,7 +100,7 @@ module Applitools::Selenium
       Applitools::EyesLogger.debug "Waiting before screenshot: #{wait_before_screenshots} seconds..."
       sleep(wait_before_screenshots)
       Applitools::EyesLogger.debug 'Finished waiting.'
-      Applitools::Utils::ImageUtils.png_image_from_base64(driver.screenshot_as(:base64))
+      Applitools::Utils::ImageUtils::Screenshot.new driver.screenshot_as(:png)
     end
 
     def mouse

data/lib/applitools/selenium/match_window_task.rb

@@ -103,7 +103,7 @@ module Applitools::Selenium
       title = eyes.title
       Applitools::EyesLogger.debug 'Getting screenshot...'
       Applitools::EyesLogger.debug 'Done! Creating image object from PNG...'
-      @current_screenshot = Applitools::Utils::ImageUtils::Screenshot.new(driver.get_screenshot(rotation))
+      @current_screenshot = driver.get_screenshot(rotation)
       Applitools::EyesLogger.debug 'Done!'
       # If a region was defined, we refer to the sub-image defined by the region.
       unless region.empty?

data/lib/applitools/utils/image_utils.rb

@@ -74,7 +74,7 @@ module Applitools::Utils
     end
 
     def stitch_images(size, images_data)
-      ChunkyPNG::Image.new(size.width, size.height, ChunkyPNG::Color::TRANSPARENT).tap do |res|
+      stitched_screenshot = ChunkyPNG::Image.new(size.width, size.height, ChunkyPNG::Color::TRANSPARENT).tap do |res|
         images_data.each do |image_data|
           # Crop out of bounds images.
           image = image_data.image
@@ -84,30 +84,41 @@ module Applitools::Utils
           new_height = position.top + image.height > size.height ? size.height - position.top : image.height
 
           if new_width != image.width || new_height != image.height
-            image = image.crop(0, 0, new_width, new_height)
+            image = image.crop!(0, 0, new_width, new_height)
           end
 
-          res.compose!(image, position.left, position.top)
+          res.replace!(image.restore, position.left, position.top)
+          GC.start
         end
       end
+      result = Applitools::Utils::ImageUtils::Screenshot.new stitched_screenshot.to_blob.dup
+      GC.start
+      result
     end
 
     class Screenshot < Delegator
-      attr_accessor :width, :height, :file
+      extend Forwardable
+      def_delegators :header, :width, :height
 
       def initialize(image)
-        @file = Tempfile.new('applitools')
-        image.save file
-        @width = image.width
-        @height = image.height
+        @datastream = ChunkyPNG::Datastream.from_string image
+      end
+
+      def to_blob
+        @datastream.to_blob
       end
 
       def __getobj__
         restore
       end
 
+      def header
+        @datastream.header_chunk
+      end
+
       def __setobj__(obj)
-        obj.save file
+        @datastream = obj.to_datastream
+        self
       end
 
       def method_missing(method, *args, &block)
@@ -118,10 +129,8 @@ module Applitools::Utils
         end
       end
 
-      private
-
       def restore
-        ChunkyPNG::Image.from_file(file)
+        ChunkyPNG::Image.from_datastream @datastream
       end
     end
 

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '2.32.0'.freeze
+  VERSION = '2.33.0'.freeze
 end

data/test/capybara_example.rb

@@ -0,0 +1,43 @@
+require 'rspec'
+require 'capybara/rspec'
+require_relative '../lib/eyes_selenium'
+require 'openssl'
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
+
+Capybara.register_driver :selenium do |app|
+  Capybara::Selenium::Driver.new(app, :browser => :chrome)
+end
+
+Capybara.javascript_driver = :selenium
+
+# require 'capybara/poltergeist'
+#
+# Capybara.register_driver :poltergeist_app do |app|
+#   Capybara::Poltergeist::Driver.new(app, :js_errors => false)
+# end
+#
+# Capybara.javascript_driver = :poltergeist_app
+
+
+describe 'Capybara Example', :type => :feature, :js => true do
+  before :each do
+    @eyes = Applitools::Eyes.new
+    @eyes.api_key = ENV['APPLITOOLS_API_KEY']
+    @eyes.log_handler = Logger.new(STDOUT)
+  end
+
+  it 'Simple test' do
+    driver = @eyes.open(app_name: 'Ruby SDK', test_name: 'Capybara test', driver: page.driver.browser, viewport_size: {width: 800, height: 600})
+    visit 'http://github.com'
+    @eyes.check_window('homepage')
+    username = driver.find_element(:name, 'user[login]')
+    username.send_keys('user')
+    @eyes.check_window('homepage with username')
+    @eyes.close
+  end
+
+  after :each do
+    @eyes.abort_if_not_closed
+  end
+end

data/test/sauce_capybara_check.rb

@@ -0,0 +1,38 @@
+require 'capybara'
+require 'sauce'
+require 'sauce/capybara'
+require_relative '../lib/eyes_selenium'
+require 'openssl'
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
+Sauce.config do |config|
+  config[:browsers] = [
+      ["OS X 10.10", "chrome", "39.0"]
+  ]
+  config[:start_tunnel] = false
+  # config[:sauce_connect_4_executable] = '/path/to/sauce-connect/bin/sc'
+end
+
+Capybara.javascript_driver = :sauce
+
+describe 'A Saucy Example Group', :sauce => true do
+  before :each do
+    @eyes = Applitools::Eyes.new
+    @eyes.api_key = ENV['APPLITOOLS_API_KEY']
+    @eyes.log_handler = Logger.new(STDOUT)
+  end
+
+  it 'Simple test' do
+    driver = @eyes.open(app_name: 'Ruby SDK', test_name: 'Capybara test', driver: selenium.driver, viewport_size: {width: 800, height: 600})
+    driver.navigate.to 'http://github.com'
+    @eyes.check_window('homepage')
+    username = driver.find_element(:name, 'user[login]')
+    username.send_keys('user')
+    @eyes.check_window('homepage with username')
+    @eyes.close(false)
+  end
+
+  after :each do
+    @eyes.abort_if_not_closed
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 2.32.0
+  version: 2.33.0
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  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
@@ -256,6 +270,8 @@ files:
 - spec/fixtures/static_test_file.html
 - spec/spec_helper.rb
 - test/appium_example_script.rb
+- test/capybara_example.rb
+- test/sauce_capybara_check.rb
 - test/test_script.rb
 - test/watir_test_script.rb
 homepage: https://www.applitools.com
@@ -287,6 +303,8 @@ test_files:
 - spec/fixtures/static_test_file.html
 - spec/spec_helper.rb
 - test/appium_example_script.rb
+- test/capybara_example.rb
+- test/sauce_capybara_check.rb
 - test/test_script.rb
 - test/watir_test_script.rb
 has_rdoc: