test-using-tap

Gbp-Pq: Name test-using-tap.patch

5 files changed, 10 insertions, 9 deletions

diff --git a/test/unit/dropBeforeAccept.js b/test/unit/dropBeforeAccept.js
index c13a7e6..f19acca 100644
--- a/test/unit/dropBeforeAccept.js
+++ b/test/unit/dropBeforeAccept.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var test = require('tape');
+var test = require('tap').test;
 
 var WebSocketClient = require('../../lib/WebSocketClient');
 var server = require('../shared/test-server');
diff --git a/test/unit/regressions.js b/test/unit/regressions.js
index 9a46a9e..ce66c66 100644
--- a/test/unit/regressions.js
+++ b/test/unit/regressions.js
@@ -1,4 +1,4 @@
-var test = require('tape');
+var test = require('tap').test;
 
 var WebSocketClient = require('../../lib/WebSocketClient');
 var startEchoServer = require('../shared/start-echo-server');
diff --git a/test/unit/request.js b/test/unit/request.js
index f5cc69a..1937b08 100644
--- a/test/unit/request.js
+++ b/test/unit/request.js
@@ -1,4 +1,4 @@
-var test = require('tape');
+var test = require('tap').test;
 
 var WebSocketClient = require('../../lib/WebSocketClient');
 var server = require('../shared/test-server');
@@ -7,7 +7,7 @@ var stopServer = server.stopServer;
 test('Request can only be rejected or accepted once.', function(t) {
   t.plan(6);
   
-  t.on('end', function() {
+  t.tearDown(function() {
     stopServer();
   });
   
@@ -56,6 +56,8 @@ test('Request can only be rejected or accepted once.', function(t) {
 
 test('Protocol mismatch should be handled gracefully', function(t) {
   var wsServer;
+
+	t.plan(2);
   
   t.test('setup', function(t) {
     server.prepare(function(err, result) {
@@ -98,8 +100,7 @@ test('Protocol mismatch should be handled gracefully', function(t) {
     }
   });
   
-  t.test('teardown', function(t) {
+  t.tearDown(function(t) {
     stopServer();
-    t.end();
   });
 });
diff --git a/test/unit/w3cwebsocket.js b/test/unit/w3cwebsocket.js
index e4ad230..3b57c8b 100755
--- a/test/unit/w3cwebsocket.js
+++ b/test/unit/w3cwebsocket.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var test = require('tape');
+var test = require('tap').test;
 var WebSocket = require('../../lib/W3CWebSocket');
 var startEchoServer = require('../shared/start-echo-server');
 
diff --git a/test/unit/websocketFrame.js b/test/unit/websocketFrame.js
index 034612e..8961883 100644
--- a/test/unit/websocketFrame.js
+++ b/test/unit/websocketFrame.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var test = require('tape');
+var test = require('tap').test;
 var bufferEqual = require('buffer-equal');
 var WebSocketFrame = require('../../lib/WebSocketFrame');
 
@@ -29,4 +29,4 @@ test('Serializing a WebSocket Frame with no data', function(t) {
   );
   
   t.end();
-});
\ No newline at end of file
+});