From 29b26c6957545fef74cfdd76a74e390f7c1b4662 Mon Sep 17 00:00:00 2001 From: James Sumners Date: Sun, 27 Mar 2022 13:23:55 -0400 Subject: [PATCH] Basic updates --- .taprc | 4 ---- .taprc.yml | 5 +++++ index.js | 2 +- test/index.test.js => index.test.js | 6 +++--- lib/control.js | 2 +- {test/lib => lib}/control.test.js | 18 +++++++++--------- package.json | 28 ++++++++++++++-------------- 7 files changed, 33 insertions(+), 32 deletions(-) delete mode 100644 .taprc create mode 100644 .taprc.yml rename test/index.test.js => index.test.js (91%) rename {test/lib => lib}/control.test.js (87%) diff --git a/.taprc b/.taprc deleted file mode 100644 index d363411..0000000 --- a/.taprc +++ /dev/null @@ -1,4 +0,0 @@ -esm: false - -files: - - 'test/**/*.test.js' diff --git a/.taprc.yml b/.taprc.yml new file mode 100644 index 0000000..32394a7 --- /dev/null +++ b/.taprc.yml @@ -0,0 +1,5 @@ +check-coverage: false + +files: + - 'index.test.js' + - 'lib/**/*.test.js' diff --git a/index.js b/index.js index 94f8595..024338b 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,6 @@ 'use strict' -const { Ber } = require('asn1') +const { Ber } = require('@ldapjs/asn1') const Control = require('./lib/control') module.exports = { diff --git a/test/index.test.js b/index.test.js similarity index 91% rename from test/index.test.js rename to index.test.js index 6c6c2fe..5accc97 100644 --- a/test/index.test.js +++ b/index.test.js @@ -1,8 +1,8 @@ 'use strict' const tap = require('tap') -const { BerReader, BerWriter } = require('asn1') -const controls = require('../') +const { BerReader, BerWriter } = require('@ldapjs/asn1') +const controls = require('.') tap.test('#getControl', t => { t.test('requires a BER to parse', async t => { @@ -16,7 +16,7 @@ tap.test('#getControl', t => { t.test('returns null for empty BER', async t => { const result = controls.getControl(new BerReader(Buffer.alloc(0))) - t.is(result, null) + t.equal(result, null) }) t.test('parses a BER (control)', async t => { diff --git a/lib/control.js b/lib/control.js index 173cd31..5f136fd 100644 --- a/lib/control.js +++ b/lib/control.js @@ -1,6 +1,6 @@ 'use strict' -const { BerWriter } = require('asn1') +const { BerWriter } = require('@ldapjs/asn1') module.exports = Control diff --git a/test/lib/control.test.js b/lib/control.test.js similarity index 87% rename from test/lib/control.test.js rename to lib/control.test.js index fb6021b..b82d4ba 100644 --- a/test/lib/control.test.js +++ b/lib/control.test.js @@ -1,8 +1,8 @@ 'use strict' const tap = require('tap') -const { BerWriter } = require('asn1') -const Control = require('../../lib/control') +const { BerWriter } = require('@ldapjs/asn1') +const Control = require('./control') tap.test('contructor', t => { t.test('new no args', function (t) { @@ -35,7 +35,7 @@ tap.test('#toBer', t => { const control = Control() const ber = control.toBer() - t.is(Buffer.compare(ber.buffer, target.buffer), 0) + t.equal(Buffer.compare(ber.buffer, target.buffer), 0) }) t.test('converts instance to BER', async t => { @@ -53,7 +53,7 @@ tap.test('#toBer', t => { }) const ber = control.toBer() - t.is(Buffer.compare(ber.buffer, target.buffer), 0) + t.equal(Buffer.compare(ber.buffer, target.buffer), 0) }) t.test('converts instance to BER (side effect manner)', async t => { @@ -72,7 +72,7 @@ tap.test('#toBer', t => { const ber = new BerWriter() control.toBer(ber) - t.is(Buffer.compare(ber.buffer, target.buffer), 0) + t.equal(Buffer.compare(ber.buffer, target.buffer), 0) }) t.test('converts instance to BER with string value', async t => { @@ -90,7 +90,7 @@ tap.test('#toBer', t => { }) const ber = control.toBer() - t.is(Buffer.compare(ber.buffer, target.buffer), 0) + t.equal(Buffer.compare(ber.buffer, target.buffer), 0) }) t.test('passes through _toBer', async t => { @@ -105,7 +105,7 @@ tap.test('#toBer', t => { control._toBer = (ber) => t.ok(ber) const ber = control.toBer() - t.is(Buffer.compare(ber.buffer, target.buffer), 0) + t.equal(Buffer.compare(ber.buffer, target.buffer), 0) }) t.end() @@ -120,13 +120,13 @@ tap.test('#toString', t => { return 'foo' } const str = control.toString() - t.is(str, 'foo') + t.equal(str, 'foo') }) t.test('returns basic object', async t => { const control = Control({ type: '1.2.3', criticality: false, value: 'foo' }) const str = control.toString() - t.deepEqual(str, { + t.same(str, { controlType: '1.2.3', criticality: false, controlValue: 'foo' diff --git a/package.json b/package.json index 82eb205..0ce2351 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,15 @@ { "name": "@ldapjs/controls", - "version": "1.0.0", + "version": "1.0.0-rc.1", "description": "LDAP control objects", "main": "index.js", "scripts": { "lint": "standard | snazzy", "lint:ci": "standard", - "test": "tap --no-cov", - "test:cov": "tap", - "test:cov:html": "tap --coverage-report=html" + "test": "tap --no-coverage-report -R terse", + "test:cov": "tap -R terse", + "test:cov:html": "tap -R terse --coverage-report=html", + "test:watch": "tap -w --no-coverage-report -R terse" }, "repository": { "type": "git", @@ -24,17 +25,16 @@ }, "homepage": "https://github.com/ldapjs/controls#readme", "devDependencies": { - "husky": "^3.0.4", - "snazzy": "^8.0.0", - "standard": "^14.1.0", - "tap": "^14.6.1" + "@fastify/pre-commit": "^2.0.2", + "snazzy": "9.0.0", + "standard": "16.0.4", + "tap": "16.0.1" }, "dependencies": { - "asn1": "^0.2.4" + "@ldapjs/asn1": "^1.0.0" }, - "husky": { - "hooks": { - "pre-commit": "npm run lint && npm run test" - } - } + "pre-commit": [ + "lint", + "test" + ] }