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

[<asa...@us...>]

Revision: 14709
          http://sourceforge.net/p/htmlunit/code/14709
Author:   asashour
Date:     2017-07-26 07:56:04 +0000 (Wed, 26 Jul 2017)
Log Message:
-----------
update test, latest chrome

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2017-07-25 18:31:08 UTC (rev 14708)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2017-07-26 07:56:04 UTC (rev 14709)
@@ -66,7 +66,7 @@
            numeric = 14;
        }
        else if (isChrome) {
-           numeric = 58;
+           numeric = 60;
        }
        pre.innerHTML = pre.innerHTML.replace('NUMERIC', numeric);
        var browser = "FIREFOX_52";
@@ -150,11 +150,11 @@
 
     /** Latest Chrome. */
     public static final BrowserVersion CHROME
-        = new BrowserVersion(59, "Chrome")
+        = new BrowserVersion(60, "Chrome")
             .setApplicationVersion("5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36"
-                                    + " (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36")
+                                    + " (KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36")
             .setUserAgent("Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36"
-                                    + " (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36");
+                                    + " (KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36");
 
     /** Microsoft Edge. Work In Progress!!! */
     public static final BrowserVersion EDGE

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java	2017-07-25 18:31:08 UTC (rev 14708)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionTest.java	2017-07-26 07:56:04 UTC (rev 14709)
@@ -34,7 +34,7 @@
         assertEquals(45, BrowserVersion.FIREFOX_45.getBrowserVersionNumeric());
         assertEquals(52, BrowserVersion.FIREFOX_52.getBrowserVersionNumeric());
         assertEquals(11, BrowserVersion.INTERNET_EXPLORER.getBrowserVersionNumeric());
-        assertEquals(59, BrowserVersion.CHROME.getBrowserVersionNumeric());
+        assertEquals(60, BrowserVersion.CHROME.getBrowserVersionNumeric());
         assertEquals(14, BrowserVersion.EDGE.getBrowserVersionNumeric());
     }
 

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java	2017-07-25 18:31:08 UTC (rev 14708)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java	2017-07-26 07:56:04 UTC (rev 14709)
@@ -27,6 +27,7 @@
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
+import com.gargoylesoftware.htmlunit.BrowserRunner.BuggyWebDriver;
 import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
 import com.gargoylesoftware.htmlunit.MockWebConnection;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
@@ -239,18 +240,27 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("IFRAME")
+    @Alerts(DEFAULT = {"false", "false", "true", "false"},
+            IE = {"false", "false", "false", "false"})
+    @BuggyWebDriver(CHROME)
+    @NotYetImplemented
     public void createIframeFromStrictFunction() throws Exception {
         final String html = "<html><head>\n"
                 + "<script>\n"
                 + "  function test() {\n"
                 + "    'use strict';\n"
-                + "    var iFrame = document.createElement('iframe');\n"
-                + "    alert(iFrame.tagName);\n"
+                + "    var iframe = document.createElement('iframe');\n"
+                + "    alert(!this);\n"
+                + "    alert(!iframe);\n"
                 + "  }\n"
+                + "  function test2() {\n"
+                + "    var iframe = document.createElement('iframe');\n"
+                + "    alert(!this);\n"
+                + "    alert(!iframe);\n"
+                + "  }\n"
                 + "</script>\n"
                 + "</head>\n"
-                + "<body onload='test()'>\n"
+                + "<body onload='test();test2()'>\n"
                 + "</body></html>";
 
         loadPageWithAlerts2(html);