Fixing "do we need to scroll" condition: we do if the element is not in

the parent overflow. Fixes issue 4099
Zitrax · Apr 20, 2013 · a823e0a · a823e0a
1 parent 6332514
commit a823e0a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/common/src/web/scrolling_tests/page_with_double_overflow_auto.html b/common/src/web/scrolling_tests/page_with_double_overflow_auto.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Page with overflow: auto</title>
+  <style type="text/css">
+    html, body {
+        width: 100%;
+        height: 100%;
+        overflow: auto;
+    }
+  </style>
+</head>
+<body>
+  <div style="height: 5000px;">Placeholder</div>
+  <div>
+    <a id="link" href="target_page.html">Click me!</a>
+  </div>
+</body>
+</html>
diff --git a/common/src/web/scrolling_tests/target_page.html b/common/src/web/scrolling_tests/target_page.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Clicked Successfully!</title>
+</head>
+<body>
+<h1>Clicked Successfully!</h1>
+</body>
+</html>
diff --git a/java/client/test/org/openqa/selenium/ClickScrollingTest.java b/java/client/test/org/openqa/selenium/ClickScrollingTest.java
@@ -30,6 +30,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.openqa.selenium.TestWaiter.waitFor;
 import static org.openqa.selenium.testing.Ignore.Driver.ANDROID;
 import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
 import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
@@ -89,6 +90,14 @@ public void testShouldBeAbleToClickOnAnElementHiddenByOverflow() {
     assertEquals("line8", driver.findElement(By.id("clicked")).getText());
   }
 
+  @Test
+  public void testShouldBeAbleToClickOnAnElementHiddenByDoubleOverflow() {
+    driver.get(appServer.whereIs("scrolling_tests/page_with_double_overflow_auto.html"));
+
+    driver.findElement(By.id("link")).click();
+    waitFor(WaitingConditions.pageTitleToBe(driver, "Clicked Successfully!"));
+  }
+
   @JavascriptEnabled
   @Ignore({OPERA})
   @Test

diff --git a/javascript/atoms/action.js b/javascript/atoms/action.js
@@ -634,7 +634,7 @@ bot.action.LegacyDevice_.findAncestorForm = function(element) {
  * @return {boolean} Whether the element is in view after scrolling.
  */
 bot.action.scrollIntoView = function(element, opt_coords) {
-  if (!bot.dom.isScrolledIntoView(element, opt_coords)) {
+  if (!bot.dom.isScrolledIntoView(element, opt_coords) && !bot.dom.isInParentOverflow(element, opt_coords)) {
     // Some elements may not have a scrollIntoView function - for example,
     // elements under an SVG element. Call those only if they exist.
     if (typeof element.scrollIntoView == 'function') {