Menu
▾
▴
[HtmlUnit] SVN: [15009] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-12-14 09:58:36
|
Revision: 15009
http://sourceforge.net/p/htmlunit/code/15009
Author: rbri
Date: 2017-12-14 09:58:33 +0000 (Thu, 14 Dec 2017)
Log Message:
-----------
fixes for chrome 63 (wip)
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-12-14 07:21:56 UTC (rev 15008)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-12-14 09:58:33 UTC (rev 15009)
@@ -186,7 +186,7 @@
// FF52
FIREFOX_52.applicationVersion_ = "5.0 (Windows)";
FIREFOX_52.userAgent_ = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:52.0) Gecko/20100101 Firefox/52.0";
- FIREFOX_52.buildId_ = "20170921064520";
+ FIREFOX_52.buildId_ = "20171206101620";
FIREFOX_52.productSub_ = "20100101";
FIREFOX_52.headerNamesOrdered_ = new String[] {
HttpHeader.HOST,
@@ -382,25 +382,19 @@
// flush plugin (windows version)
PluginConfiguration flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 24.0 r0", "undefined", "internal-not-yet-present");
+ "Shockwave Flash 28.0 r0", "28.0.0.126", "NPSWF32_28_0_0_126.dll");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
- CHROME.plugins_.add(flash);
-
- flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 27.0 r0", "27.0.0.183", "NPSWF32_27_0_0_183.dll");
- flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
- "Shockwave Flash", "swf"));
FIREFOX_45.plugins_.add(flash);
flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 27.0 r0", "27.0.0.183", "NPSWF64_27_0_0_183.dll");
+ "Shockwave Flash 28.0 r0", "28.0.0.126", "NPSWF64_28_0_0_126.dll");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
FIREFOX_52.plugins_.add(flash);
flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 27.0 r0", "27.0.0.183", "Flash32_27_0_0_183.ocx");
+ "Shockwave Flash 28.0 r0", "28.0.0.126", "Flash32_28_0_0_126.ocx");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
INTERNET_EXPLORER.plugins_.add(flash);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java 2017-12-14 07:21:56 UTC (rev 15008)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java 2017-12-14 09:58:33 UTC (rev 15009)
@@ -216,10 +216,10 @@
* @throws Exception on test failure
*/
@Test
- @Alerts(FF45 = {"Shockwave Flash", "Shockwave Flash 27.0 r0", "27.0.0.183", "NPSWF32_27_0_0_183.dll"},
- FF52 = {"Shockwave Flash", "Shockwave Flash 27.0 r0", "27.0.0.183", "NPSWF64_27_0_0_183.dll"},
- CHROME = {"Shockwave Flash", "Shockwave Flash 24.0 r0", "undefined", "internal-not-yet-present"},
- IE = {"Shockwave Flash", "Shockwave Flash 27.0 r0", "27.0.0.183", "Flash32_27_0_0_183.ocx"},
+ @Alerts(FF45 = {"Shockwave Flash", "Shockwave Flash 28.0 r0", "28.0.0.126", "NPSWF32_28_0_0_126.dll"},
+ FF52 = {"Shockwave Flash", "Shockwave Flash 28.0 r0", "28.0.0.126", "NPSWF64_28_0_0_126.dll"},
+ CHROME = "Shockwave Flash not available",
+ IE = {"Shockwave Flash", "Shockwave Flash 28.0 r0", "28.0.0.126", "Flash32_28_0_0_126.ocx"},
EDGE = {"Shockwave Flash", "Shockwave Flash 18.0 r0", "18.0.0.232", "Flash.ocx"})
public void pluginsShockwaveFlash() throws Exception {
final String html = "<html>\n"
@@ -227,9 +227,11 @@
+ " <title>test</title>\n"
+ " <script>\n"
+ " function doTest() {\n"
+ + " var flash = false;\n"
+ " for (var i = 0; i < window.navigator.plugins.length; i++) {\n"
+ " var plugin = window.navigator.plugins[i];\n"
+ " if ('Shockwave Flash' == window.navigator.plugins[i].name) {\n"
+ + " flash = true;\n"
+ " alert(plugin.name);\n"
+ " alert(plugin.description);\n"
+ " alert(plugin.version);\n"
@@ -236,6 +238,9 @@
+ " alert(plugin.filename);\n"
+ " }\n"
+ " }\n"
+ + " if (!flash) {\n"
+ + " alert('Shockwave Flash not available');\n"
+ + " }\n"
+ " }\n"
+ " </script>\n"
+ "</head>\n"
@@ -382,7 +387,7 @@
@Test
@Alerts(DEFAULT = "undefined",
FF45 = "20170411115307",
- FF52 = "20170921064520")
+ FF52 = "20171206101620")
public void buildID() throws Exception {
final String html
= "<html><head><title>First</title>\n"
|
