eyes_selenium 1.17.0 → 1.18.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTI2OWYyOThlNTk4ZTRkYWFlZjIxZDlmNGUwMzU5MjRkZTA5M2M2Mg==
+  data.tar.gz: !binary |-
+    Nzc3MGM5NmVjZGNiODk4OWVhMzUxNTY5NzY4ZDRmZDg4MGYxMDE3Ng==
+SHA512:
+  metadata.gz: !binary |-
+    MTkxYmY2NmVlMWI3NDZlNmYzYWFiYWRlMWU5YjU1YjU2ZDI1YjAyMTcwN2Nm
+    ZmQwMDYzNjgzYjM5ODg3ZWY2ZmRjNGMyYzZlMmRjMjFhOGI3ZWNlM2IwN2Y4
+    NWExMzMzMGY1YTk1NmY5MGJhNjAwMTIwMzlkZmIwOWFjMmE1OTM=
+  data.tar.gz: !binary |-
+    NTdjMTE4MDVlY2VjZTQyYzJmNDdlMTkwYTViZmEyNzk3YmU0ZGI0YzA4MDli
+    YjBjZjg5Zjg1ZTM4NWRlYTU0ZmQyNzYxZDhkYzFhNjE0MWViMDg2Mzg5NDMz
+    ZTMzYzcxMjMzNTZiOGRhY2I5YTA4ZDQzMDFlMGZkNDk4MjJlYmU=

data/lib/eyes_selenium/eyes/driver.rb

@@ -4,8 +4,8 @@ class  Applitools::Driver
 
   include Selenium::WebDriver::DriverExtensions::HasInputDevices
 
