Merge pull request #1244 from uProxy/salomegeo-generic-core

change monitoring interval from 5s to 1 minute
UWNetworksLab · Apr 13, 2015 · 7b6f82e · 7b6f82e
2 parents e1fec9b + d007ebd
commit 7b6f82e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/generic_core/social.spec.ts b/src/generic_core/social.spec.ts
@@ -126,7 +126,7 @@ describe('Social.FreedomNetwork', () => {
           expect(friend).toBeDefined();
           spyOn(friend, 'monitor');
           // Advance clock 5 seconds and make sure monitoring was called.
-          jasmine.clock().tick(5000);
+          jasmine.clock().tick(60000);
           expect(friend.monitor).toHaveBeenCalled();
           done();
         });
@@ -155,12 +155,12 @@ describe('Social.FreedomNetwork', () => {
       expect(friend).toBeDefined();
       spyOn(friend, 'monitor');
       // Monitoring is still running.
-      jasmine.clock().tick(5000);
+      jasmine.clock().tick(60000);
       expect(friend.monitor).toHaveBeenCalled();
 
       network.logout().then(() => {
         (<any>friend.monitor).calls.reset();
-        jasmine.clock().tick(5000);
+        jasmine.clock().tick(60000);
         expect(friend.monitor).not.toHaveBeenCalled();
         jasmine.clock().uninstall();
       }).then(done);

diff --git a/src/generic_core/social.ts b/src/generic_core/social.ts
@@ -585,7 +585,7 @@ module Social {
           this.getUser(userId).monitor();
         }
       };
-      this.monitorIntervalId_ = setInterval(monitorCallback, 5000);
+      this.monitorIntervalId_ = setInterval(monitorCallback, 60000);
     }
 
     private stopMonitor_ = () : void => {