Menu
▾
▴
[HtmlUnit] SVN: [8674] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-10-22 20:52:53
|
Revision: 8674
http://sourceforge.net/p/htmlunit/code/8674
Author: rbri
Date: 2013-10-22 20:52:50 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
test fix, works with current selenium
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java 2013-10-22 18:26:58 UTC (rev 8673)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLUnknownElement.java 2013-10-22 20:52:50 UTC (rev 8674)
@@ -87,13 +87,16 @@
return "block";
}
- // FF 3.6
+ // FF < 16
if ("METER".equals(tagName)) {
return "inline-block";
}
if ("PROGRESS".equals(tagName)) {
return "inline-block";
}
+ if ("DATALIST".equals(tagName)) {
+ return "none";
+ }
}
if ("RUBY".equals(tagName)) {
if (getBrowserVersion().hasFeature(CSS_DISPLAY_DEFAULT)) {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2013-10-22 18:26:58 UTC (rev 8673)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2013-10-22 20:52:50 UTC (rev 8674)
@@ -339,7 +339,7 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts({ "inline", "table-caption", "block", "inline", "inline", "table-column", "table-column-group" })
+ @Alerts({ "inline", "table-caption", "block", "inline", "inline", "table-column", "table-column-group", "inline" })
public void defaultDisplayValues_C() throws Exception {
final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <canvas id='canvas'></canvas>\n"
@@ -358,7 +358,7 @@
+ " </p>\n"
+ " <menu>\n"
- // + " <command id='command'></command>\n"
+ + " <command id='command'></command>\n"
+ " </menu>\n"
+ " <script>\n"
@@ -377,7 +377,7 @@
+ " x('code');\n"
+ " x('col');\n"
+ " x('colgroup');\n"
- // + " x('command');\n"
+ + " x('command');\n"
+ " </script>\n"
+ "</body></html>";
loadPageWithAlerts2(html);
@@ -387,7 +387,8 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts({ "block", "inline", "inline", "block", "block", "block", "block" })
+ @Alerts(DEFAULT = { "none", "block", "inline", "inline", "inline", "inline", "block", "block", "block", "block" },
+ IE8 = { "inline", "block", "inline", "inline", "inline", "inline", "block", "block", "block", "block" })
public void defaultDisplayValues_D() throws Exception {
final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <datalist id='datalist'></datalist>\n"
@@ -401,9 +402,9 @@
+ " <del id='del'></del>\n"
+ " </p>\n"
- // + " <details id='details'></details>\n"
+ + " <details id='details'></details>\n"
+ " <dfn id='dfn'></dfn>\n"
- // + " <dialog id='dialog'></dialog>\n"
+ + " <dialog id='dialog'></dialog>\n"
+ " <dir id='dir'></dir>\n"
+ " <dir id='div'></div>\n"
@@ -416,12 +417,12 @@
+ " }\n"
+ " </script>\n"
+ " <script>\n"
- // + " x('datalist');\n"
+ + " x('datalist');\n"
+ " x('dd');\n"
+ " x('del');\n"
- // + " x('details');\n"
+ + " x('details');\n"
+ " x('dfn');\n"
- // + " x('dialog');\n"
+ + " x('dialog');\n"
+ " x('dir');\n"
+ " x('div');\n"
+ " x('dl');\n"
|
