From: <rb...@us...> - 2013-05-22 20:46:24
|
Revision: 8283 http://sourceforge.net/p/htmlunit/code/8283 Author: rbri Date: 2013-05-22 20:46:21 +0000 (Wed, 22 May 2013) Log Message: ----------- fix wrong mouse event triggering because of broken selenium Modified Paths: -------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOption2Test.java Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2013-05-22 18:10:43 UTC (rev 8282) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2013-05-22 20:46:21 UTC (rev 8283) @@ -184,11 +184,11 @@ EVENT_ONLOAD_IFRAME_CREATED_BY_JAVASCRIPT, /** Does not trigger "onmousedown" event handler for the select options. */ - @BrowserFeature({ @WebBrowser(value = FF, minVersion = 10), @WebBrowser(IE) }) + @BrowserFeature({ @WebBrowser(IE) }) EVENT_ONMOUSEDOWN_FOR_SELECT_OPTION_TRIGGERS_ADDITIONAL_DOWN_FOR_SELECT, /** Does not trigger "onmousedown" event handler for the select options. */ - @BrowserFeature({ @WebBrowser(value = FF, minVersion = 10) }) + @BrowserFeature({ }) EVENT_ONMOUSEDOWN_FOR_SELECT_OPTION_TRIGGERS_ADDITIONAL_UP_FOR_SELECT, /** Does not trigger "onmousedown" event handler for the select options. */ Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOption2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOption2Test.java 2013-05-22 18:10:43 UTC (rev 8282) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlOption2Test.java 2013-05-22 20:46:21 UTC (rev 8283) @@ -23,6 +23,8 @@ import com.gargoylesoftware.htmlunit.BrowserRunner; import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts; +import com.gargoylesoftware.htmlunit.BrowserRunner.Browser; +import com.gargoylesoftware.htmlunit.BrowserRunner.BuggyWebDriver; import com.gargoylesoftware.htmlunit.WebDriverTestCase; /** @@ -38,10 +40,14 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "sDown,dDown,sUp,dUp,oDown,sDown,dDown,oUp,sUp,dUp,", + @Alerts(DEFAULT = "oDown,sDown,dDown,oUp,sUp,dUp,", FF3_6 = "sUp,dUp,oUp,sUp,dUp,", IE = "sDown,dDown,sUp,dUp,", CHROME = "sUp,dUp,") + // there seems to be a bug in selenium; for FF >= 10 this triggers + // "sDown,dDown,sUp,dUp,oDown,sDown,dDown,oUp,sUp,dUp," but a + // manual test shows, that this is wrong. + @BuggyWebDriver({ Browser.FF10, Browser.FF17 }) public void onMouse() throws Exception { final String html = "<html><head><title>foo</title>\n" + "<script>\n" |