Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make IPhone version above 14.7 browsers allowed for Vaadin #11821

Merged
merged 4 commits into from
Sep 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,13 @@ public boolean isTooOldToFunctionProperly() {
}
// Safari 13+
if (isSafari() && getBrowserMajorVersion() < 13) {
if (getOperatingSystemMajorVersion() > 14) {
return false;
}
if (getOperatingSystemMajorVersion() == 14
&& getOperatingSystemMinorVersion() >= 7) {
return false;
}
return true;
}
// Firefox 43+ for now
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ public class BrowserDetailsTest extends TestCase {
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";

private static final String GOOGLE_APP_IPHONE_14_7 = "Mozilla/5.0 (iPhone; CPU iPhone OS 14_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) GSA/117.0.321844219 Mobile/15E148 Safari/604.1";

public void testSafari3() {
BrowserDetails bd = new BrowserDetails(SAFARI3_WINDOWS);
assertWebKit(bd);
Expand Down Expand Up @@ -606,6 +608,10 @@ public void testIos11Firefox() {
assertEngineVersion(bd, 604.3f);
}

public void testIphone14_7IsNotOld() {
assertNotTooOld(GOOGLE_APP_IPHONE_14_7);
}

/*
* Helper methods below
*/
Expand Down