Skip to content

Support Android WebView for browser support detection #9557

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.

Sign up for GitHub

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

Merged
aduth merged 5 commits into from
Nov 8, 2023
Merged

Support Android WebView for browser support detection #9557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f530569
Update browserslist database
aduth Nov 7, 2023
43444ba
Add Android WebView detection for BrowserSupport
aduth Nov 7, 2023
6e988f8
Resolve yarn.lock from yarnpkg
aduth Nov 7, 2023
c5ea359
Add Opera Mobile detection logic
aduth Nov 7, 2023
e2cbd9a
Adjust spec context for Opera Mobile
aduth Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions app/services/browser_support.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
class BrowserSupport
@cache = LruRedux::Cache.new(1_000)

# rubocop:disable Layout/LineLength
BROWSERSLIST_TO_BROWSER_MAP = {
and_chr: ->(browser, version) { browser.android? && browser.chrome?(version) },
and_chr: ->(browser, version) { browser.android? && !browser.platform.android_webview? && browser.chrome?(version) },
and_uc: ->(browser, version) { browser.android? && browser.uc_browser?(version) },
chrome: ->(browser, version) { browser.chrome?(version) },
android: ->(browser, version) { browser.platform.android_webview? && browser.send(:detect_version?, browser.version, version) },
Copy link
Copy Markdown
Contributor Author

@aduth aduth Nov 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't love the send here, but android_webview? doesn't accept parameters like the other browser matchers. Internally, detect_version? is what the browser gem uses for parameterized methods (example).

An alternative implementation could be to use the same underlying core logic, but this risks some drift in the logic, and is more verbose.

chrome: ->(browser, version) { !browser.platform.android_webview? && browser.chrome?(version) },
edge: ->(browser, version) { browser.edge?(version) },
firefox: ->(browser, version) { browser.firefox?(version) },
ios_saf: ->(browser, version) { browser.ios? && browser.safari?(version) },
op_mini: ->(browser, version) { browser.opera_mini?(version) },
op_mob: ->(browser, version) { browser.platform.android? && browser.opera?(version) },
opera: ->(browser, version) { browser.opera?(version) },
safari: ->(browser, version) { browser.safari?(version) },
samsung: ->(browser, version) { browser.samsung_browser?(version) },
}.with_indifferent_access.freeze
# rubocop:enable Layout/LineLength

class << self
def supported?(user_agent)
Expand Down
84 changes: 75 additions & 9 deletions spec/services/browser_support_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@

context 'with valid browser support config' do
before do
allow(BrowserSupport).to receive(:browser_support_config).
and_return(['chrome 109', 'and_chr 108', 'ios_saf 14.5-14.8', 'op_mini all'])
allow(BrowserSupport).to receive(:browser_support_config).and_return(
['chrome 109', 'and_chr 108', 'ios_saf 14.5-14.8', 'op_mini all', 'android 119'],
)
end

context 'with nil user agent' do
Expand Down Expand Up @@ -112,16 +113,81 @@
it { expect(supported).to eq(true) }
end
end
end

context 'with user agent for platform-specific version support' do
let(:user_agent) do
# Android Chrome v108
'Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) ' \
'Chrome/108.0.5481.153 Mobile Safari/537.36'
context 'with user agent for platform-specific version support' do
let(:user_agent) do
# Android Chrome v108
'Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) ' \
'Chrome/108.0.5481.153 Mobile Safari/537.36'
end

it { expect(supported).to eq(true) }
end

it { expect(supported).to eq(true) }
context 'with user agent for webview parsed as chrome' do
context 'with version below supported range' do
let(:user_agent) do
# Android WebView v109
'Mozilla/5.0 (Linux; Android 7.0; mione A55 Build/NRD90M; wv) AppleWebKit/537.36 ' \
'(KHTML, like Gecko) Version/4.0 Chrome/109.0.5414.85 Mobile Safari/537.36'
end

it { expect(supported).to eq(false) }
end

context 'with version within supported range' do
let(:user_agent) do
# Android WebView v119
'Mozilla/5.0 (Linux; Android 13; SM-A546B Build/TP1A.220624.014; wv) ' \
'AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/119.0.6045.66 Mobile ' \
'Safari/537.36'
end

it { expect(supported).to eq(true) }
end
end

context 'with opera desktop user agent' do
let(:user_agent) do
# Opera 83
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' \
'Chrome/103.0.5046.0 Safari/537.36 OPR/83.0.4254.70'
end

context 'with opera mobile supported range, but no support for desktop' do
before do
allow(BrowserSupport).to receive(:browser_support_config).and_return(['op_mob 73'])
end

it { expect(supported).to eq(false) }
end
end

context 'with opera mobile user agent' do
before do
allow(BrowserSupport).to receive(:browser_support_config).and_return(['op_mob 72'])
end

context 'with version within supported range' do
let(:user_agent) do
# Opera Mobile 72
'Mozilla/5.0 (Linux; Android 6.0.1; TX2) AppleWebKit/537.36 (KHTML, like Gecko) ' \
'Chrome/106.0.5249.126 Safari/537.36 OPR/72.9.3767.72992'
end

it { expect(supported).to eq(true) }
end

context 'with version below supported range' do
let(:user_agent) do
# Opera Mobile 71
'Mozilla/5.0 (Linux; Android 7.1.2; Nexus 7) AppleWebKit/537.36 (KHTML, like Gecko) ' \
'Chrome/104.0.5112.97 Safari/537.36 OPR/71.3.3718.67322'
end

it { expect(supported).to eq(false) }
end
end
end
end
end
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2382,9 +2382,9 @@ camelcase@^6.0.0, camelcase@^6.3.0:
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==

caniuse-lite@^1.0.30001541:
version "1.0.30001549"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz#7d1a3dce7ea78c06ed72c32c2743ea364b3615aa"
integrity sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA==
version "1.0.30001561"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz#752f21f56f96f1b1a52e97aae98c57c562d5d9da"
integrity sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==

chai-as-promised@^7.1.1:
version "7.1.1"
Expand Down