eyes_selenium 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4219715fa9dc4e8d577f379654dfb8de47f4b0c3
-  data.tar.gz: be34d6a658b4c2da134940518a56355a4ddd2b2e
+  metadata.gz: f8ba2453778c9eb7863f0d5c086033065137972a
+  data.tar.gz: 98f3873d83dfefdf27f95c77898bf2cfb95028bf
 SHA512:
-  metadata.gz: 6c64a2308075fa442cbe9bef45d88b2873b4ea27403cc9daab82c62afcc418b3368a3d379256c0a70aee5bc262f52176428bbe158484e6900b02757d48a400fd
-  data.tar.gz: 7b2b468fe9957dba640ecc54e715f2a3c9f2e7a8f9af40ece6fefe07ae2ffea1bf286fb3677c434695529ca1ac2cbe2a6e48ed5fade55d4a9f1cebce4768e083
+  metadata.gz: 51556719e486c1da48c5a3c462eae36ab209c090f1eea2a62c17bd91fbf3c3203fd5e33cc7b3eb154873f6cd4268c0515f6fa9067315ef759a6b76c589201e32
+  data.tar.gz: c5ce2f9c41eb260b2881e6b7c65b44c5a8639b5e3aff45fe37787e053cc7d6ce9eb4d93c821a6a90f596b3f1ed04eb5710902186540b46ba7388bb5808b97d40

data/lib/eyes_selenium/eyes/agent_connector.rb

@@ -35,8 +35,10 @@ class Applitools::AgentConnector
   def start_session(session_start_info)
    self.class.headers 'Content-Type' => 'application/json'
    res = self.class.post(@endpoint_uri, query: {apiKey: api_key}, body: { startInfo: session_start_info.to_hash }.to_json)
+   EyesLogger.debug "Got response! #{res}"
    status_code = res.response.message
    parsed_res = res.parsed_response
+   EyesLogger.debug "Parsed response #{parsed_res}"
    Applitools::Session.new(parsed_res['id'], parsed_res['url'], status_code == 'Created' )
   end
 

data/lib/eyes_selenium/eyes/viewport_size.rb

@@ -1,24 +1,27 @@
 class Applitools::ViewportSize
 
-  GET_VIEWPORT_HEIGHT_JAVASCRIPT_FOR_NORMAL_BROWSER = "return window.innerHeight"
-  GET_VIEWPORT_WIDTH_JAVASCRIPT_FOR_NORMAL_BROWSER  = "return window.innerWidth"
-
-  DOCUMENT_CLEAR_SCROLL_BARS_JAVASCRIPT = "var doc = document.documentElement;" +
-                                          "var previousOverflow = doc.style.overflow;"
-  DOCUMENT_RESET_SCROLL_BARS_JAVASCRIPT = "doc.style.overflow = previousOverflow;"
-  DOCUMENT_RETURN_JAVASCRIPT            = "return __applitools_result;"
-
-  GET_VIEWPORT_WIDTH_JAVASCRIPT_FOR_BAD_BROWSERS = 
-                  DOCUMENT_CLEAR_SCROLL_BARS_JAVASCRIPT        +
-                  "var __applitools_result = doc.clientWidth;" +
-                  DOCUMENT_RESET_SCROLL_BARS_JAVASCRIPT        +
-                  DOCUMENT_RETURN_JAVASCRIPT
-
-  GET_VIEWPORT_HEIGHT_JAVASCRIPT_FOR_BAD_BROWSERS = 
-                  DOCUMENT_CLEAR_SCROLL_BARS_JAVASCRIPT         +
-                  "var __applitools_result = doc.clientHeight;" +
-                  DOCUMENT_RESET_SCROLL_BARS_JAVASCRIPT         +
-                  DOCUMENT_RETURN_JAVASCRIPT
+  JS_GET_VIEWPORT_HEIGHT =
+      'var height = undefined;' +
+      '  if (window.innerHeight) {height = window.innerHeight;}' +
+      '  else if (document.documentElement ' +
+        '&& document.documentElement.clientHeight) ' +
+          '{height = document.documentElement.clientHeight;}' +
+      '  else { var b = document.getElementsByTagName("body")[0]; ' +
+                'if (b.clientHeight) {height = b.clientHeight;}' +
+          '};' +
+      'return height;'
+
+  JS_GET_VIEWPORT_WIDTH  =
+      'var width = undefined;' +
+      ' if (window.innerWidth) {width = window.innerWidth;}' +
+      ' else if (document.documentElement ' +
+          '&& document.documentElement.clientWidth) ' +
+            '{width = document.documentElement.clientWidth;}' +
+      ' else { var b = document.getElementsByTagName("body")[0]; ' +
+              'if (b.clientWidth) {' +
+                'width = b.clientWidth;}' +
+              '};' +
+            'return width;'
 
   attr_reader :driver
   attr_accessor :dimension
@@ -28,23 +31,11 @@ class Applitools::ViewportSize
   end
 
   def extract_viewport_width
-     begin
-       return driver.execute_script(GET_VIEWPORT_WIDTH_JAVASCRIPT_FOR_NORMAL_BROWSER)
-     rescue => e 
-       EyesLogger.info "getViewportSize(): Browser does not support innerWidth (#{e.message})"
-     end
-
-    driver.execute_script(GET_VIEWPORT_WIDTH_JAVASCRIPT_FOR_BAD_BROWSERS)
+    driver.execute_script(JS_GET_VIEWPORT_WIDTH)
   end
 
   def extract_viewport_height
-     begin
-       return driver.execute_script(GET_VIEWPORT_HEIGHT_JAVASCRIPT_FOR_NORMAL_BROWSER)
-     rescue  => e 
-       EyesLogger.info "getViewportSize(): Browser does not support innerHeight (#{e.message})"
-     end
-
-    driver.execute_script(GET_VIEWPORT_HEIGHT_JAVASCRIPT_FOR_BAD_BROWSERS)
+    driver.execute_script(JS_GET_VIEWPORT_HEIGHT)
   end
 
   def extract_viewport_from_browser!
@@ -52,12 +43,17 @@ class Applitools::ViewportSize
   end
 
   def extract_viewport_from_browser
-    width  = extract_viewport_width 
-    height = extract_viewport_height
-    Applitools::Dimension.new(width,height)
-  rescue => e
-    EyesLogger.info "getViewportSize(): only window size is available (#{e.message})"
-    width, height = *browser_size.values
+    width, height = nil, nil
+    begin
+      width  = extract_viewport_width
+      height = extract_viewport_height
+    rescue => e
+      EyesLogger.info "getViewportSize(): failed to extract viewport size using Javascript: (#{e.message})"
+    end
+    if width.nil? || height.nil?
+      EyesLogger.info 'getViewportSize(): using window size as viewport size.'
+      width, height = *browser_size.values
+    end
     Applitools::Dimension.new(width,height)
   end
   alias_method :viewport_size, :extract_viewport_from_browser

data/lib/eyes_selenium/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '2.5.0'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Applitools team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver