fixing test, finding another edge case where we need to check -1 from…

… the right and bottom of the element's rect
tinfoil · Feb 4, 2016 · 903c2b9 · 903c2b9
1 parent 84aaf1d
commit 903c2b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java b/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java
@@ -424,9 +424,12 @@ public void testClickOverlappingElements() {
     try {
       driver.findElement(By.id("under")).click();
     } catch (WebDriverException expected) {
-      return;
+      if (expected.getMessage().contains("Other element would receive the click")) {
+        return;
+      }
+      expected.printStackTrace();
     }
-    fail("Should throw");
+    fail("Should have thrown Exception with 'Other element would receive the click' in the message");
   }
 
   @JavascriptEnabled

diff --git a/javascript/firefox-driver/js/utils.js b/javascript/firefox-driver/js/utils.js
@@ -749,9 +749,9 @@ Utils.getClickablePoint = function(element) {
     var offsets = [
       { x: Math.floor(r.width / 2), y: Math.floor(r.height / 2) },
       { x: 0, y: 0 },
-      { x: r.width, y: 0 },
-      { x: 0,  y: r.height },
-      { x: r.width, y: r.height}
+      { x: r.width - 1, y: 0 },
+      { x: 0,  y: r.height - 1 },
+      { x: r.width - 1, y: r.height - 1}
     ]
 
     return goog.array.find(offsets, function(offset){