From: <mgu...@us...> - 2013-01-08 11:04:43
|
Revision: 7965 http://sourceforge.net/p/htmlunit/code/7965 Author: mguillem Date: 2013-01-08 11:04:39 +0000 (Tue, 08 Jan 2013) Log Message: ----------- FF17's toLocaleTimeString behaves like Chrome rather than like older FF versions Modified Paths: -------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeDateTest.java Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2013-01-08 10:58:41 UTC (rev 7964) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2013-01-08 11:04:39 UTC (rev 7965) @@ -758,7 +758,7 @@ JS_CONSTRUCTOR, /** Is Date.toLocaleTimeString() in 24-hour format. */ - @BrowserFeature(@WebBrowser(CHROME)) + @BrowserFeature({ @WebBrowser(CHROME), @WebBrowser(value = FF, minVersion = 17) }) JS_DATE_LOCATE_TIME_24, /** */ Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeDateTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeDateTest.java 2013-01-08 10:58:41 UTC (rev 7964) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeDateTest.java 2013-01-08 11:04:39 UTC (rev 7965) @@ -170,7 +170,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "12:00:00 AM", CHROME = "00:00:00") + @Alerts(DEFAULT = "12:00:00 AM", FF17 = "00:00:00", CHROME = "00:00:00") public void toLocaleTimeString() throws Exception { final String html = "<html><head><title>foo</title><script>\n" |