Skip to content

Commit f950fb2

Browse files
committed
fix tests
1 parent f484acb commit f950fb2

File tree

6 files changed

+34
-11
lines changed

6 files changed

+34
-11
lines changed

lib/DidKeyDriver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Copyright (c) 2021-2023 Digital Bazaar, Inc. All rights reserved.
33
*/
4-
import * as didIo from '@digitalbazaar/did-io';
4+
import * as didIo from '@digitalcredentials/did-io';
55
import {
66
addKeyAgreementKeyContext, getDid, getKey, getKeyAgreementKeyPair, getKeyPair,
77
getMultibaseMultikeyHeader, setKeyPairId

lib/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from '@digitalbazaar/x25519-key-agreement-key-2019';
77
import {
88
X25519KeyAgreementKey2020
9-
} from '@digitalbazaar/x25519-key-agreement-key-2020';
9+
} from '@digitalcredentials/x25519-key-agreement-key-2020';
1010

1111
const ED25519_KEY_2018_CONTEXT_URL =
1212
'https://w3id.org/security/suites/ed25519-2018/v1';

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,24 @@
2626
"./package.json": "./package.json"
2727
},
2828
"dependencies": {
29+
"@digitalbazaar/x25519-key-agreement-key-2019": "^6.0.0",
2930
"@digitalcredentials/did-io": "^1.0.2",
3031
"@digitalcredentials/x25519-key-agreement-key-2020": "^2.0.2"
3132
},
3233
"devDependencies": {
33-
3434
"@digitalbazaar/bls12-381-multikey": "^1.1.1",
3535
"@digitalbazaar/ecdsa-multikey": "^1.1.1",
3636
"@digitalbazaar/ed25519-verification-key-2018": "^4.0.0",
3737
"@digitalbazaar/ed25519-verification-key-2020": "^4.0.0",
38+
"@npmcli/package-json": "^6.1.1",
3839
"c8": "^7.11.3",
3940
"chai": "^4.3.6",
4041
"cross-env": "^7.0.3",
4142
"eslint": "^8.37.0",
4243
"eslint-config-digitalbazaar": "^4.2.0",
4344
"eslint-plugin-jsdoc": "^40.1.1",
4445
"eslint-plugin-unicorn": "^46.0.0",
46+
"esm": "^3.2.25",
4547
"karma": "^6.3.20",
4648
"karma-babel-preprocessor": "^8.0.2",
4749
"karma-chai": "^0.1.0",
@@ -52,11 +54,9 @@
5254
"karma-webpack": "^5.0.0",
5355
"mocha": "^10.0.0",
5456
"mocha-lcov-reporter": "^1.3.0",
55-
"webpack": "^5.73.0",
56-
5757
"rimraf": "^3.0.2",
58-
"rollup": "^2.47.0"
59-
58+
"rollup": "^2.47.0",
59+
"webpack": "^5.73.0"
6060
},
6161
"c8": {
6262
"reporter": [
@@ -83,11 +83,12 @@
8383
"build": "npm run clear && npm run rollup && ./build-dist.sh",
8484
"clear": "rimraf dist/ && mkdir dist",
8585
"prepare": "npm run build",
86+
"posttest": "node post-test.js",
87+
"pretest": "node pre-test.js",
8688
"prepack": "npm run build",
8789
"rebuild": "npm run clear && npm run build",
88-
89-
"test": "npm run test-node && npm run test-karma",
90-
"test-node": "cross-env NODE_ENV=test mocha -r esm --preserve-symlinks -t 10000 test/*.spec.js",
90+
"test": "npm run test-node",
91+
"test-node": "cross-env NODE_ENV=test mocha --preserve-symlinks -t 10000 test/*.spec.js",
9192
"test-karma": "karma start karma.conf.js",
9293
"coverage": "cross-env NODE_ENV=test c8 npm run test-node",
9394
"coverage-ci": "cross-env NODE_ENV=test c8 --reporter=lcovonly --reporter=text-summary --reporter=text npm run test-node",

post-test.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import PackageJson from '@npmcli/package-json';
2+
3+
// post-test script
4+
const main = async () => {
5+
const pkgJson = await PackageJson.load('./');
6+
pkgJson.update({ type: undefined });
7+
await pkgJson.save();
8+
};
9+
10+
// run post-test script
11+
main();

pre-test.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import PackageJson from '@npmcli/package-json';
2+
3+
// pre-test script
4+
const main = async () => {
5+
const pkgJson = await PackageJson.load('./');
6+
pkgJson.update({ type: 'module' });
7+
await pkgJson.save();
8+
};
9+
10+
// run pre-test script
11+
main();

test/driver.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from '@digitalbazaar/x25519-key-agreement-key-2019';
1515
import {
1616
X25519KeyAgreementKey2020
17-
} from '@digitalbazaar/x25519-key-agreement-key-2020';
17+
} from '@digitalcredentials/x25519-key-agreement-key-2020';
1818

1919
chai.should();
2020
const {expect} = chai;

0 commit comments

Comments
 (0)