cuprite 0.12 → 0.15.1

data/lib/capybara/cuprite/errors.rb

@@ -9,13 +9,15 @@ module Capybara
 
       def initialize(response)
         @response = response
+        super()
       end
     end
 
     class InvalidSelector < ClientError
       def initialize(response, method, selector)
         super(response)
-        @method, @selector = method, selector
+        @method = method
+        @selector = selector
       end
 
       def message
@@ -28,14 +30,13 @@ module Capybara
 
       def initialize(*)
         super
-        data = /\A\w+: (\w+), (.+?), ([\d\.-]+), ([\d\.-]+)/.match(@response)
+        data = /\A\w+: (\w+), (.+?), ([\d.-]+), ([\d.-]+)/.match(@response)
         @name, @selector = data.values_at(1, 2)
         @position = data.values_at(3, 4).map(&:to_f)
       end
 
-
       def message
-        "Firing a #{name} at coordinates [#{position.join(", ")}] failed. Cuprite detected " \
+        "Firing a #{name} at coordinates [#{position.join(', ')}] failed. Cuprite detected " \
           "another element with CSS selector \"#{selector}\" at this position. " \
           "It may be overlapping the element you are trying to interact with. " \
           "If you don't care about overlapping elements, try using node.trigger(\"#{name}\")."
@@ -52,10 +53,10 @@ module Capybara
 
       def message
         "The element you are trying to interact with is either not part of the DOM, or is " \
-        "not currently visible on the page (perhaps display: none is set). " \
-        "It is possible the element has been replaced by another element and you meant to interact with " \
-        "the new element. If so you need to do a new find in order to get a reference to the " \
-        "new element."
+          "not currently visible on the page (perhaps display: none is set). " \
+          "It is possible the element has been replaced by another element and you meant to interact with " \
+          "the new element. If so you need to do a new find in order to get a reference to the " \
+          "new element."
       end
     end
   end

data/lib/capybara/cuprite/javascripts/index.js

@@ -41,7 +41,7 @@ class Cuprite {
   parents(node) {
     let nodes = [];
     let parent = node.parentNode;
-    while (parent != document) {
+    while (parent != document && parent !== null) {
       nodes.push(parent);
       parent = parent.parentNode;
     }
@@ -84,7 +84,6 @@ class Cuprite {
     return true;
   }
 
-
   isDisabled(node) {
     let xpath = "parent::optgroup[@disabled] | \
                  ancestor::select[@disabled] | \
@@ -97,7 +96,7 @@ class Cuprite {
   path(node) {
     let nodes = [node];
     let parent = node.parentNode;
-    while (parent !== document) {
+    while (parent !== document && parent !== null) {
       nodes.unshift(parent);
       parent = parent.parentNode;
     }
@@ -151,7 +150,7 @@ class Cuprite {
         // call the following functions in order, if one returns false (preventDefault),
         // stop the call chain
         [
-          () => this.keyupdowned(node, "keydown", keyCode),
+          () => this.keyupdowned(node, "keydown", char, keyCode),
           () => this.keypressed(node, false, false, false, false, char.charCodeAt(0), char.charCodeAt(0)),
           () => {
             this.setValue(node, node.value + char)
@@ -159,7 +158,7 @@ class Cuprite {
           }
         ].some(fn => fn())
 
-        this.keyupdowned(node, "keyup", keyCode);
+        this.keyupdowned(node, "keyup", char, keyCode);
       }
     }
 
@@ -180,19 +179,22 @@ class Cuprite {
   }
 
   input(node) {
-    let event = document.createEvent("HTMLEvents");
-    event.initEvent("input", true, false);
+    let event = new InputEvent("input", { inputType: "insertText", bubbles: true, cancelable: false });
     node.dispatchEvent(event);
   }
 
   /**
    * @return {boolean} false when an event handler called preventDefault()
    */
-  keyupdowned(node, eventName, keyCode) {
-    let event = document.createEvent("UIEvents");
-    event.initEvent(eventName, true, true);
-    event.keyCode  = keyCode;
-    event.charCode = 0;
+  keyupdowned(node, eventName, char, keyCode) {
+    let event = new KeyboardEvent(
+      eventName, {
+        bubbles: true,
+        cancelable: true,
+        key: char,
+        keyCode: keyCode
+      }
+    );
     return !node.dispatchEvent(event);
   }
 
@@ -200,15 +202,18 @@ class Cuprite {
    * @return {boolean} false when an event handler called preventDefault()
    */
   keypressed(node, altKey, ctrlKey, shiftKey, metaKey, keyCode, charCode) {
-    event = document.createEvent("UIEvents");
-    event.initEvent("keypress", true, true);
-    event.window   = window;
-    event.altKey   = altKey;
-    event.ctrlKey  = ctrlKey;
-    event.shiftKey = shiftKey;
-    event.metaKey  = metaKey;
-    event.keyCode  = keyCode;
-    event.charCode = charCode;
+    let event = new KeyboardEvent(
+      "keypress", {
+        bubbles: true,
+        cancelable: true,
+        altKey: altKey,
+        ctrlKey: ctrlKey,
+        shiftKey: shiftKey,
+        metaKey: metaKey,
+        keyCode: keyCode,
+        charCode: charCode
+      }
+    );
     return !node.dispatchEvent(event);
   }
 
@@ -338,10 +343,24 @@ class Cuprite {
 
   _isInViewport(node) {
     let rect = node.getBoundingClientRect();
-    return rect.top >= 0 &&
-           rect.left >= 0 &&
-           rect.bottom <= window.innerHeight &&
-           rect.right <= window.innerWidth;
+
+    let inViewport =  rect.top >= 0 &&
+                      rect.left >= 0 &&
+                      rect.bottom <= window.innerHeight &&
+                      rect.right <= window.innerWidth;
+
+    if (inViewport) {
+      // check if obscured by another element
+      let x = rect.width/2;
+      let y = rect.height/2 ;
+
+      let px = rect.left + x,
+          py = rect.top + y,
+          e = document.elementFromPoint(px, py);
+      return node == e;
+    }
+
+    return false;
   }
 
   select(node, value) {
@@ -350,12 +369,13 @@ class Cuprite {
     } else if (value == false && !node.parentNode.multiple) {
       return false;
     } else {
-      this.trigger(node.parentNode, "focus");
+      let parentNode = node.parentNode;
+      this.trigger(parentNode, "focus");
 
       node.selected = value;
       this.changed(node);
 
-      this.trigger(node.parentNode, "blur");
+      this.trigger(parentNode, "blur");
       return true;
     }
   }