Merge pull request #25 from applitools/develop

Merge develop to master

Author: eirenik0

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.0.2
+current_version = 4.0.3
 commit = True
 tag = True
 

eyes_common/applitools/common/__version__.py

@@ -1 +1 @@
-__version__ = "4.0.2"
+__version__ = "4.0.3"

eyes_core/applitools/core/__version__.py

@@ -1 +1 @@
-__version__ = "4.0.2"
+__version__ = "4.0.3"

eyes_images/applitools/images/__version__.py

@@ -1 +1 @@
-__version__ = "4.0.2"
+__version__ = "4.0.3"

eyes_selenium/applitools/selenium/__version__.py

@@ -1 +1 @@
-__version__ = "4.0.2"
+__version__ = "4.0.3"

eyes_selenium/applitools/selenium/eyes.py

@@ -229,7 +229,9 @@ def close(self, raise_ex=True):
 
     def close_async(self):
         if self._is_visual_grid_eyes:
-            self._current_eyes.close_async()
+            self._visual_grid_eyes.close_async()
+        else:
+            self._selenium_eyes.close(False)
 
     def _init_driver(self, driver):
         # type: (AnyWebDriver) -> None

eyes_selenium/applitools/selenium/resources/captureDom.js

@@ -1,4 +1,4 @@
-// @applitools/[email protected].8
+// @applitools/[email protected].10
 function __captureDom() {
   var captureDom = (function () {
   'use strict';
@@ -412,4 +412,4 @@ function __captureDom() {
 }());
 
   return captureDom.apply(this, arguments);
-}
+}

eyes_selenium/applitools/selenium/resources/processPage.js

@@ -1,4 +1,4 @@
-// @applitools/dom-snapshot@1.1.5
+// @applitools/dom-snapshot@1.2.4
 function __processPage() {
   var processPage = (function () {
   'use strict';
@@ -17,6 +17,10 @@ function __processPage() {
       srcEl.getAttribute('src'),
     );
 
+    const hrefUrls = [...doc.querySelectorAll('image')]
+      .map(hrefEl => hrefEl.getAttribute('href') || hrefEl.getAttribute('xlink:href'))
+      .filter(Boolean);
+
     const cssUrls = [...doc.querySelectorAll('link[rel="stylesheet"]')].map(link =>
       link.getAttribute('href'),
     );
@@ -25,7 +29,7 @@ function __processPage() {
       videoEl.getAttribute('poster'),
     );
 
-    return [...srcsetUrls, ...srcUrls, ...cssUrls, ...videoPosterUrls];
+    return [...srcsetUrls, ...srcUrls, ...hrefUrls, ...cssUrls, ...videoPosterUrls];
   }
 
   var extractLinks_1 = extractLinks;
@@ -64,21 +68,20 @@ function __processPage() {
     }
 
     function elementNodeFactory(domNodes, elementNode) {
-      let node;
+      let node, manualChildNodeIndexes;
       const {nodeType} = elementNode;
       if ([NODE_TYPES.ELEMENT, NODE_TYPES.DOCUMENT_FRAGMENT_NODE].includes(nodeType)) {
         if (elementNode.nodeName !== 'SCRIPT') {
           if (
             elementNode.nodeName === 'STYLE' &&
-            !elementNode.textContent &&
             elementNode.sheet &&
             elementNode.sheet.cssRules.length
           ) {
-            elementNode.appendChild(
-              docNode.createTextNode(
-                [...elementNode.sheet.cssRules].map(rule => rule.cssText).join(''),
-              ),
-            );
+            domNodes.push({
+              nodeType: NODE_TYPES.TEXT,
+              nodeValue: [...elementNode.sheet.cssRules].map(rule => rule.cssText).join(''),
+            });
+            manualChildNodeIndexes = [domNodes.length - 1];
           }
 
           node = {
@@ -90,16 +93,24 @@ function __processPage() {
 
               if (/^blob:/.test(value)) {
                 value = value.replace(/^blob:/, '');
+              } else if (
+                elementNode.nodeName === 'IFRAME' &&
+                name === 'src' &&
+                !elementNode.contentDocument &&
+                !value.match(/^\s*data:/)
+              ) {
+                value = '';
               }
-
               return {
                 name,
                 value,
               };
             }),
-            childNodeIndexes: elementNode.childNodes.length
-              ? childrenFactory(domNodes, elementNode.childNodes)
-              : [],
+            childNodeIndexes:
+              manualChildNodeIndexes ||
+              (elementNode.childNodes.length
+                ? childrenFactory(domNodes, elementNode.childNodes)
+                : []),
           };
 
           if (elementNode.shadowRoot) {
@@ -471,4 +482,4 @@ function __processPage() {
 }());
 
   return processPage.apply(this, arguments);
-}
+}

eyes_selenium/applitools/selenium/visual_grid/render_task.py

@@ -30,7 +30,7 @@ class RenderTask(VGTask):
     MAX_FAILS_COUNT = 5
     MAX_ITERATIONS = 100
 
-    script = attr.ib(repr=False)
+    script = attr.ib(hash=False, repr=False)  # type: Dict[str, Any]
     running_test = attr.ib()  # type: RunningTest
     resource_cache = attr.ib(hash=False, repr=False)
     put_cache = attr.ib(hash=False, repr=False)
@@ -39,7 +39,7 @@ class RenderTask(VGTask):
     region_selectors = attr.ib(hash=False, factory=list)
     size_mode = attr.ib(default=None)
     region_to_check = attr.ib(hash=False, default=None)
-    agent_id = attr.ib(hash=False, default=None)
+    agent_id = attr.ib(default=None)
     func_to_run = attr.ib(default=None, hash=False, repr=False)  # type: Callable
 
     def __attrs_post_init__(self):
@@ -59,7 +59,7 @@ def get_and_put_resource(url):
             return resource
 
         requests = []
-        rq = self.prepare_data_for_rg(self.script_data)
+        rq = self.prepare_data_for_rg(self.script)
         requests.append(rq)
         fetch_fails = 0
         render_requests = None
@@ -107,11 +107,6 @@ def get_and_put_resource(url):
             )
         return statuses[0]
 
-    @property
-    def script_data(self):
-        # type: () -> Dict[str, Any]
-        return json.loads(self.script, object_pairs_hook=OrderedDict)
-
     def prepare_data_for_rg(self, data):
         # type: (Dict) -> RenderRequest
         base_url = data["url"]

eyes_selenium/applitools/selenium/visual_grid/running_test.py

@@ -157,7 +157,7 @@ def check(
         self,
         tag,  # type: Text
         check_settings,  # type: SeleniumCheckSettings
-        script_result,  # type: Text
+        script_result,  # type: Dict[str, Any]
         visual_grid_manager,  # type: VisualGridRunner
         region_selectors,
         size_mode,
@@ -204,7 +204,7 @@ def _render_task(
         size_mode,
         region_to_check,
     ):
-        # type: (Text,Text,VisualGridRunner,List,Region,Optional[Any])->RenderTask
+        # type: (Dict[str, Any],Text,VisualGridRunner,List,Region,Optional[Any])->RenderTask
         render_task = RenderTask(
             name="RunningTest.render {} - {}".format(
                 self.configuration.short_description, tag