Skip to content

Fix device page 500 #5516

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
mitchellhenke merged 2 commits into from
Oct 18, 2021
Merged

Fix device page 500 #5516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13a4e33
add failing spec
Oct 18, 2021
7060b8f
fix nice device name with no OS version
Oct 18, 2021
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
6 changes: 5 additions & 1 deletion app/decorators/device_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ def happened_at

def nice_name
browser = BrowserCache.parse(device.user_agent)
os = browser.platform.name
os_version = browser.platform.version&.split('.')&.first
os = "#{os} #{os_version}" if os_version

I18n.t(
'account.index.device',
browser: "#{browser.name} #{browser.version}",
os: "#{browser.platform.name} #{browser.platform.version.split('.').first}",
os: os,
Copy link
Copy Markdown
Contributor

@aduth aduth Oct 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Could we do something like... ?

Suggested change
os: os,
os: [browser.platform.name, browser.platform.version&.split('.')&.first].compact.join(' '),

Copy link
Copy Markdown
Contributor Author

@mitchellhenke mitchellhenke Oct 18, 2021

Choose a reason for hiding this comment

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

It would need the null-safe navigator, but otherwise yep

)
end
end
9 changes: 9 additions & 0 deletions spec/decorators/device_decorator_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,14 @@
it 'gives a shortened os and browser name' do
expect(decorator.nice_name).to eq('Chrome 58 on Windows 10')
end

it 'does not fail if OS version cannot be parsed' do
# This user agent currently does not parse the OS version
user_agent = 'Mozilla/5.0 (X11; CrOS armv7l 11316.165.0) AppleWebKit/537.36 (KHTML, '\
'like Gecko) Chrome/72.0.3626.122 Safari/537.36'
device.user_agent = user_agent

expect(decorator.nice_name).to eq('Chrome 72 on Chrome OS')
end
end
end