-  attr_reader :remote_server_url, :remote_session_id, :user_agent, :screenshot_taker
-  attr_accessor :user_inputs, :driver
+  attr_reader :remote_server_url, :remote_session_id, :user_agent, :screenshot_taker, :eyes
+  attr_accessor :driver
 
   DRIVER_METHODS = [
     :title, :execute_script, :execute_async_script, :quit, :close, :get,
@@ -15,10 +15,9 @@ class  Applitools::Driver
 
   ## If driver is not provided, Applitools::Driver will raise an EyesError exception.
   #
-  def initialize(options)
+  def initialize(eyes, options)
     @driver = options[:driver]
-
-    @user_inputs = []
+    @eyes = eyes
     @remote_server_url = address_of_remote_server
     @remote_session_id = remote_session_id
     @user_agent = get_user_agent
@@ -68,10 +67,6 @@ class  Applitools::Driver
     Applitools::TargetApp.new(remote_server_url, remote_session_id, user_agent)
   end
 
-  def clear_user_inputs
-    user_inputs.clear
-  end
-
   def ie?
     driver.to_s == 'ie'
   end

data/lib/eyes_selenium/eyes/element.rb

@@ -28,7 +28,7 @@ class Applitools::Element
   def click
     current_control = region
     offset = current_control.middle_offset
-    driver.user_inputs << Applitools::MouseTrigger.new(:click, current_control, offset)
+    driver.eyes.user_inputs << Applitools::MouseTrigger.new(:click, current_control, offset)
 
     web_element.click
   end
@@ -45,7 +45,7 @@ class Applitools::Element
   def send_keys(*args)
     current_control = region
     Selenium::WebDriver::Keys.encode(args).each do |key|
-      driver.user_inputs << Applitools::TextTrigger.new(key.to_s, current_control)
+      driver.eyes.user_inputs << Applitools::TextTrigger.new(key.to_s, current_control)
     end
 
     web_element.send_keys(args)

data/lib/eyes_selenium/eyes/eyes.rb

@@ -19,7 +19,7 @@ class Applitools::Eyes
   attr_reader :agent_connector, :disabled
   attr_accessor :app_name, :test_name, :session, :is_open, :aborted, :viewport_size, :match_timeout, 
                 :failure_reports, :test_batch, :match_level, :driver, :host_os, :host_app, :branch_name, :parent_branch_name, 
-                :should_match_window_run_once_on_timeout, :session_start_info, :match_window_task
+                :should_match_window_run_once_on_timeout, :session_start_info, :match_window_task, :user_inputs
 
   def config
     self.class.config
@@ -32,6 +32,7 @@ class Applitools::Eyes
 
     return if disabled?
 
+    @user_inputs = []
     @agent_connector = Applitools::AgentConnector.new(config[:server_url], config[:user], config[:apikey])
     @match_timeout = DEFAULT_MATCH_TIMEOUT
     @failure_reports = Applitools::FailureReports::ON_CLOSE
@@ -45,7 +46,7 @@ class Applitools::Eyes
       raise Applitools::EyesError.new("driver/browser must be a valid Selenium webdriver")
     end
 
-    @driver = Applitools::Driver.new(driver: @driver)
+    @driver = Applitools::Driver.new(self, {driver: @driver})
  
     if open?
       abort_if_not_closed
@@ -67,6 +68,10 @@ class Applitools::Eyes
     self.is_open
   end
 
+  def clear_user_inputs
+    user_inputs.clear
+  end
+
   def check_window(tag)
     return if disabled?
     raise Applitools::EyesError.new("Eyes not open") if !open?

data/lib/eyes_selenium/eyes/eyes_keyboard.rb

@@ -10,7 +10,7 @@ class Applitools::EyesKeyboard
     active_element = Applitools::Element.new(driver, driver.switch_to.active_element)
     current_control = active_element.region
     Selenium::WebDriver::Keys.encode(keys).each do |key|
-      driver.user_inputs << Applitools::TextTrigger.new(key.to_s, current_control)
+      driver.eyes.user_inputs << Applitools::TextTrigger.new(key.to_s, current_control)
     end
     keyboard.send_keys(*keys)
   end

data/lib/eyes_selenium/eyes/eyes_mouse.rb

@@ -32,7 +32,7 @@ class Applitools::EyesMouse
     location.x = [0,location.x].max.round
     location.y = [0,location.y].max.round
     current_control = Applitools::Region.new(0,0, *location.values)
-    driver.user_inputs << Applitools::MouseTrigger.new(:move, current_control, location)
+    driver.eyes.user_inputs << Applitools::MouseTrigger.new(:move, current_control, location)
     element = element.web_element if element.is_a?(Applitools::Element)
     mouse.move_to(element,right_by, down_by)
   end
@@ -42,7 +42,7 @@ class Applitools::EyesMouse
     down = [0,down_by].max.round
     location = Selenium::WebDriver::Point.new(right,down)
     current_control = Applitools::Region.new(0,0, right, down)
-    driver.user_inputs << Applitools::MouseTrigger.new(:move, current_control, location)
+    driver.eyes.user_inputs << Applitools::MouseTrigger.new(:move, current_control, location)
     mouse.move_by(right_by,down_by)
   end
 
@@ -53,7 +53,7 @@ class Applitools::EyesMouse
       location.x = [0,location.x].max.round
       location.y = [0,location.y].max.round
       current_control = Applitools::Region.new(0,0, *location.values)
-      driver.user_inputs << Applitools::MouseTrigger.new(method, current_control, location)
+      driver.eyes.user_inputs << Applitools::MouseTrigger.new(method, current_control, location)
       element = element.web_element if element.is_a?(Applitools::Element)
       mouse.send(method,element,*args)
     end

data/lib/eyes_selenium/eyes/match_window_task.rb

@@ -26,7 +26,7 @@ class Applitools::MatchWindowTask
       run_with_intervals(tag, max_window_load_time)
     end
 
-    driver.clear_user_inputs and return res
+    driver.eyes.clear_user_inputs and return res
   end
 
   def run(tag, wait_before_run=nil)
@@ -55,8 +55,33 @@ class Applitools::MatchWindowTask
                                                                                   current_screenshot_encoded,
                                                                                   @last_checked_window)
       app_output = AppOutput.new(title, nil)
