eyes_selenium_ruby 1.1.0 → 1.1.1

data/eyes_selenium_ruby.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "selenium-webdriver", ["~> 2.0"]
+  spec.add_dependency "selenium-webdriver", [">= 2.37"]
   spec.add_dependency "httparty" 
   spec.add_dependency "oily_png", [">= 1.1.0"] 
 

data/lib/eyes_selenium_ruby/eyes/environment.rb

@@ -8,6 +8,7 @@ class Applitools::Environment
   end
 
   def to_hash
-    { os: os, hostingApp: hosting_app, displaySize: Hash[display_size.each_pair.to_a] }
+    # display_size is an Applitools::ViewportSize object
+    { os: os, hostingApp: hosting_app, displaySize: display_size.to_hash}
   end
 end

data/lib/eyes_selenium_ruby/eyes/eyes.rb

@@ -1,5 +1,6 @@
 class Applitools::Eyes
   DEFAULT_MATCH_TIMEOUT = 2.0
+  AGENT_ID = 'eyes.selenium.ruby'
 
   class << self
     attr_accessor :config
@@ -7,7 +8,7 @@ class Applitools::Eyes
 
   @config = {
     server_url: 'https://eyes.applitools.com',
-    user: 'eyes.selenium.ruby'
+    user: AGENT_ID
     # apikey: 'please supply an apikey in your initializer'
   }
 
@@ -50,7 +51,7 @@ class Applitools::Eyes
     self.failure_reports = params.fetch(:failure_reports, self.failure_reports)
     self.match_level = params.fetch(:match_level,MatchLevel::EXACT)
     self.test_name = params.fetch(:test_name)
-    self.viewport_size = params.fetch(:view_port_size, nil)
+    self.viewport_size = params.fetch(:viewport_size, nil)
 
     self.is_open = true
     driver
@@ -72,7 +73,7 @@ class Applitools::Eyes
     if !as_expected
       self.should_match_window_run_once_on_timeout = true
       if !session.new_session?
