[HtmlUnit] SVN: [15242] trunk/htmlunit/src

[<rb...@us...>]

Revision: 15242
          http://sourceforge.net/p/htmlunit/code/15242
Author:   rbri
Date:     2018-04-21 15:46:39 +0000 (Sat, 21 Apr 2018)
Log Message:
-----------
latest chrome (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSImportRuleTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-04-21 15:31:12 UTC (rev 15241)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2018-04-21 15:46:39 UTC (rev 15242)
@@ -1061,7 +1061,7 @@
     JS_MEDIA_LIST_ALL,
 
     /** Indicates that an empty media list is represented by the string 'all'. */
-    @BrowserFeature(FF)
+    @BrowserFeature({CHROME, FF})
     JS_MEDIA_LIST_EMPTY_STRING,
 
     /** Type property of menu has always '' as value. */

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSImportRuleTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSImportRuleTest.java	2018-04-21 15:31:12 UTC (rev 15241)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSImportRuleTest.java	2018-04-21 15:46:39 UTC (rev 15242)
@@ -40,9 +40,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"[object CSSImportRule]", "§§URL§§second/",
-                "[object MediaList]", "0", "[object CSSStyleSheet]"},
-            FF = {"[object CSSImportRule]", "§§URL§§second/", "", "0", "[object CSSStyleSheet]"},
+    @Alerts(DEFAULT = {"[object CSSImportRule]", "§§URL§§second/", "", "0", "[object CSSStyleSheet]"},
             IE = {"[object CSSImportRule]", "§§URL§§second/",
                 "all", "0", "[object CSSStyleSheet]"})
     public void getImportFromCssRulesCollection_absolute() throws Exception {
@@ -54,9 +52,7 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts(DEFAULT = {"[object CSSImportRule]", "foo.css",
-                "[object MediaList]", "0", "[object CSSStyleSheet]"},
-            FF = {"[object CSSImportRule]", "foo.css", "", "0", "[object CSSStyleSheet]"},
+    @Alerts(DEFAULT = {"[object CSSImportRule]", "foo.css", "", "0", "[object CSSStyleSheet]"},
             IE = {"[object CSSImportRule]", "foo.css", "all", "0", "[object CSSStyleSheet]"})
     public void getImportFromCssRulesCollection_relative() throws Exception {
         final URL urlPage = new URL(URL_FIRST, "/dir1/dir2/foo.html");
@@ -86,7 +82,7 @@
         final String css = "#d { color: green }";
 
         getMockWebConnection().setResponse(cssUrl, css, "text/css");
-        loadPageWithAlerts2(html, pageUrl);
+        loadPageWithAlerts2(html, pageUrl, 1000000);
     }
 
     /**