IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Fix browser detection for Microsoft Edge. (#6516)

Browse Source 
cool!
This commit is contained in:
Bianca Nenciu 2018-10-22 15:15:41 +03:00 committed by Sam
parent 3377f26eba
commit 99b43f281b
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/server.en.yml
View File

@ -709,6 +709,7 @@ en:
firefox: "Firefox" firefox: "Firefox"
opera: "Opera" opera: "Opera"
ie: "Internet Explorer" ie: "Internet Explorer"
edge: "Microsoft Edge"
unknown: "unknown browser" unknown: "unknown browser"
device: device:
android: "Android Device" android: "Android Device"

2
lib/browser_detection.rb
View File

@ -2,6 +2,8 @@ module BrowserDetection
def self.browser(user_agent) def self.browser(user_agent)
case user_agent case user_agent
when /Edge/i
:edge
when /Opera/i, /OPR/i when /Opera/i, /OPR/i
:opera :opera
when /Firefox/i when /Firefox/i

1
spec/lib/browser_detection_spec.rb
View File

@ -27,6 +27,7 @@ describe BrowserDetection do
["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36", :chrome, :linux, :linux], ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36", :chrome, :linux, :linux],
["Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20150101 Firefox/47.0 (Chrome)", :firefox, :linux, :linux], ["Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20150101 Firefox/47.0 (Chrome)", :firefox, :linux, :linux],
["Opera/9.80 (X11; Linux zvav; U; en) Presto/2.12.423 Version/12.16", :opera, :linux, :linux], ["Opera/9.80 (X11; Linux zvav; U; en) Presto/2.12.423 Version/12.16", :opera, :linux, :linux],
["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.246", :edge, :windows, :windows],
].each do |user_agent, browser, device, os| ].each do |user_agent, browser, device, os|
expect(BrowserDetection.browser(user_agent)).to eq(browser) expect(BrowserDetection.browser(user_agent)).to eq(browser)
expect(BrowserDetection.device(user_agent)).to eq(device) expect(BrowserDetection.device(user_agent)).to eq(device)