-        EyesLogger.info %( "mismatch! #{ tag ? "" : "(#{tag})" } )
+        #EyesLogger.info %( "mismatch! #{ tag ? "" : "(#{tag})" } )
         if failure_reports.to_i == Applitools::FailureReports::IMMEDIATE
           raise Applitools::TestFailedError.new("Mismatch found in '#{start_info.scenario_id_or_name}'"\
                                                 " of '#{start_info.app_id_or_name}'")
@@ -153,7 +154,7 @@ class Applitools::Eyes
       test_batch ||= Applitools::BatchInfo.new
       app_env = Applitools::Environment.new(host_os, host_app, viewport_size)
       application = driver.create_application
-      self.session_start_info = Applitools::StartInfo.new(
+      self.session_start_info = Applitools::StartInfo.new(AGENT_ID,
         app_name, test_name, test_batch, app_env, application, 
         match_level,nil, branch_name, parent_branch_name
       )
@@ -167,7 +168,8 @@ class Applitools::Eyes
 
     def assign_viewport_size
       if viewport_size?
-        self.viewport_size = Applitools::ViewportSize.new(driver, viewport_size).set
+        self.viewport_size = Applitools::ViewportSize.new(driver, viewport_size)
+	self.viewport_size.set
       else
         self.viewport_size =  Applitools::ViewportSize.new(driver).extract_viewport_from_browser!
       end

data/lib/eyes_selenium_ruby/eyes/match_window_data.rb

@@ -13,6 +13,6 @@ class Applitools::MatchWindowData
   # not be included as part of the json.
   def to_hash
     {userInputs: user_inputs.map(&:to_hash), appOutput: Hash[app_output.each_pair.to_a],
-     tag: @tag, ignore_mismatch: @ignore_mismatch}
+     tag: @tag, ignoreMismatch: @ignore_mismatch}
   end
 end

data/lib/eyes_selenium_ruby/eyes/match_window_task.rb

@@ -61,11 +61,11 @@ class Applitools::MatchWindowTask
 
     def match(tag, ignore_mismatch=false)
       data = prep_match_data(tag, ignore_mismatch)
-      agent_connector.match_window(session, data)
-
+      as_expected = agent_connector.match_window(session, data)
       # If the server stored this image, it will be used as a base for our next screenshot compression
       if !ignore_mismatch
         @last_checked_window = @current_screenshot
       end
+      return as_expected
     end
 end

data/lib/eyes_selenium_ruby/eyes/start_info.rb

@@ -1,6 +1,6 @@
 class Applitools::StartInfo
 
-  ATTRIBUTES = %w[ app_id_or_name ver_id scenario_id_or_name batch_info
+  ATTRIBUTES = %w[ agent_id app_id_or_name ver_id scenario_id_or_name batch_info
                 environment application match_level branch_name parent_branch_name ]
 
   ATTRIBUTES.each do |attr|
@@ -8,9 +8,10 @@ class Applitools::StartInfo
   end
 
   ## add a config file with this stuff, and use hash arg
-  def initialize(app_id_or_name, scenario_id_or_name, batch_info, environment,
+  def initialize(agent_id, app_id_or_name, scenario_id_or_name, batch_info, environment,
                  application, match_level, ver_id=nil, branch_name=nil, 
                  parent_branch_name=nil)
+    @agent_id = agent_id
     @app_id_or_name = app_id_or_name
     @ver_id = ver_id
     @scenario_id_or_name = scenario_id_or_name
@@ -24,7 +25,7 @@ class Applitools::StartInfo
 
   def to_hash
     {  
-      AppIdOrName: app_id_or_name, VerId: ver_id, ScenarioIdOrName: scenario_id_or_name,
+      AgentId: agent_id, AppIdOrName: app_id_or_name, VerId: ver_id, ScenarioIdOrName: scenario_id_or_name,
       BatchInfo: batch_info.to_hash, Environment: environment.to_hash, 
       Application: application.to_hash, matchLevel: match_level, branchName: branch_name,
       parentBranchName: parent_branch_name

data/lib/eyes_selenium_ruby/eyes/viewport_size.rb

@@ -68,14 +68,15 @@ class Applitools::ViewportSize
   alias_method :viewport_size, :extract_viewport_from_browser
 
   def set
-    if !dimension.respond_to?(:width) && !dimension.respond_to?(:height)
+    if dimension.is_a?(Hash) && dimension.has_key?(:width) && dimension.has_key?(:height)
+      # If dimension is hash of width/height, we convert it to a struct with width/height properties.
+      self.dimension = Struct.new(:width, :height).new(dimension[:width], dimension[:height])
+    elsif !dimension.respond_to?(:width) || !dimension.respond_to?(:height)
       raise ArgumentError, "expected #{dimension.inspect}:#{dimension.class}" +
-                                      " to respond to #width and #height"
+                           " to respond to #width and #height, or be a hash with these keys"
     end
-
     self.browser_size = dimension
     verify_size(:browser_size)
-
     cur_viewport_size = extract_viewport_from_browser
     self.browser_size = Dimension.new(
                           (2 * browser_size.width) - cur_viewport_size.width,

data/lib/eyes_selenium_ruby/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test_script.rb

@@ -4,11 +4,10 @@
 
 require 'eyes_selenium_ruby'
 
-Applitools::Eyes.config[:apikey] = 'YOUR_API_KEY_HERE'
+Applitools::Eyes.config[:apikey] = 'YOUR_API_KEY'
 
 eyes = Applitools::Eyes.new
-
-eyes.test(app_name: 'my app', test_name: 'my test') do |eyes, driver|
+eyes.test(app_name: 'Ruby SDK', test_name: 'Applitools website test',viewport_size: {width: 1024, height: 768}) do |eyes, driver|
   driver.get "http://www.applitools.com"
   eyes.check_window("initial")
   driver.find_element(:css, "li.pricing a").click

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.37'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.37'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3642816426594908165
+      hash: -2653418946361615766
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3642816426594908165
+      hash: -2653418946361615766
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25