[JWebUnit-development] SF.net SVN: jwebunit:[950] trunk/jwebunit-webdriver-plugin/src/main/java/ net/sourceforge/jwebunit/webdriver

[<he...@us...>]

Revision: 950
          http://jwebunit.svn.sourceforge.net/jwebunit/?rev=950&view=rev
Author:   henryju
Date:     2012-07-25 17:20:51 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
Workaround for issue 1466.

Modified Paths:
--------------
    trunk/jwebunit-webdriver-plugin/src/main/java/net/sourceforge/jwebunit/webdriver/FixedHtmlUnitDriver.java
    trunk/jwebunit-webdriver-plugin/src/main/java/net/sourceforge/jwebunit/webdriver/WebDriverTestingEngineImpl.java

Modified: trunk/jwebunit-webdriver-plugin/src/main/java/net/sourceforge/jwebunit/webdriver/FixedHtmlUnitDriver.java
===================================================================
--- trunk/jwebunit-webdriver-plugin/src/main/java/net/sourceforge/jwebunit/webdriver/FixedHtmlUnitDriver.java	2012-07-25 16:01:36 UTC (rev 949)
+++ trunk/jwebunit-webdriver-plugin/src/main/java/net/sourceforge/jwebunit/webdriver/FixedHtmlUnitDriver.java	2012-07-25 17:20:51 UTC (rev 950)
@@ -10,7 +10,6 @@
         if (getCurrentWindow() != null) {
             if (getWebClient().getWebWindows().size() > 1) {
                 ((TopLevelWindow) getCurrentWindow().getTopWindow()).close();
-                
             }
             else {
                 quit();

Modified: trunk/jwebunit-webdriver-plugin/src/main/java/net/sourceforge/jwebunit/webdriver/WebDriverTestingEngineImpl.java
===================================================================
--- trunk/jwebunit-webdriver-plugin/src/main/java/net/sourceforge/jwebunit/webdriver/WebDriverTestingEngineImpl.java	2012-07-25 16:01:36 UTC (rev 949)
+++ trunk/jwebunit-webdriver-plugin/src/main/java/net/sourceforge/jwebunit/webdriver/WebDriverTestingEngineImpl.java	2012-07-25 17:20:51 UTC (rev 950)
@@ -335,7 +335,11 @@
 
     public void closeWindow() {
         formIdent = null;
-        driver.close();//FIXME Issue 1466
+        driver.close();
+        //FIXME Issue 1466 & 2834
+        if (getWindowCount() > 0) {
+        	driver.switchTo().window(driver.getWindowHandles().iterator().next());
+        }
     }
 
     public boolean hasFrame(String frameNameOrId) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.