Fix unit tests

Author: brianc

test/unit/client/prepared-statement-tests.js

@@ -1,4 +1,5 @@
-var helper = require(__dirname + '/test-helper');
+var helper = require('./test-helper');
+var Query = require('../../../lib/query')
 
 var client = helper.client();
 var con = client.connection;
@@ -49,10 +50,10 @@ test('bound command', function() {
   test('simple, unnamed bound command', function() {
     assert.ok(client.connection.emit('readyForQuery'));
 
-    var query = client.query({
+    var query = client.query(new Query({
       text: 'select * from X where name = $1',
       values: ['hi']
-    });
+    }));
 
     assert.emits(query,'end', function() {
       test('parse argument', function() {

test/unit/client/result-metadata-tests.js

@@ -6,13 +6,11 @@ var testForTag = function(tagText, callback) {
     var client = helper.client();
     client.connection.emit('readyForQuery')
 
-    var query = client.query("whatever");
-    assert.lengthIs(client.connection.queries, 1)
-
-    assert.emits(query, 'end', function(result) {
+    var query = client.query("whatever", assert.calls((err, result) => {
       assert.ok(result != null, "should pass something to this event")
       callback(result)
-    })
+    }));
+    assert.lengthIs(client.connection.queries, 1)
 
     client.connection.emit('commandComplete', {
       text: tagText

test/unit/client/simple-query-tests.js

@@ -1,4 +1,5 @@
 var helper = require(__dirname + "/test-helper");
+var Query = require('../../../lib/query')
 
 test('executing query', function() {
 
@@ -64,7 +65,7 @@ test('executing query', function() {
   test("query event binding and flow", function() {
     var client = helper.client();
     var con = client.connection;
-    var query = client.query('whatever');
+    var query = client.query(new Query('whatever'));
 
     test("has no queries sent before ready", function() {
       assert.empty(con.queries);

test/unit/client/throw-in-type-parser-tests.js

@@ -1,4 +1,5 @@
-var helper = require(__dirname + "/test-helper");
+var helper = require("./test-helper");
+var Query = require('../../../lib/query')
 var types = require('pg-types')
 
 test('handles throws in type parsers', function() {
@@ -12,7 +13,7 @@ test('handles throws in type parsers', function() {
     var handled;
     var client = helper.client();
     var con = client.connection;
-    var query = client.query('whatever');
+    var query = client.query(new Query('whatever'));
 
     handled = con.emit('readyForQuery');
     assert.ok(handled, "should have handled ready for query");
@@ -81,8 +82,7 @@ test('handles throws in type parsers', function() {
     var handled;
     var client = helper.client();
     var con = client.connection;
-    var query = client.query('whatever');
-    var queryPromise = query.promise();
+    var queryPromise = client.query('whatever');
 
     handled = con.emit('readyForQuery');
     assert.ok(handled, "should have handled ready for query");