Merge branch 'master' of https://portal-ua.globallogic.com/git/selenium

Author: nataliakoval

java/client/test/org/openqa/selenium/qtwebkit/visualizer_tests/QtWebDriverJsPage.java

@@ -148,6 +148,10 @@ public String getWebDriverJsWindowHandle() {
  return webDriverJsWindowHandle;
  }
 
+ public String getWebDriverUrlPort() {
+ return webDriverUrlPort.getAttribute("value");
+ }
+
  public void setWebDriverUrl(String url) {
  driver.get(url + "/WebDriverJsDemo.html");
  waitFor(new Callable<Object>() {
@@ -168,12 +172,39 @@ public String toString() {
  webDriverUrlPort.sendKeys(url);
  }
 
+ public String getWebPage() {
+ return webPage.getAttribute("value");
+ }
+
  public void setWebPage(String webPage) {
  this.webPage.clear();
  this.webPage.sendKeys(webPage);
  webPageValue = webPage;
  }
 
+ public Callable<String> webPageIs(final String expectedWebPage) {
+ return new Callable<String>() {
+ private String actualWebPage;
+
+ @Override
+ public String call() throws Exception {
+ actualWebPage = getWebPage();
+
+ if (expectedWebPage.equals(actualWebPage)) {
+ return actualWebPage;
+ }
+
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return "expected web page to be '" + expectedWebPage +
+ "' while actual web page is '" + actualWebPage + "'";
+ }
+ };
+ }
+
  public void clickGet() {
  getButton.click();
  waitFor(pageUrlToBe(targetDriver, webPageValue));

java/client/test/org/openqa/selenium/qtwebkit/visualizer_tests/QtWebDriverJsTest.java

@@ -2,6 +2,10 @@
 
 import org.junit.Test;
 import org.openqa.selenium.*;
+import org.openqa.selenium.qtwebkit.QtWebDriverExecutor;
+import org.openqa.selenium.qtwebkit.QtWebKitDriver;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.support.PageFactory;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -20,6 +24,30 @@ private static <X> X waitFor(Callable<X> until) {
  return TestWaiter.waitFor(until, TIME_OUT, SECONDS);
  }
 
+ @Test
+ public void checkWebPageUpdateOnSessionReuse() {
+ page.setWebPage(pages.clicksPage);
+ page.clickGet();
+
+ String webDriverUrlPort = page.getWebDriverUrlPort();
+ WebDriver originalDriver = driver;
+ try {
+ QtWebDriverExecutor webDriverExecutor = QtWebKitDriver.createDefaultExecutor();
+ driver = new QtWebKitDriver(webDriverExecutor, DesiredCapabilities.qtwebkit());
+ page = PageFactory.initElements(driver, QtWebDriverJsPage.class);
+ page.setDriver(driver);
+ page.setTargetDriver(targetDriver);
+ page.setWebDriverUrl(webDriverUrlPort);
+
+ driver.findElement(By.id("getButton")).click();
+
+ // shall retrieve web page url from previous session according to MHA-879
+ waitFor(page.webPageIs(pages.clicksPage));
+ } finally {
+ originalDriver.quit();
+ }
+ }
+
  @Test
  public void checkSourceScreenshotButtonsDisabling() {
  WebElement sourceButton = driver.findElement(By.id("sourceButton"));
@@ -212,7 +240,7 @@ public void canKeyPress() {
  }
 
  @Test
- public void canListWindows() {
+ public void canListAndChooseWindows() {
  page.setWebPage(pages.clicksPage);
  page.clickGet();
 
@@ -234,6 +262,9 @@ public void canListWindows() {
  page.getWindowListSelect().selectByValue(expectedActiveWindow);
  page.clickChooseWindow();
  waitFor(activeWindowToBe(targetDriver, expectedActiveWindow));
+
+ // Upon choose window, input field 'Web page' shall be update, MHA-879
+ waitFor(page.webPageIs(pages.xhtmlTestPage));
  }
 
  @Test

java/client/test/org/openqa/selenium/qtwebkit/visualizer_tests/QtWebDriverVisualizerTest.java

@@ -5,6 +5,8 @@
 import org.openqa.selenium.TestWaiter;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Action;
+import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.interactions.internal.MouseAction;
 import org.openqa.selenium.interactions.multitouch.MultiTouchActions;
 
 import java.util.Set;
@@ -79,6 +81,15 @@ public void isClickOnLinkCorrect() {
  assertEquals("We do not proceed by links in visualizer", visualizerTitle, driver.getTitle());
  }
 
+ @Test
+ public void canRightClick() {
+ page.setWebPage(pages.javascriptPage);
+ driver.switchTo().window(page.clickSource());
+
+ new Actions(driver).contextClick(driver.findElement(By.id("doubleClickField"))).perform();
+ waitFor(elementValueToEqual(targetDriver.findElement(By.id("doubleClickField")), "ContextClicked"));
+ }
+
  @Test
  public void canPinchRotate() {
  page.setWebPage(pages.pinchTouchTest);