Bug 1402376 - test code - Add whether the client has an incompatible version of JAWS to the update url. r=jimm, a=sledru FENNEC_56_0_BUILD1 FENNEC_56_0_RELEASE
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 22 Sep 2017 12:45:39 -0700
changeset 424168 f8e1f3cada56
parent 424167 f73d23c1ac26
child 424169 8c340d0042b5
push id1540
push userryanvm@gmail.com
push dateFri, 22 Sep 2017 20:01:34 +0000
treeherdermozilla-release@f8e1f3cada56 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm, sledru
bugs1402376
milestone56.0
Bug 1402376 - test code - Add whether the client has an incompatible version of JAWS to the update url. r=jimm, a=sledru
testing/modules/AppInfo.jsm
toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
--- a/testing/modules/AppInfo.jsm
+++ b/testing/modules/AppInfo.jsm
@@ -53,16 +53,17 @@ this.newAppInfo = function(options = {})
     platformBuildID: origPlatformInfo.platformBuildID,
 
     // nsIXULRuntime
     inSafeMode: false,
     logConsoleErrors: true,
     OS,
     XPCOMABI: "noarch-spidermonkey",
     invalidateCachesOnRestart() {},
+    shouldBlockIncompatJaws: false,
 
     // nsIWinAppHelper
     get userCanElevate() {
       return false;
     },
   };
 
   let interfaces = [Ci.nsIXULAppInfo,
--- a/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
+++ b/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
@@ -341,11 +341,16 @@ add_task(async function test_custom() {
   Assert.equal(await getResult(url), "custom",
                "the url query string for %CUSTOM%" + MSG_SHOULD_EQUAL);
 });
 
 // url constructed with %SYSTEM_CAPABILITIES%
 add_task(async function test_systemCapabilities() {
   let url = URL_PREFIX + "%SYSTEM_CAPABILITIES%/";
   let systemCapabilities = "ISET:" + getInstructionSet() + ",MEM:" + getMemoryMB();
+  if (AppConstants.platform == "win") {
+    // The default value for shouldBlockIncompatJaws in the mock
+    // Services.appinfo is false so the value should be JAWS:0
+    systemCapabilities += ",JAWS:0";
+  }
   Assert.equal(await getResult(url), systemCapabilities,
                "the url param for %SYSTEM_CAPABILITIES%" + MSG_SHOULD_EQUAL);
 });