From f085b0df824ff336d6cc402635afc9201bbb3ae5 Mon Sep 17 00:00:00 2001
From: Alexei Barantsev <barancev@gmail.com>
Date: Wed, 14 May 2014 12:41:58 +0400
Subject: [PATCH] Ignoring new test in the browsers that fail it on CI

---
 .../interactions/CombinedInputActionsTest.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java b/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java
index d8108af58e6a6..435ea4c2bfac9 100644
--- a/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java
+++ b/java/client/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java
@@ -39,6 +39,7 @@
 import static org.openqa.selenium.testing.TestUtilities.isFirefox;
 import static org.openqa.selenium.testing.TestUtilities.isInternetExplorer;
 import static org.openqa.selenium.testing.TestUtilities.isNativeEventsEnabled;
+import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
 
 import org.junit.Test;
 import org.openqa.selenium.By;
@@ -48,7 +49,6 @@
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WaitingConditions;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
@@ -185,7 +185,7 @@ public void testControlClickingOnCustomMultiSelectionList() {
   private void navigateToClicksPageAndClickLink() {
     driver.get(pages.clicksPage);
 
-    wait.until(ExpectedConditions.presenceOfElementLocated(By.id("normal")));
+    wait.until(presenceOfElementLocated(By.id("normal")));
     WebElement link = driver.findElement(By.id("normal"));
 
     new Actions(driver)
@@ -208,7 +208,7 @@ public void testCanClickOnLinks() {
   public void testCanClickOnLinksWithAnOffset() {
     driver.get(pages.clicksPage);
 
-    wait.until(ExpectedConditions.presenceOfElementLocated(By.id("normal")));
+    wait.until(presenceOfElementLocated(By.id("normal")));
     WebElement link = driver.findElement(By.id("normal"));
 
     new Actions(driver)
@@ -220,7 +220,7 @@ public void testCanClickOnLinksWithAnOffset() {
   }
 
   @Ignore(
-      value = {HTMLUNIT, IPHONE},
+      value = {HTMLUNIT, IPHONE, CHROME, IE, OPERA, SAFARI},
       reason = "HtmlUnit: Advanced mouse actions only implemented in rendered browsers")
   @Test
   public void testClickAfterMoveToAnElementWithAnOffsetShouldUseLastMousePosition() {
@@ -236,6 +236,8 @@ public void testClickAfterMoveToAnElementWithAnOffsetShouldUseLastMousePosition(
         .click()
         .perform();
 
+    wait.until(presenceOfElementLocated(By.id("pageX")));
+
     int x = Integer.parseInt(driver.findElement(By.id("pageX")).getText());
     int y = Integer.parseInt(driver.findElement(By.id("pageY")).getText());
 
@@ -347,7 +349,7 @@ public void testHoldingDownShiftKeyWhileClicking() {
     new Actions(driver).keyDown(Keys.SHIFT).click(toClick).keyUp(Keys.SHIFT).perform();
 
     WebElement shiftInfo =
-        wait.until(ExpectedConditions.presenceOfElementLocated(By.id("shiftKey")));
+        wait.until(presenceOfElementLocated(By.id("shiftKey")));
     assertThat(shiftInfo.getText(), equalTo("true"));
   }