Menu
▾
▴
[HtmlUnit] SVN: [15364] trunk/htmlunit/src
|
From: <rb...@us...> - 2018-06-20 06:48:53
|
Revision: 15364
http://sourceforge.net/p/htmlunit/code/15364
Author: rbri
Date: 2018-06-20 06:48:47 +0000 (Wed, 20 Jun 2018)
Log Message:
-----------
ff60 support (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2018-06-20 06:48:47 UTC (rev 15364)
@@ -286,7 +286,6 @@
FIREFOX_60.registerUploadMimeType("opus", "audio/ogg");
FIREFOX_60.registerUploadMimeType("webm", "video/webm");
FIREFOX_60.registerUploadMimeType("wav", "audio/wav");
- FIREFOX_60.registerUploadMimeType("flac", "audio/x-flac");
FIREFOX_60.registerUploadMimeType("xhtml", "application/xhtml+xml");
FIREFOX_60.registerUploadMimeType("xht", "application/xhtml+xml");
FIREFOX_60.registerUploadMimeType("txt", "text/plain");
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2018-06-20 06:48:47 UTC (rev 15364)
@@ -417,11 +417,11 @@
HTMLINPUT_FILES_UNDEFINED,
/** HTMLInputElement: type {@code file} selectionSart/End are null. */
- @BrowserFeature({CHROME, FF52})
+ @BrowserFeature({CHROME, FF})
HTMLINPUT_FILE_SELECTION_START_END_NULL,
/** HTMLInputElement: type {@code file} value to be {@code fakepath}. */
- @BrowserFeature({CHROME, IE})
+ @BrowserFeature({CHROME, FF60, IE})
HTMLINPUT_FILE_VALUE_FAKEPATH,
/** Should the HTMLElement of {@code keygen} have no end tag. */
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java 2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlApplet2Test.java 2018-06-20 06:48:47 UTC (rev 15364)
@@ -39,7 +39,8 @@
*/
@Test
@Alerts(DEFAULT = {"[object HTMLAppletElement]", "[object HTMLCollection]", "1", "[object HTMLAppletElement]"},
- CHROME = {"[object HTMLUnknownElement]", "[object HTMLCollection]", "0", "undefined"})
+ CHROME = {"[object HTMLUnknownElement]", "[object HTMLCollection]", "0", "undefined"},
+ FF60 = {"[object HTMLUnknownElement]", "[object NodeList]", "0", "undefined"})
public void simpleScriptable() throws Exception {
final String html = "<html><head>\n"
+ "<script>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java 2018-06-20 06:19:39 UTC (rev 15363)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInputTest.java 2018-06-20 06:48:47 UTC (rev 15364)
@@ -254,10 +254,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = {"CONTENT_TYPE:audio/flac", "charset"},
- FF60 = {"CONTENT_TYPE:audio/x-flac", "charset"},
- FF52 = {"CONTENT_TYPE:application/octet-stream", "charset"},
- IE = {"CONTENT_TYPE:application/octet-stream", "charset"})
+ @Alerts(DEFAULT = {"CONTENT_TYPE:application/octet-stream", "charset"},
+ CHROME = {"CONTENT_TYPE:audio/flac", "charset"})
public void contentTypeFlac() throws Exception {
contentType("flac");
}
@@ -827,9 +825,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = {"ex start", "ex end", "exception"},
- CHROME = {"null", "null", "0"},
- FF52 = {"null", "null", "0"})
+ @Alerts(DEFAULT = {"null", "null", "0"},
+ IE = {"ex start", "ex end", "exception"})
public void selection() throws Exception {
final String html =
"<html><head><script>\n"
@@ -864,9 +861,6 @@
@Alerts(DEFAULT = {"null,null", "exception value", "null,null",
"exception", "null,null",
"exception", "null,null"},
- FF60 = {"exception", "exception value", "exception",
- "exception", "exception",
- "exception", "exception"},
IE = {"exception", "exception",
"exception", "exception",
"exception", "exception"})
@@ -881,9 +875,6 @@
@Alerts(DEFAULT = {"null,null", "exception value", "null,null",
"exception", "null,null",
"exception", "null,null"},
- FF60 = {"exception", "exception value", "exception",
- "exception", "exception",
- "exception", "exception"},
IE = {"exception", "exception",
"exception", "exception",
"exception", "exception"})
@@ -898,9 +889,6 @@
@Alerts(DEFAULT = {"null,null", "exception value", "null,null",
"exception", "null,null",
"exception", "null,null"},
- FF60 = {"exception", "exception value", "exception",
- "exception", "exception",
- "exception", "exception"},
IE = {"exception", "exception",
"exception", "exception",
"exception", "exception"})
@@ -949,9 +937,8 @@
* @throws Exception if test fails
*/
@Test
- @Alerts(DEFAULT = "exception",
- CHROME = {"null,null", "exception"},
- FF52 = {"null,null", "exception"})
+ @Alerts(DEFAULT = {"null,null", "exception"},
+ IE = "exception")
public void selectionOnUpdate() throws Exception {
final String html = "<html>\n"
+ "<body>\n"
@@ -1033,7 +1020,7 @@
*/
@Test
@Alerts(DEFAULT = "C:\\fakepath\\pom.xml--null",
- FF = "pom.xml--null")
+ FF52 = "pom.xml--null")
// since 2.28
// there is an option for IE, for local and trusted sites IE includes the file path
// because we do not support any IE specific setting we do not send the filename as
@@ -1115,7 +1102,7 @@
*/
@Test
@Alerts(DEFAULT = "C:\\fakepath\\pom.xml",
- FF = "pom.xml")
+ FF52 = "pom.xml")
// since 2.28
// there is an option for IE, for local and trusted sites IE includes the file path
// because we do not support any IE specific setting we do not send the filename as
|