-
-      return Applitools::MatchWindowData.new(app_output, driver.user_inputs, tag, ignore_mismatch, compressed_screenshot)
+      user_inputs = []
+      if @last_checked_window.nil?
+        user_inputs = driver.eyes.user_inputs
+      else 
+        driver.eyes.user_inputs.each do |trigger|
+          if trigger.is_a? Applitools::MouseTrigger
+            trigger_left = trigger.control.left + trigger.location.x
+            trigger_top = trigger.control.top + trigger.location.y
+            if trigger_left <= @last_checked_window.width && trigger_top <= @last_checked_window.height
+              user_inputs << trigger
+            else
+              EyesLogger.info "Trigger ignored: #{trigger} (out of bounds)"
+            end
+          elsif trigger.is_a? Applitools::TextTrigger
+            last_screenshot_bounds = Applitools::Region.new(0, 0, @last_checked_window.width, @last_checked_window.height)
+            if trigger.control.intersecting?last_screenshot_bounds
+              user_inputs << trigger
+            else
+              EyesLogger.info "Trigger ignored: #{trigger} (out of bounds)"
+            end
+          else
+            EyesLogger.info "Trigger ignored: #{trigger} (Unrecognized trigger)"
+          end
+        end
+      end
+      
+      Applitools::MatchWindowData.new(app_output, user_inputs, tag, ignore_mismatch, compressed_screenshot)
     end
 
     def match(tag, ignore_mismatch=false)

data/lib/eyes_selenium/eyes/mouse_trigger.rb

@@ -16,4 +16,8 @@ class Applitools::MouseTrigger
       control: control.to_hash, location: Hash[location.each_pair.to_a]
     }
   end
+
+  def to_s
+    "#{mouse_action} [#{control}] #{location.x}, #{location.y}"
+  end
 end

data/lib/eyes_selenium/eyes/region.rb

@@ -8,6 +8,47 @@ class Applitools::Region
     @height = height.round
   end
 
+  EMPTY = Applitools::Region.new(0, 0, 0, 0)
+
+  def make_empty
+    @left = EMPTY.left
+    @top = EMPTY.top
+    @width = EMPTY.width
+    @height = EMPTY.height
+  end
+
+  def empty?
+     self.left == EMPTY.left && self.top == EMPTY.top && self.width == EMPTY.width && self.height == EMPTY.height
+  end
+
+  def right
+    left + width
+  end
+
+  def bottom
+    top + height
+  end
+
+  def intersecting?(other)
+    ((left <= other.left && other.left <= right) || (other.left <= left && left <= other.right)) \
+    && ((top <= other.top && other.top <= bottom) || (other.top <= top && top <=other.bottom))
+  end
+
+  def intersect(other)
+    if !intersecting?(other)
+      make_empty and return
+    end
+    i_left = (left >= other.left) ? left : other.left
+    i_right = (right <= other.right) ? right : other.right
+    i_top = (top >= other.top) ? top : other.top
+    i_bottom = (bottom <= other.bottom) ? bottom : other.bottom
+
+    self.left = i_left
+    self.top = i_top
+    self.width = i_right - i_left
+    self.height = i_bottom - i_top
+  end
+
   def middle_offset
     mid_x = width / 2
     mid_y = height / 2
@@ -19,4 +60,8 @@ class Applitools::Region
       "$type" => "Applitools.Utils.Geometry.MutableRegion, Core", left: left, top: top, height: height, width: width
     }
   end
+
+  def to_s
+    "(#{left}, #{top}), #{width} x #{height}"
+  end
 end

data/lib/eyes_selenium/eyes/text_trigger.rb

@@ -12,4 +12,8 @@ class Applitools::TextTrigger
       "$type" => "Applitools.Models.TextTrigger, Core", text: text, control: control.to_hash
     }
   end
+
+  def to_s
+    "Text [#{@control}] #{@text}"
+  end
 end

data/lib/eyes_selenium/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = "1.17.0"
+  VERSION = "1.18.0"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 1.17.0
-  prerelease: 
+  version: 1.18.0
 platform: ruby
 authors:
 - Applitools team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -186,32 +169,25 @@ files:
 homepage: http://www.applitools.com
 licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3490962404448018884
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3490962404448018884
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Applitools Ruby SDK
 test_files: []