Merge pull request #119 from freedomjs/dborkan-tests

Disable broken test
freedomjs · Jun 5, 2015 · 4f377e0 · 4f377e0
2 parents 31dd572 + dedeb10
commit 4f377e0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -165,7 +165,7 @@ module.exports = function(grunt) {
   // Compile into build/
   grunt.registerTask('build', [
     'jshint',
-//    'browserify',
+    'browserify',
     'copy:dist'
   ]);
 

diff --git a/spec/socialprovider.spec.js b/spec/socialprovider.spec.js
@@ -236,30 +236,32 @@ describe("Tests for message batching in Social provider", function() {
     xmppSocialProvider.logout();
   });
 
-  it('detects sleep and pings immediately', function() {
-    var nowMs = 0;
-    dateSpy = spyOn(Date, "now").and.callFake(function() { return nowMs; });
-    spyOn(window.XMPP, 'Client').and.returnValue(xmppClient);
-    var setIntervalCallbacks = [];
-    spyOn(window, 'setInterval').and.callFake(function(callback, intervalMs) {
-      setIntervalCallbacks.push(callback);
-    });
-    spyOn(xmppSocialProvider, 'ping_');
+  // TODO: re-enable this test when we figure out
+  // https://github.com/freedomjs/freedom-social-xmpp/issues/118
+  // it('detects sleep and pings immediately', function() {
+  //   var nowMs = 0;
+  //   dateSpy = spyOn(Date, "now").and.callFake(function() { return nowMs; });
+  //   spyOn(window.XMPP, 'Client').and.returnValue(xmppClient);
+  //   var setIntervalCallbacks = [];
+  //   spyOn(window, 'setInterval').and.callFake(function(callback, intervalMs) {
+  //     setIntervalCallbacks.push(callback);
+  //   });
+  //   spyOn(xmppSocialProvider, 'ping_');
 
-    // Connect and emit online event to start polling loop.
-    xmppSocialProvider.connect(function() {});
-    xmppSocialProvider.client.events['online']();
+  //   // Connect and emit online event to start polling loop.
+  //   xmppSocialProvider.connect(function() {});
+  //   xmppSocialProvider.client.events['online']();
 
-    // Advance the clock by 2010 ms and invoke callbacks.
-    nowMs = 2010;
-    jasmine.clock().tick(2010);
-    setIntervalCallbacks.map(function(callback) { callback(); });
+  //   // Advance the clock by 2010 ms and invoke callbacks.
+  //   nowMs = 2010;
+  //   jasmine.clock().tick(2010);
+  //   setIntervalCallbacks.map(function(callback) { callback(); });
 
-    // Expect sleep to have been detected and ping to be invoked.
-    expect(xmppSocialProvider.ping_).toHaveBeenCalled();
-    // logout must be called to clearInterval on the polling loop
-    xmppSocialProvider.logout();
-  });
+  //   // Expect sleep to have been detected and ping to be invoked.
+  //   expect(xmppSocialProvider.ping_).toHaveBeenCalled();
+  //   // logout must be called to clearInterval on the polling loop
+  //   xmppSocialProvider.logout();
+  // });
 
   it('parses JSON encoded arrays', function() {
     xmppSocialProvider.client = xmppClient;