GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 376bbd63 authored by Alex Catarineu's avatar Alex Catarineu

Fix fp_navigator and fp_useragent tests

parent aa420c44
...@@ -421,8 +421,6 @@ our @tests = ( ...@@ -421,8 +421,6 @@ our @tests = (
name => 'fp_navigator', name => 'fp_navigator',
type => 'marionette', type => 'marionette',
descr => 'Check that navigator properties are as expected', descr => 'Check that navigator properties are as expected',
# Bug 28665: temporarily disable test
enable => sub { undef },
}, },
{ {
name => 'play_videos', name => 'play_videos',
......
...@@ -15,9 +15,9 @@ nav_props = {"appCodeName": "Mozilla", ...@@ -15,9 +15,9 @@ nav_props = {"appCodeName": "Mozilla",
"product": "Gecko", "product": "Gecko",
"productSub": "20100101", "productSub": "20100101",
"plugins": "[object PluginArray]", "plugins": "[object PluginArray]",
"cookieEnabled": "true", "cookieEnabled": "false",
"onLine": "true", "onLine": "true",
"buildID": "20100101", "buildID": "20181001000000",
"doNotTrack": "unspecified", "doNotTrack": "unspecified",
"javaEnabled": """function javaEnabled() { "javaEnabled": """function javaEnabled() {
[native code] [native code]
...@@ -28,9 +28,6 @@ nav_props = {"appCodeName": "Mozilla", ...@@ -28,9 +28,6 @@ nav_props = {"appCodeName": "Mozilla",
"vibrate": """function vibrate() { "vibrate": """function vibrate() {
[native code] [native code]
}""", }""",
"registerContentHandler": """function registerContentHandler() {
[native code]
}""",
"registerProtocolHandler": """function registerProtocolHandler() { "registerProtocolHandler": """function registerProtocolHandler() {
[native code] [native code]
}""", }""",
...@@ -63,7 +60,7 @@ class Test(MarionetteTestCase): ...@@ -63,7 +60,7 @@ class Test(MarionetteTestCase):
app_version = "5.0 (Macintosh)" app_version = "5.0 (Macintosh)"
platform = "MacIntel" platform = "MacIntel"
oscpu = "Intel Mac OS X 10.13" oscpu = "Intel Mac OS X 10.13"
nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:60.0) Gecko/20100101 Firefox/60.0" nav_props["userAgent"] = "Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0"
nav_props["appVersion"] = app_version nav_props["appVersion"] = app_version
nav_props["platform"] = platform nav_props["platform"] = platform
nav_props["oscpu"] = oscpu nav_props["oscpu"] = oscpu
......
...@@ -19,5 +19,5 @@ class Test(MarionetteTestCase): ...@@ -19,5 +19,5 @@ class Test(MarionetteTestCase):
ua_os = 'Windows NT 6.1; Win64; x64' ua_os = 'Windows NT 6.1; Win64; x64'
if osname == 'MacOSX': if osname == 'MacOSX':
ua_os = 'Macintosh; Intel Mac OS X 10.13' ua_os = 'Macintosh; Intel Mac OS X 10.13'
self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:60.0) Gecko/20100101 Firefox/60.0", self.assertEqual("Mozilla/5.0 (" + ua_os + "; rv:78.0) Gecko/20100101 Firefox/78.0",
js("return navigator.userAgent")) js("return navigator.userAgent"))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment