Skip to content

Commit

Permalink
Report Edge 18 and older as unsupported
Browse files Browse the repository at this point in the history 
Fixes #7424
  • Loading branch information
@Artur-
Artur- committed Jan 27, 2020
1 parent d3d6b9b commit 93b1b74
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 4 deletions.
8 changes: 6 additions & 2 deletions flow-server/src/main/java/com/vaadin/flow/shared/BrowserDetails.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,8 +598,12 @@ public int getOperatingSystemMinorVersion() {
* supported or might work
*/
public boolean isTooOldToFunctionProperly() {
// IE 11 and older versions are not supported
if (isIE() && getBrowserMajorVersion() <= 11) {
// IE is not supported
if (isIE()) {
return true;
}
// Only ChromeEdge is supported
if (isEdge() && getBrowserMajorVersion() < 79) {
return true;
}
// Safari 13+
Expand Down
25 changes: 23 additions & 2 deletions flow-server/src/test/java/com/vaadin/flow/shared/BrowserDetailsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class BrowserDetailsTest extends TestCase {
private static final String SAFARI4_MAC = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_5_8; en-us) AppleWebKit/531.22.7 (KHTML, like Gecko) Version/4.0.5 Safari/531.22.7";
private static final String SAFARI10_WINDOWS = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8";
private static final String SAFARI11_MAC = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15";
private static final String SAFARI13_MAC = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.4 Safari/605.1.15";

private static final String IPHONE_IOS_5_1 = "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B179 Safari/7534.48.3";
private static final String IPHONE_IOS_4_0 = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
Expand All @@ -75,14 +76,18 @@ public class BrowserDetailsTest extends TestCase {
private static final String ANDROID_MOTOROLA_3_0 = "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13";
private static final String ANDROID_GALAXY_NEXUS_4_0_4_CHROME = "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19";

private static final String EDGE_WINDOWS_10 = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10240";
private static final String EDGE_12_WINDOWS_10 = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10240";

private static final String ECLIPSE_MAC_SAFARI_91 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/601.5.17 (KHTML, like Gecko) Safari/522.0";
private static final String ECLIPSE_MAC_SAFARI_90 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/601.4.4 (KHTML, like Gecko) Safari/522.0";

private static final String IPHONE_IOS_11_FACEBOOK_BROWSER = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E302 [FBAN/MessengerForiOS;FBAV/165.0.0.45.95;FBBV/107115338;FBDV/iPhone10,6;FBMD/iPhone;FBSN/iOS;FBSV/11.3.1;FBSS/3;FBCR/DNA;FBID/phone;FBLC/en_GB;FBOP/5;FBRV/0]";
private static final String IPHONE_IOS_11_FIREFOX = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_2 like Mac OS X) AppleWebKit/604.3.5 (KHTML, like Gecko) FxiOS/11.1b10377 Mobile/15B202 Safari/604.3.5";

private static final String EDGE_18 = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; ServiceUI 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/18.17763";
private static final String EDGE_79 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36 Edg/79.0.309.71";


public void testSafari3() {
BrowserDetails bd = new BrowserDetails(SAFARI3_WINDOWS);
assertWebKit(bd);
Expand Down Expand Up @@ -540,12 +545,20 @@ public void testIE11WindowsPhone81Update() {
}

public void testEdgeWindows10() {
BrowserDetails bd = new BrowserDetails(EDGE_WINDOWS_10);
BrowserDetails bd = new BrowserDetails(EDGE_12_WINDOWS_10);
assertEdge(bd);
assertBrowserMajorVersion(bd, 12);
assertBrowserMinorVersion(bd, 10240);
assertWindows(bd, false);
}

public void testTooOldBrowsers() {
assertTooOld(IE11_WINDOWS_7);
assertTooOld(EDGE_12_WINDOWS_10);
assertTooOld(EDGE_18);
assertTooOld(SAFARI11_MAC);
assertNotTooOld(EDGE_79);
assertNotTooOld(SAFARI13_MAC);
}

public void testEclipseMac_safari91() {
Expand Down Expand Up @@ -766,4 +779,12 @@ private void assertChromeOS(BrowserDetails browserDetails, int majorVersion,
assertOSMinorVersion(browserDetails, minorVersion);
}

private void assertTooOld(String userAgent) {
BrowserDetails bd = new BrowserDetails(userAgent);
Assert.assertTrue(bd.isTooOldToFunctionProperly());
}
private void assertNotTooOld(String userAgent) {
BrowserDetails bd = new BrowserDetails(userAgent);
Assert.assertFalse(bd.isTooOldToFunctionProperly());
}
}

0 comments on commit 93b1b74

Please sign in to comment.