From 0884da7941d00cd398ad53ef031f8d80f0a4bdac Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Fri, 21 Jan 2022 19:54:07 +0100 Subject: [PATCH] BREAKING CHANGE(core): switxh to @pushrocks/smartexpect --- package-lock.json | 81 ++++++++++++++++++++++++++++++++--------- package.json | 6 +-- test/test.browser.ts | 11 +++--- test/test.ts | 8 ++-- ts/index.ts | 10 ++++- ts/tapbundle.plugins.ts | 3 +- 6 files changed, 85 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index 42378d1..5fc7b6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,12 +12,12 @@ "@open-wc/testing-helpers": "^2.0.2", "@pushrocks/smartdelay": "^2.0.13", "@pushrocks/smartenv": "^4.0.16", + "@pushrocks/smartexpect": "^1.0.7", "@pushrocks/smartpromise": "^3.1.6", - "@pushrocks/smarttime": "^3.0.43", - "smartchai": "^2.0.1" + "@pushrocks/smarttime": "^3.0.43" }, "devDependencies": { - "@gitzone/tsbuild": "^2.1.28", + "@gitzone/tsbuild": "^2.1.29", "@gitzone/tsrun": "^1.2.18", "@gitzone/tstest": "^1.0.60", "@types/node": "^16.11.12", @@ -1920,9 +1920,9 @@ } }, "node_modules/@gitzone/tsbuild": { - "version": "2.1.28", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.28.tgz", - "integrity": "sha512-4078HthzWnjGPNKtDo8KSpeONp/FyCn4kNM2ZU+H46CLZaG9jlaN4u4qgGSVXJGNNnEOfDDv7+OOdPQW2lVJYg==", + "version": "2.1.29", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.29.tgz", + "integrity": "sha512-rS0WlwXKb0W+gjFvVgcr1h+ZWRQTBwDm9RylEipPsDb+RmbTYKFT1xtoS53TWAgSKJouknVfsLowbSEic9+75g==", "dev": true, "license": "MIT", "dependencies": { @@ -2299,6 +2299,17 @@ "@pushrocks/smartdelay": "^2.0.3" } }, + "node_modules/@pushrocks/smartexpect": { + "version": "1.0.7", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpect/-/smartexpect-1.0.7.tgz", + "integrity": "sha512-xoYMslPRhOsA2/SPCY7gmRfzT2cL0D5a+wFPB0dVBLJ9jCoyYkRm5sZo02ty+YNqXUVN2zKxY+BZk9KM4HaHyw==", + "license": "MIT", + "dependencies": { + "@pushrocks/smartdelay": "^2.0.13", + "@pushrocks/smartpromise": "^3.1.6", + "fast-deep-equal": "^3.1.3" + } + }, "node_modules/@pushrocks/smartexpress": { "version": "3.0.108", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.108.tgz", @@ -3032,12 +3043,14 @@ "version": "4.2.15", "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.15.tgz", "integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==", + "dev": true, "license": "MIT" }, "node_modules/@types/chai-as-promised": { "version": "7.1.3", "resolved": "https://verdaccio.lossless.one/@types%2fchai-as-promised/-/chai-as-promised-7.1.3.tgz", "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", + "dev": true, "license": "MIT", "dependencies": { "@types/chai": "*" @@ -3047,6 +3060,7 @@ "version": "1.4.2", "resolved": "https://verdaccio.lossless.one/@types%2fchai-string/-/chai-string-1.4.2.tgz", "integrity": "sha512-ld/1hV5qcPRGuwlPdvRfvM3Ka/iofOk2pH4VkasK4b1JJP1LjNmWWn0LsISf6RRzyhVOvs93rb9tM09e+UuF8Q==", + "dev": true, "license": "MIT", "dependencies": { "@types/chai": "*" @@ -3846,6 +3860,7 @@ "version": "1.1.0", "resolved": "https://verdaccio.lossless.one/assertion-error/-/assertion-error-1.1.0.tgz", "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, "license": "MIT", "engines": { "node": "*" @@ -4722,6 +4737,7 @@ "version": "4.3.0", "resolved": "https://verdaccio.lossless.one/chai/-/chai-4.3.0.tgz", "integrity": "sha512-/BFd2J30EcOwmdOgXvVsmM48l0Br0nmZPlO0uOW4XKh6kpsUumRXBgPV+IlaqFaqr9cYbeoZAM1Npx0i4A+aiA==", + "dev": true, "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", @@ -4739,6 +4755,7 @@ "version": "7.1.1", "resolved": "https://verdaccio.lossless.one/chai-as-promised/-/chai-as-promised-7.1.1.tgz", "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, "license": "WTFPL", "dependencies": { "check-error": "^1.0.2" @@ -4751,6 +4768,7 @@ "version": "1.5.0", "resolved": "https://verdaccio.lossless.one/chai-string/-/chai-string-1.5.0.tgz", "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==", + "dev": true, "license": "MIT", "peerDependencies": { "chai": "^4.1.2" @@ -4798,6 +4816,7 @@ "version": "1.0.2", "resolved": "https://verdaccio.lossless.one/check-error/-/check-error-1.0.2.tgz", "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true, "license": "MIT", "engines": { "node": "*" @@ -6041,6 +6060,7 @@ "version": "3.0.1", "resolved": "https://verdaccio.lossless.one/deep-eql/-/deep-eql-3.0.1.tgz", "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, "license": "MIT", "dependencies": { "type-detect": "^4.0.0" @@ -7076,7 +7096,6 @@ "version": "3.1.3", "resolved": "https://verdaccio.lossless.one/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, "license": "MIT" }, "node_modules/fast-glob": { @@ -7456,6 +7475,7 @@ "version": "2.0.0", "resolved": "https://verdaccio.lossless.one/get-func-name/-/get-func-name-2.0.0.tgz", "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true, "license": "MIT", "engines": { "node": "*" @@ -10989,6 +11009,7 @@ "version": "1.1.1", "resolved": "https://verdaccio.lossless.one/pathval/-/pathval-1.1.1.tgz", "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, "license": "MIT", "engines": { "node": "*" @@ -13210,6 +13231,7 @@ "version": "2.0.1", "resolved": "https://verdaccio.lossless.one/smartchai/-/smartchai-2.0.1.tgz", "integrity": "sha512-9M+R56OhAHXScxgr2vzQqxGx0XMS0QXriNZuP7hjlbVbo2FUT+l60iEzbwPt9Ga+5u2cEEjSSoZEQVqlROaddA==", + "dev": true, "license": "MIT", "dependencies": { "@types/chai": "^4.1.2", @@ -14606,6 +14628,7 @@ "version": "4.0.8", "resolved": "https://verdaccio.lossless.one/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -16749,9 +16772,9 @@ } }, "@gitzone/tsbuild": { - "version": "2.1.28", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.28.tgz", - "integrity": "sha512-4078HthzWnjGPNKtDo8KSpeONp/FyCn4kNM2ZU+H46CLZaG9jlaN4u4qgGSVXJGNNnEOfDDv7+OOdPQW2lVJYg==", + "version": "2.1.29", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.29.tgz", + "integrity": "sha512-rS0WlwXKb0W+gjFvVgcr1h+ZWRQTBwDm9RylEipPsDb+RmbTYKFT1xtoS53TWAgSKJouknVfsLowbSEic9+75g==", "dev": true, "requires": { "@pushrocks/early": "^3.0.6", @@ -17070,6 +17093,16 @@ "@pushrocks/smartdelay": "^2.0.3" } }, + "@pushrocks/smartexpect": { + "version": "1.0.7", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpect/-/smartexpect-1.0.7.tgz", + "integrity": "sha512-xoYMslPRhOsA2/SPCY7gmRfzT2cL0D5a+wFPB0dVBLJ9jCoyYkRm5sZo02ty+YNqXUVN2zKxY+BZk9KM4HaHyw==", + "requires": { + "@pushrocks/smartdelay": "^2.0.13", + "@pushrocks/smartpromise": "^3.1.6", + "fast-deep-equal": "^3.1.3" + } + }, "@pushrocks/smartexpress": { "version": "3.0.108", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.108.tgz", @@ -17717,12 +17750,14 @@ "@types/chai": { "version": "4.2.15", "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.15.tgz", - "integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==" + "integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==", + "dev": true }, "@types/chai-as-promised": { "version": "7.1.3", "resolved": "https://verdaccio.lossless.one/@types%2fchai-as-promised/-/chai-as-promised-7.1.3.tgz", "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", + "dev": true, "requires": { "@types/chai": "*" } @@ -17731,6 +17766,7 @@ "version": "1.4.2", "resolved": "https://verdaccio.lossless.one/@types%2fchai-string/-/chai-string-1.4.2.tgz", "integrity": "sha512-ld/1hV5qcPRGuwlPdvRfvM3Ka/iofOk2pH4VkasK4b1JJP1LjNmWWn0LsISf6RRzyhVOvs93rb9tM09e+UuF8Q==", + "dev": true, "requires": { "@types/chai": "*" } @@ -18377,7 +18413,8 @@ "assertion-error": { "version": "1.1.0", "resolved": "https://verdaccio.lossless.one/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==" + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true }, "assign-symbols": { "version": "1.0.0", @@ -19038,6 +19075,7 @@ "version": "4.3.0", "resolved": "https://verdaccio.lossless.one/chai/-/chai-4.3.0.tgz", "integrity": "sha512-/BFd2J30EcOwmdOgXvVsmM48l0Br0nmZPlO0uOW4XKh6kpsUumRXBgPV+IlaqFaqr9cYbeoZAM1Npx0i4A+aiA==", + "dev": true, "requires": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", @@ -19051,6 +19089,7 @@ "version": "7.1.1", "resolved": "https://verdaccio.lossless.one/chai-as-promised/-/chai-as-promised-7.1.1.tgz", "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, "requires": { "check-error": "^1.0.2" } @@ -19059,6 +19098,7 @@ "version": "1.5.0", "resolved": "https://verdaccio.lossless.one/chai-string/-/chai-string-1.5.0.tgz", "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==", + "dev": true, "requires": {} }, "chalk": { @@ -19092,7 +19132,8 @@ "check-error": { "version": "1.0.2", "resolved": "https://verdaccio.lossless.one/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=" + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true }, "chokidar": { "version": "2.1.8", @@ -20043,6 +20084,7 @@ "version": "3.0.1", "resolved": "https://verdaccio.lossless.one/deep-eql/-/deep-eql-3.0.1.tgz", "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, "requires": { "type-detect": "^4.0.0" } @@ -20811,8 +20853,7 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://verdaccio.lossless.one/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "fast-glob": { "version": "2.2.7", @@ -21091,7 +21132,8 @@ "get-func-name": { "version": "2.0.0", "resolved": "https://verdaccio.lossless.one/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=" + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true }, "get-intrinsic": { "version": "1.1.1", @@ -23688,7 +23730,8 @@ "pathval": { "version": "1.1.1", "resolved": "https://verdaccio.lossless.one/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==" + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true }, "pbkdf2": { "version": "3.1.2", @@ -25338,6 +25381,7 @@ "version": "2.0.1", "resolved": "https://verdaccio.lossless.one/smartchai/-/smartchai-2.0.1.tgz", "integrity": "sha512-9M+R56OhAHXScxgr2vzQqxGx0XMS0QXriNZuP7hjlbVbo2FUT+l60iEzbwPt9Ga+5u2cEEjSSoZEQVqlROaddA==", + "dev": true, "requires": { "@types/chai": "^4.1.2", "@types/chai-as-promised": "^7.1.0", @@ -26373,7 +26417,8 @@ "type-detect": { "version": "4.0.8", "resolved": "https://verdaccio.lossless.one/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==" + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true }, "type-fest": { "version": "0.16.0", diff --git a/package.json b/package.json index 099b997..b01017b 100644 --- a/package.json +++ b/package.json @@ -23,12 +23,12 @@ "@open-wc/testing-helpers": "^2.0.2", "@pushrocks/smartdelay": "^2.0.13", "@pushrocks/smartenv": "^4.0.16", + "@pushrocks/smartexpect": "^1.0.7", "@pushrocks/smartpromise": "^3.1.6", - "@pushrocks/smarttime": "^3.0.43", - "smartchai": "^2.0.1" + "@pushrocks/smarttime": "^3.0.43" }, "devDependencies": { - "@gitzone/tsbuild": "^2.1.28", + "@gitzone/tsbuild": "^2.1.29", "@gitzone/tsrun": "^1.2.18", "@gitzone/tstest": "^1.0.60", "@types/node": "^16.11.12", diff --git a/test/test.browser.ts b/test/test.browser.ts index a7942d5..e16ffc3 100644 --- a/test/test.browser.ts +++ b/test/test.browser.ts @@ -6,12 +6,12 @@ tap.preTask('custompretask', async () => { tap.test('should have access to webhelpers', async () => { const myElement = await webhelpers.fixture(webhelpers.html`
`); - expect(myElement).to.be.instanceOf(HTMLElement); + expect(myElement).toBeInstanceOf(HTMLElement); console.log(myElement); }); const test1 = tap.test('my first test -> expect true to be true', async () => { - return expect(true).to.be.true; + return expect(true).toBeTrue(); }); const test2 = tap.test('my second test', async (tools) => { @@ -21,15 +21,14 @@ const test2 = tap.test('my second test', async (tools) => { const test3 = tap.test( 'my third test -> test2 should take longer than test1 and endure at least 1000ms', async () => { - expect((await test1).hrtMeasurement.milliSeconds < (await test2).hrtMeasurement.milliSeconds).to - .be.true; - expect((await test2).hrtMeasurement.milliSeconds > 10).to.be.true; + expect((await test1).hrtMeasurement.milliSeconds < (await test2).hrtMeasurement.milliSeconds).toBeTrue(); + expect((await test2).hrtMeasurement.milliSeconds > 10).toBeTrue(); } ); const test4 = tap.skip.test('my 4th test -> should fail', async (tools) => { tools.allowFailure(); - expect(false).to.be.true; + expect(false).toBeTrue(); }); const test5 = tap.test('my 5th test -> should pass in about 500ms', async (tools) => { diff --git a/test/test.ts b/test/test.ts index cc01e08..fa34a9f 100644 --- a/test/test.ts +++ b/test/test.ts @@ -5,7 +5,7 @@ tap.preTask('hi there', async () => { }); const test1 = tap.test('my first test -> expect true to be true', async () => { - return expect(true).to.be.true; + return expect(true).toBeTrue(); }); const test2 = tap.test('my second test', async (tools) => { @@ -18,14 +18,14 @@ const test3 = tap.test( expect( (await test1.testPromise).hrtMeasurement.milliSeconds < (await test2).hrtMeasurement.milliSeconds - ).to.be.true; - expect((await test2.testPromise).hrtMeasurement.milliSeconds > 1000).to.be.true; + ).toBeTrue(); + expect((await test2.testPromise).hrtMeasurement.milliSeconds > 1000).toBeTrue(); } ); const test4 = tap.test('my 4th test -> should fail', async (tools) => { tools.allowFailure(); - expect(false).to.be.false; + expect(false).toBeFalse(); return 'hello'; }); diff --git a/ts/index.ts b/ts/index.ts index 48335a3..a25e18f 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,4 +1,10 @@ -export { expect } from 'smartchai'; export { tap } from './tapbundle.classes.tap'; export { TapWrap } from './tapbundle.classes.tapwrap'; -export { webhelpers } from './webhelpers'; \ No newline at end of file +export { webhelpers } from './webhelpers'; + +import { expect, expectAsync } from '@pushrocks/smartexpect'; + +export { + expect, + expectAsync +} \ No newline at end of file diff --git a/ts/tapbundle.plugins.ts b/ts/tapbundle.plugins.ts index 7ff1485..f2f6c58 100644 --- a/ts/tapbundle.plugins.ts +++ b/ts/tapbundle.plugins.ts @@ -1,6 +1,7 @@ // pushrocks import * as smartdelay from '@pushrocks/smartdelay'; import * as smartenv from '@pushrocks/smartenv'; +import * as smartexpect from '@pushrocks/smartexpect'; import * as smartpromise from '@pushrocks/smartpromise'; -export { smartdelay, smartenv, smartpromise }; +export { smartdelay, smartenv, smartexpect, smartpromise };