Merge pull request #532 from ldapjs/back-to-tap

jsumners · web-flow · commit 426c6a7d2c2a · 2019-08-27T09:13:23.000-04:00
Convert tests back to node-tap
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,77 @@
-build
-node_modules
-coverage
-*.log
 *.ldif
 *.tar.*
 *.tgz
+
+# Lock files
+pnpm-lock.yaml
+shrinkwrap.yaml
+package-lock.json
+yarn.lock
+
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+# 0x
+.__browserify_string_empty.js
+profile-*
+*.flamegraph
+
+# tap --cov
+.nyc_output/
+
+# JetBrains IntelliJ IDEA
+.idea/
+*.iml
+
+# VS Code
+.vscode/
+
+# xcode
+build/*
+*.mode1
+*.mode1v3
+*.mode2v3
+*.perspective
+*.perspectivev3
+*.pbxuser
+*.xcworkspace
+xcuserdata
+
+# macOS
 .DS_Store
+
+# keys
+*.pem
+*.env.json
+*.env
diff --git a/.taprc b/.taprc
@@ -0,0 +1 @@
+esm: false
diff --git a/package.json b/package.json
@@ -33,20 +33,20 @@
     "asn1": "0.2.3",
     "assert-plus": "^1.0.0",
     "backoff": "^2.5.0",
-    "ldap-filter": "^0.3.3",
     "dashdash": "^1.14.0",
+    "ldap-filter": "^0.3.3",
     "once": "^1.4.0",
     "vasync": "^1.6.4",
     "verror": "^1.8.1"
   },
   "devDependencies": {
-    "faucet": "0.0.1",
-    "istanbul": "^0.4.5",
-    "tape": "^4.6.2",
+    "tap": "^14.6.1",
     "uuid": "^3.3.3"
   },
   "scripts": {
-    "report": "./node_modules/.bin/istanbul report html && open ./coverage/lcov-report/index.html",
-    "test": "./node_modules/.bin/istanbul cover --print none test/test.js | ./node_modules/.bin/faucet"
+    "test": "tap --no-cov 'test/**/*.test.js'",
+    "test:cov": "tap 'test/**/*.test.js'",
+    "test:cov:html": "tap --coverage-report=html 'test/**/*.test.js'",
+    "test:watch": "tap -n -w --no-coverage-report 'test/**/*.test.js'"
   }
 }
diff --git a/test/attribute.test.js b/test/attribute.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/change.test.js b/test/change.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/client.test.js b/test/client.test.js
@@ -2,7 +2,7 @@
 
 var logger = Object.create(require('abstract-logging'));
 
-var test = require('tape').test;
+var test = require('tap').test;
 var uuid = require('uuid');
 var vasync = require('vasync');
 var util = require('util');
@@ -642,10 +642,12 @@ test('search sizeLimit', function (t) {
       res.on('error', t2.ifError.bind(t));
     });
   });
+
+  t.end()
 });
 
 
-test('search paged', function (t) {
+test('search paged', {timeout: 10000}, function (t) {
   t.test('paged - no pauses', function (t2) {
     var countEntries = 0;
     var countPages = 0;
diff --git a/test/controls/control.test.js b/test/controls/control.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/controls/entry_change_notification_control.test.js b/test/controls/entry_change_notification_control.test.js
diff --git a/test/controls/paged_results_control.test.js b/test/controls/paged_results_control.test.js
diff --git a/test/controls/persistent_search_control.test.js b/test/controls/persistent_search_control.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/controls/server_side_sorting_control_request.test.js b/test/controls/server_side_sorting_control_request.test.js
@@ -1,5 +1,5 @@
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/controls/server_side_sorting_control_response.test.js b/test/controls/server_side_sorting_control_response.test.js
@@ -1,4 +1,4 @@
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/dn.test.js b/test/dn.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 
 ///--- Globals
diff --git a/test/errors.test.js b/test/errors.test.js
@@ -1,6 +1,6 @@
 // Copyright 2015 Joyent, Inc.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var ldap = require('../lib/index');
 
diff --git a/test/filters/and.test.js b/test/filters/and.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/approx.test.js b/test/filters/approx.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/eq.test.js b/test/filters/eq.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/ext.test.js b/test/filters/ext.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/ge.test.js b/test/filters/ge.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/le.test.js b/test/filters/le.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/not.test.js b/test/filters/not.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/or.test.js b/test/filters/or.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/parse.test.js b/test/filters/parse.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var parse = require('../../lib/index').parseFilter;
 
diff --git a/test/filters/presence.test.js b/test/filters/presence.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/filters/substr.test.js b/test/filters/substr.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/laundry.test.js b/test/laundry.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 var uuid = require('uuid');
 
 var ldap = require('../lib/index');
diff --git a/test/messages/add_request.test.js b/test/messages/add_request.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/add_response.test.js b/test/messages/add_response.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/bind_request.test.js b/test/messages/bind_request.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/bind_response.test.js b/test/messages/bind_response.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/compare_request.test.js b/test/messages/compare_request.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/compare_response.test.js b/test/messages/compare_response.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/del_request.test.js b/test/messages/del_request.test.js
@@ -3,7 +3,7 @@
 
 var asn1 = require('asn1');
 var logger = Object.create(require('abstract-logging'));
-var test = require('tape').test;
+var test = require('tap').test;
 
 
 ///--- Globals
diff --git a/test/messages/del_response.test.js b/test/messages/del_response.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/ext_request.test.js b/test/messages/ext_request.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/ext_response.test.js b/test/messages/ext_response.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/moddn_request.test.js b/test/messages/moddn_request.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/moddn_response.test.js b/test/messages/moddn_response.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/modify_request.test.js b/test/messages/modify_request.test.js
@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tape').test;
+var test = require('tap').test;
 
 var asn1 = require('asn1');
 
diff --git a/test/messages/modify_response.test.js b/test/messages/modify_response.test.js
diff --git a/test/messages/parser.test.js b/test/messages/parser.test.js
diff --git a/test/messages/search_entry.test.js b/test/messages/search_entry.test.js
diff --git a/test/messages/search_request.test.js b/test/messages/search_request.test.js
diff --git a/test/messages/search_response.test.js b/test/messages/search_response.test.js
diff --git a/test/messages/unbind_request.test.js b/test/messages/unbind_request.test.js
diff --git a/test/server.test.js b/test/server.test.js
diff --git a/test/test.js b/test/test.js
diff --git a/test/url.test.js b/test/url.test.js
