Skip to content

Fixes #1030. More robust handling for UA parsing methods. #1032

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
karlcow merged 9 commits into from
May 2, 2016
Merged

Fixes #1030. More robust handling for UA parsing methods. #1032

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e376f1f
Issue #1030. Make get_browser and get_browser_name tests more robust.
Apr 29, 2016
8bd0a46
Issue #1030. Be sure to pass in browser_name when showing form errors.
Apr 29, 2016
cbeff0f
Issue #1030. Rewrite get_browser_name.
Apr 29, 2016
b8105b9
Issue #1030. Rewrite get_os.
Apr 29, 2016
43e1198
Issue #1030. Rewrite get_browser.
Apr 29, 2016
d066fc6
Issue #1030. Be more paranoid and make sure we have a string before p…
Apr 29, 2016
850098b
Issue #1030. Update docstrings for tests.
Apr 29, 2016
554b6cf
Issue #1030. Add Fennec UA string with Android version to tests.
May 2, 2016
ea6d265
Issue #1030. Address review nits.
May 2, 2016
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
Prev Previous commit
Next Next commit
Issue #1030. Add Fennec UA string with Android version to tests.
  • Loading branch information
Mike Taylor committed May 2, 2016
commit 554b6cfc54702da21144842b2564549619ce8948
10 changes: 8 additions & 2 deletions tests/test_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
REWRITTEN_SEARCH_LINK_HEADER = '</api/issues/search?q=taco&page=2>; rel="next", </api/issues/search?q=taco&page=26>; rel="last"' # nopep8
PARSED_LINKED_HEADERS = [{'link': 'https://api.github.com/repositories/17839063/issues?per_page=50&page=3', 'rel': 'next'}, {'link': 'https://api.github.com/repositories/17839063/issues?per_page=50&page=4', 'rel': 'last'}, {'link': 'https://api.github.com/repositories/17839063/issues?per_page=50&page=1', 'rel': 'first'}, {'link': 'https://api.github.com/repositories/17839063/issues?per_page=50&page=1', 'rel': 'prev'}] # nopep8
FIREFOX_UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:48.0) Gecko/20100101 Firefox/48.0' # nopep8
FIREFOX_MOBILE_UA = 'Mozilla/5.0 (Android; Mobile; rv:40.0) Gecko/40.0 Firefox/40.0' # nopep8
FIREFOX_MOBILE_UA_OLD = 'Mozilla/5.0 (Android; Mobile; rv:40.0) Gecko/40.0 Firefox/40.0' # nopep8
FIREFOX_MOBILE_UA = 'Mozilla/5.0 (Android 6.0.1; Mobile; rv:40.0) Gecko/40.0 Firefox/40.0' # nopep8
FIREFOX_TABLET_UA = 'Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0' # nopep8
SAFARI_UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11) AppleWebKit/601.1.39 (KHTML, like Gecko) Version/9.0 Safari/601.1.39' # nopep8
SAFARI_MOBILE_UA = 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_4 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B350 Safari/8536.25' # nopep8
Expand Down Expand Up @@ -125,6 +126,8 @@ def test_get_browser_name(self):
'''Test browser name parsing via get_browser_name helper method.'''
self.assertEqual(get_browser_name(FIREFOX_UA), 'firefox')
self.assertEqual(get_browser_name(FIREFOX_MOBILE_UA), 'firefox mobile')
self.assertEqual(get_browser_name(FIREFOX_MOBILE_UA_OLD),
'firefox mobile')
self.assertEqual(get_browser_name(FIREFOX_TABLET_UA),
'firefox mobile (tablet)')
self.assertEqual(get_browser_name(SAFARI_UA), 'safari')
Expand All @@ -146,6 +149,8 @@ def test_get_browser(self):
'''Test browser parsing via get_browser helper method.'''
self.assertEqual(get_browser(FIREFOX_UA), 'Firefox 48.0')
self.assertEqual(get_browser(FIREFOX_MOBILE_UA), 'Firefox Mobile 40.0')
self.assertEqual(get_browser_name(FIREFOX_MOBILE_UA_OLD),
'firefox mobile')
self.assertEqual(get_browser(FIREFOX_TABLET_UA),
'Firefox Mobile (Tablet) 41.0')
self.assertEqual(get_browser(SAFARI_UA), 'Safari 9.0')
Expand All @@ -166,7 +171,8 @@ def test_get_browser(self):
def test_get_os(self):
'''Test OS parsing via get_os helper method.'''
self.assertEqual(get_os(FIREFOX_UA), 'Mac OS X 10.11')
self.assertEqual(get_os(FIREFOX_MOBILE_UA), 'Android')
self.assertEqual(get_os(FIREFOX_MOBILE_UA), 'Android 6.0.1')
self.assertEqual(get_os(FIREFOX_MOBILE_UA_OLD), 'Android')
self.assertEqual(get_os(FIREFOX_TABLET_UA), 'Android 4.4')
self.assertEqual(get_os(SAFARI_UA), 'Mac OS X 10.11')
self.assertEqual(get_os(SAFARI_MOBILE_UA), 'iOS 6.1.4')
Expand Down