WIP: fix node tests

Author: jshcrowthe

src/database/core/util/util.ts

@@ -114,7 +114,7 @@ export const buildLogMessage_ = function(var_args) {
  * Use this for all debug messages in Firebase.
  * @type {?function(string)}
  */
-export var logger = console.log.bind(console);
+export var logger = null;
 
 
 /**

tests/database/browser/connection.test.ts

@@ -2,8 +2,7 @@ import { expect } from "chai";
 import { TEST_PROJECT, testRepoInfo } from "../helpers/util";
 import { Connection } from "../../../src/database/realtime/Connection";
 
-describe.only('Connection', function() {
-  this.timeout(10000);
+describe('Connection', function() {
   it('return the session id', function(done) {
     new Connection('1',
         testRepoInfo(TEST_PROJECT.databaseURL),

tests/database/helpers/util.ts

@@ -215,9 +215,9 @@ export function buildObjFromKey(key) {
 };
 
 export function testRepoInfo(url) {
-  const regex = /https:\/\/(.*).firebaseio.com/;
+  const regex = /https?:\/\/(.*).firebaseio.com/;
   const match = url.match(regex);
   if (!match) throw new Error('Couldnt get Namespace from passed URL');
   const [,ns] = match;
-  return new ConnectionTarget(`${ns}.firebaseio.com`, false, ns, false);
+  return new ConnectionTarget(`${ns}.firebaseio.com`, true, ns, false);
 }

tests/database/info.test.ts

@@ -41,11 +41,13 @@ describe(".info Tests", function () {
     expect(function() {f2.set('hi');}).to.throw;
   });
 
-  it("Can watch .info/connected.", function (done) {
-    var f = (getRandomNode() as Reference).root;
-    f.child('.info/connected').on('value', function(snap) {
-      if (snap.val() === true) done();
-    });
+  it("Can watch .info/connected.", function() {
+    return new Promise(resolve => {
+      var f = (getRandomNode() as Reference).root;
+      f.child('.info/connected').on('value', function(snap) {
+        if (snap.val() === true) resolve();
+      });
+    })
   });
 
 

tests/database/node/connection.test.ts

@@ -3,8 +3,9 @@ import { TEST_PROJECT, testRepoInfo } from "../helpers/util";
 import { Connection } from "../../../src/database/realtime/Connection";
 import "../../../src/utils/nodePatches";
 
-describe.only('Connection', () => {
+describe('Connection', () => {
   it('return the session id', function(done) {
+    debugger;
     new Connection('1',
         testRepoInfo(TEST_PROJECT.databaseURL),
         message => {},
@@ -20,7 +21,6 @@ describe.only('Connection', () => {
   // TODO(koss) - Flakey Test.  When Dev Tools is closed on my Mac, this test
   // fails about 20% of the time (open - it never fails).  In the failing
   // case a long-poll is opened first.
-  // https://app.asana.com/0/58926111402292/101921715724749
   it('disconnect old session on new connection', function(done) {
     const info = testRepoInfo(TEST_PROJECT.databaseURL);
     new Connection('1', info,

tests/database/repoinfo.test.ts

@@ -4,16 +4,16 @@ import { expect } from "chai";
 
 describe('RepoInfo', function() {
   it('should return the correct URL', function() {
-    var repoInfo = testRepoInfo('test-ns');
+    var repoInfo = testRepoInfo('https://test-ns.firebaseio.com');
 
     var urlParams = {};
     urlParams[CONSTANTS.VERSION_PARAM] = CONSTANTS.PROTOCOL_VERSION;
     urlParams[CONSTANTS.LAST_SESSION_PARAM] = 'test';
 
     var websocketUrl = repoInfo.connectionURL(CONSTANTS.WEBSOCKET, urlParams);
-    expect(websocketUrl).to.equal('ws://test-ns.fblocal.com:9000/.ws?v=5&ls=test');
+    expect(websocketUrl).to.equal('wss://test-ns.firebaseio.com/.ws?v=5&ls=test');
 
     var longPollingUrl = repoInfo.connectionURL(CONSTANTS.LONG_POLLING, urlParams);
-    expect(longPollingUrl).to.equal('http://test-ns.fblocal.com:9000/.lp?v=5&ls=test');
+    expect(longPollingUrl).to.equal('https://test-ns.firebaseio.com/.lp?v=5&ls=test');
   });
 });

tests/database/transaction.test.ts

@@ -760,28 +760,26 @@ describe('Transaction Tests', function() {
     });
   });
 
-  it('Transaction runs on null only once after reconnect (Case 1981).', function(done) {
+  it('Transaction runs on null only once after reconnect (Case 1981).', async function() {
     if (!canCreateExtraConnections()) return;
 
     var ref = (getRandomNode() as Reference);
-    ref.set(42, function() {
-      var newRef = getFreshRepoFromReference(ref);
-      var run = 0;
-      newRef.transaction(function(curr) {
-        run++;
-        if (run === 1) {
-          expect(curr).to.equal(null);
-        } else if (run === 2) {
-          expect(curr).to.equal(42);
-        }
-        return 3.14;
-      }, function(error, committed, resultSnapshot) {
-        expect(error).to.equal(null);
-        expect(committed).to.equal(true);
-        expect(run).to.equal(2);
-        expect(resultSnapshot.val()).to.equal(3.14);
-        done();
-      });
+    await ref.set(42);
+    var newRef = getFreshRepoFromReference(ref);
+    var run = 0;
+    return newRef.transaction(function(curr) {
+      run++;
+      if (run === 1) {
+        expect(curr).to.equal(null);
+      } else if (run === 2) {
+        expect(curr).to.equal(42);
+      }
+      return 3.14;
+    }, function(error, committed, resultSnapshot) {
+      expect(error).to.equal(null);
+      expect(committed).to.equal(true);
+      expect(run).to.equal(2);
+      expect(resultSnapshot.val()).to.equal(3.14);
     });
   });
 
@@ -950,9 +948,9 @@ describe('Transaction Tests', function() {
       return 12;
     });
 
-    return ref.once('value', function(s) {
-      expect(s.exportVal()).to.deep.equal({ '.value': 12, '.priority': 7});
-    });
+    const snap = await ref.once('value');
+
+    expect(snap.exportVal()).to.deep.equal({ '.value': 12, '.priority': 7});
   });
 
   it('Transaction and priority: Transaction can change priority on non-empty node.', async function() {