Merge pull request #302 from Osmose/sync-client-counts

Add sync client counts to filter expression context. (#289)

client/selfrepair/normandy_driver.js

@@ -166,6 +166,9 @@ export default class NormandyDriver {
         },
         sync(data) {
           client.syncSetup = data.setup;
+          client.syncDesktopDevices = data.desktopDevices || 0;
+          client.syncMobileDevices = data.mobileDevices || 0;
+          client.syncTotalDevices = data.totalDevices || 0;
         },
       };
 

client/selfrepair/tests/test_normandy_driver.js

@@ -109,7 +109,10 @@ describe('Normandy Driver', () => {
           switch (config) {
             case 'sync':
               return cb({
-                setup: false,
+                setup: true,
+                desktopDevices: 1,
+                mobileDevices: 2,
+                totalDevices: 3,
               });
             case 'appinfo':
               return cb({
@@ -128,7 +131,10 @@ describe('Normandy Driver', () => {
       const driver = new NormandyDriver(uitour);
       const client = await driver.client();
 
-      expect(client.syncSetup).toEqual(false);
+      expect(client.syncSetup).toEqual(true);
+      expect(client.syncDesktopDevices).toEqual(1);
+      expect(client.syncMobileDevices).toEqual(2);
+      expect(client.syncTotalDevices).toEqual(3);
       expect(client.distribution).toEqual('funnelcake85');
       expect(client.isDefaultBrowser).toEqual(true);
       expect(client.searchEngine).toEqual('Yahoo');

docs/dev/driver.rst

@@ -162,6 +162,15 @@ The driver object contains the following attributes:
       String containing the user's default search engine identifier.
    syncSetup
       Boolean containing whether the user has set up Firefox Sync.
+   syncDesktopDevices
+      Integer specifying the number of desktop clients the user has added to
+      their Firefox Sync account.
+   syncMobileDevices
+      Integer specifying the number of mobile clients the user has added to
+      their Firefox Sync account.
+   syncTotalDevices
+      Integer specifying the total number of clients the user has added to their
+      Firefox Sync account.
    plugins
       An object mapping of plugin names to :js:class:`Plugin` objects describing
       the plugins installed on the client.

docs/user/filter_expressions.rst

@@ -126,6 +126,21 @@ filter expressions.
 
    Boolean containing whether the user has set up Firefox Sync.
 
+.. js:attribute:: normandy.syncDesktopDevices
+
+   Integer specifying the number of desktop clients the user has added to their
+   Firefox Sync account.
+
+.. js:attribute:: normandy.syncMobileDevices
+
+   Integer specifying the number of mobile clients the user has added to their
+   Firefox Sync account.
+
+.. js:attribute:: normandy.syncTotalDevices
+
+   Integer specifying the total number of clients the user has added to their
+   Firefox Sync account.
+
 .. js:attribute:: normandy.plugins
 
    An object mapping of plugin names to :js:class:`Plugin` objects describing