From 046d9b80bb0fc52a9732bef3fba1798144bbb6cb Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Fri, 25 Mar 2022 16:53:04 +0100 Subject: [PATCH] test(audit-core): use tap instead of Jest --- @xen-orchestra/audit-core/index.spec.js | 17 ++++++++------ @xen-orchestra/audit-core/package.json | 6 ++++- yarn.lock | 31 ++++++++++++++++--------- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/@xen-orchestra/audit-core/index.spec.js b/@xen-orchestra/audit-core/index.spec.js index b75c9146b6..e29c7b79cf 100644 --- a/@xen-orchestra/audit-core/index.spec.js +++ b/@xen-orchestra/audit-core/index.spec.js @@ -1,6 +1,7 @@ 'use strict' -/* eslint-env jest */ +const assert = require('assert/strict') +const { afterEach, describe, it } = require('tap').mocha const { AlteredRecordError, AuditCore, MissingRecordError, NULL_ID, Storage } = require('.') @@ -74,7 +75,7 @@ const auditCore = new AuditCore(db) const storeAuditRecords = async () => { await Promise.all(DATA.map(data => auditCore.add(...data))) const records = await asyncIteratorToArray(auditCore.getFrom()) - expect(records.length).toBe(DATA.length) + assert.equal(records.length, DATA.length) return records } @@ -85,10 +86,11 @@ describe('auditCore', () => { const [newestRecord, deletedRecord] = await storeAuditRecords() const nValidRecords = await auditCore.checkIntegrity(NULL_ID, newestRecord.id) - expect(nValidRecords).toBe(DATA.length) + assert.equal(nValidRecords, DATA.length) await db.del(deletedRecord.id) - await expect(auditCore.checkIntegrity(NULL_ID, newestRecord.id)).rejects.toEqual( + await assert.rejects( + auditCore.checkIntegrity(NULL_ID, newestRecord.id), new MissingRecordError(deletedRecord.id, 1) ) }) @@ -99,7 +101,8 @@ describe('auditCore', () => { alteredRecord.event = '' await db.put(alteredRecord) - await expect(auditCore.checkIntegrity(NULL_ID, newestRecord.id)).rejects.toEqual( + await assert.rejects( + auditCore.checkIntegrity(NULL_ID, newestRecord.id), new AlteredRecordError(alteredRecord.id, 1, alteredRecord) ) }) @@ -109,8 +112,8 @@ describe('auditCore', () => { await auditCore.deleteFrom(secondRecord.id) - expect(await db.get(firstRecord.id)).toBe(undefined) - expect(await db.get(secondRecord.id)).toBe(undefined) + assert.equal(await db.get(firstRecord.id), undefined) + assert.equal(await db.get(secondRecord.id), undefined) await auditCore.checkIntegrity(secondRecord.id, thirdRecord.id) }) diff --git a/@xen-orchestra/audit-core/package.json b/@xen-orchestra/audit-core/package.json index cf1c70d991..1d1e2794d3 100644 --- a/@xen-orchestra/audit-core/package.json +++ b/@xen-orchestra/audit-core/package.json @@ -12,7 +12,8 @@ "node": ">=14" }, "scripts": { - "postversion": "npm publish --access public" + "postversion": "npm publish --access public", + "test": "tap --lines 67 --functions 92 --branches 52 --statements 67" }, "dependencies": { "@vates/decorate-with": "^1.0.0", @@ -25,5 +26,8 @@ "author": { "name": "Vates SAS", "url": "https://vates.fr" + }, + "devDependencies": { + "tap": "^16.0.1" } } diff --git a/yarn.lock b/yarn.lock index 1d78c82105..c49bc4bb58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1153,7 +1153,7 @@ resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c" integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg== -"@isaacs/import-jsx@^4.0.1": +"@isaacs/import-jsx@*", "@isaacs/import-jsx@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@isaacs/import-jsx/-/import-jsx-4.0.1.tgz#493cab5fc543a0703dba7c3f5947d6499028a169" integrity sha512-l34FEsEqpdYdGcQjRCxWy+7rHY6euUbOBz9FI+Mq6oQeVhNegHcXFSJxVxrJvOpO31NbnDjS74quKXDlPDearA== @@ -1731,6 +1731,15 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== +"@types/react@*": + version "17.0.43" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55" + integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/react@^17": version "17.0.42" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.42.tgz#8242b9219bf8a911c47f248e327206fea3f4ee5a" @@ -9093,7 +9102,7 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -ink@^3.2.0: +ink@*, ink@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ink/-/ink-3.2.0.tgz#434793630dc57d611c8fe8fffa1db6b56f1a16bb" integrity sha512-firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg== @@ -14667,6 +14676,14 @@ react-virtualized@^9.15.0: prop-types "^15.7.2" react-lifecycles-compat "^3.0.4" +react@*, react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + react@^15.4.1: version "15.7.0" resolved "https://registry.yarnpkg.com/react/-/react-15.7.0.tgz#10308fd42ac6912a250bf00380751abc41ac7106" @@ -14678,14 +14695,6 @@ react@^15.4.1: object-assign "^4.1.0" prop-types "^15.5.10" -react@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - read-only-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" @@ -16937,7 +16946,7 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= -treport@^3.0.3: +treport@*, treport@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/treport/-/treport-3.0.3.tgz#0666bb1b00b6ed6e2ba82ae76b79d77fb03c505a" integrity sha512-pCg4Bc0Uv0ntAkYjYJAncA6h6Srv1eEFa5vcak8paahgU1TrJ2rZm0RPZ8E8uycz+P55quzsDnACw01jpWfk7Q==