Fix brittle unit tests

brianc · brianc · commit 0ce8a6c675be · 2017-06-16T21:43:45.000-05:00
diff --git a/test/unit/client/test-helper.js b/test/unit/client/test-helper.js
@@ -1,5 +1,6 @@
-var helper = require(__dirname+'/../test-helper');
-var Connection = require(__dirname + '/../../../lib/connection');
+var helper = require('../test-helper');
+var Connection = require('../../../lib/connection');
+
 var makeClient = function() {
   var connection = new Connection({stream: "no"});
   connection.startup = function() {};
@@ -14,6 +15,6 @@ var makeClient = function() {
   return client;
 };
 
-module.exports = {
+module.exports = Object.assign({
   client: makeClient
-};
+}, helper);
diff --git a/test/unit/client/throw-in-type-parser-tests.js b/test/unit/client/throw-in-type-parser-tests.js
@@ -1,112 +1,69 @@
 var helper = require("./test-helper");
-var Query = require('../../../lib/query')
-var types = require('pg-types')
+var Query = require("../../../lib/query");
+var types = require("pg-types");
 
-test('handles throws in type parsers', function() {
-  var typeParserError = new Error('TEST: Throw in type parsers');
+const suite = new helper.Suite();
 
-  types.setTypeParser('special oid that will throw', function () {
-    throw typeParserError;
-  });
-
-  test('emits error', function() {
-    var handled;
-    var client = helper.client();
-    var con = client.connection;
-    var query = client.query(new Query('whatever'));
+var typeParserError = new Error("TEST: Throw in type parsers");
 
-    handled = con.emit('readyForQuery');
-    assert.ok(handled, "should have handled ready for query");
-
-    con.emit('rowDescription',{
-      fields: [{
-        name: 'boom',
-        dataTypeID: 'special oid that will throw'
-      }]
-    });
-    assert.ok(handled, "should have handled row description");
+types.setTypeParser("special oid that will throw", function() {
+  throw typeParserError;
+});
 
-    assert.emits(query, 'error', function(err) {
-      assert.equal(err, typeParserError);
+const emitFakeEvents = con => {
+  setImmediate(() => {
+    con.emit("readyForQuery");
+
+    con.emit("rowDescription", {
+      fields: [
+        {
+          name: "boom",
+          dataTypeID: "special oid that will throw"
+        }
+      ]
     });
 
-    handled = con.emit('dataRow', { fields: ["hi"] });
-    assert.ok(handled, "should have handled first data row message");
-
-    handled = con.emit('commandComplete', { text: 'INSERT 31 1' });
-    assert.ok(handled, "should have handled command complete");
-
-    handled = con.emit('readyForQuery');
-    assert.ok(handled, "should have handled ready for query");
+    con.emit("dataRow", { fields: ["hi"] });
+    con.emit("dataRow", { fields: ["hi"] });
+    con.emit("commandComplete", { text: "INSERT 31 1" });
+    con.emit("readyForQuery");
   });
-
-  test('calls callback with error', function() {
-    var handled;
-
-    var callbackCalled = 0;
-
-    var client = helper.client();
-    var con = client.connection;
-    var query = client.query('whatever', assert.calls(function (err) {
-      callbackCalled += 1;
-
-      assert.equal(callbackCalled, 1);
-      assert.equal(err, typeParserError);
-    }));
-
-    handled = con.emit('readyForQuery');
-    assert.ok(handled, "should have handled ready for query");
-
-    handled = con.emit('rowDescription',{
-      fields: [{
-        name: 'boom',
-        dataTypeID: 'special oid that will throw'
-      }]
-    });
-    assert.ok(handled, "should have handled row description");
-
-    handled = con.emit('dataRow', { fields: ["hi"] });
-    assert.ok(handled, "should have handled first data row message");
-
-    handled = con.emit('dataRow', { fields: ["hi"] });
-    assert.ok(handled, "should have handled second data row message");
-
-    con.emit('commandComplete', { text: 'INSERT 31 1' });
-    assert.ok(handled, "should have handled command complete");
-
-    handled = con.emit('readyForQuery');
-    assert.ok(handled, "should have handled ready for query");
+};
+
+suite.test("emits error", function(done) {
+  var handled;
+  var client = helper.client();
+  var con = client.connection;
+  var query = client.query(new Query("whatever"));
+  emitFakeEvents(con)
+
+  assert.emits(query, "error", function(err) {
+    assert.equal(err, typeParserError);
+    done();
   });
+});
 
-  test('rejects promise with error', function() {
-    var handled;
-    var client = helper.client();
-    var con = client.connection;
-    var queryPromise = client.query('whatever');
-
-    handled = con.emit('readyForQuery');
-    assert.ok(handled, "should have handled ready for query");
-
-    handled = con.emit('rowDescription',{
-      fields: [{
-        name: 'boom',
-        dataTypeID: 'special oid that will throw'
-      }]
-    });
-    assert.ok(handled, "should have handled row description");
+suite.test("calls callback with error", function(done) {
+  var handled;
 
-    handled = con.emit('dataRow', { fields: ["hi"] });
-    assert.ok(handled, "should have handled first data row message");
+  var callbackCalled = 0;
 
-    handled = con.emit('commandComplete', { text: 'INSERT 31 1' });
-    assert.ok(handled, "should have handled command complete");
+  var client = helper.client();
+  var con = client.connection;
+  emitFakeEvents(con);
+  var query = client.query("whatever", function(err) {
+    assert.equal(err, typeParserError);
+    done();
+  });
 
-    handled = con.emit('readyForQuery');
-    assert.ok(handled, "should have handled ready for query");
+});
 
-    queryPromise.catch(assert.calls(function (err) {
-      assert.equal(err, typeParserError);
-    }));
+suite.test("rejects promise with error", function(done) {
+  var client = helper.client();
+  var con = client.connection;
+  emitFakeEvents(con);
+  client.query("whatever").catch(err => {
+    assert.equal(err, typeParserError);
+    done();
   });
-
 });
diff --git a/test/unit/test-helper.js b/test/unit/test-helper.js
@@ -1,6 +1,8 @@
-var helper = require(__dirname+'/../test-helper');
 var EventEmitter = require('events').EventEmitter;
-var Connection = require(__dirname + '/../../lib/connection');
+
+var helper = require('../test-helper');
+var Connection = require('../../lib/connection');
+
 MemoryStream = function() {
   EventEmitter.call(this);
   this.packets = [];
