From 6044e37f73cd67b6ff238f13485e3a1c87663c52 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Thu, 1 Jul 2021 12:58:40 -0400 Subject: [PATCH 1/4] chore: upgrade to Jest 27 --- package.json | 3 ++- src/__tests__/multi-base.test.js | 40 +++++++++++++++++++------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index e831adf..71173c3 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "eslint-plugin-simple-import-sort": "^7.0.0", "eslint-plugin-svelte3": "^3.0.0", "husky": "^4.0.9", - "jest": "^26.0.1", + "jest": "^27.0.6", "lint-staged": "^10.0.0", "npm-run-all": "^4.1.5", "prettier": "^2.0.1", @@ -118,6 +118,7 @@ "setupFilesAfterEnv": [ "@testing-library/jest-dom/extend-expect" ], + "testEnvironment": "jsdom", "transform": { "^.+\\.js$": "babel-jest", "^.+\\.svelte$": "svelte-jester", diff --git a/src/__tests__/multi-base.test.js b/src/__tests__/multi-base.test.js index ec9307c..c270433 100644 --- a/src/__tests__/multi-base.test.js +++ b/src/__tests__/multi-base.test.js @@ -13,28 +13,36 @@ describe('multi-base', () => { }) afterAll(() => { - treeA.parentNode.removeChild(treeA) - treeB.parentNode.removeChild(treeB) + treeA = document.createElement('div') + treeB = document.createElement('div') }) test('container isolates trees from one another', () => { - const { getByText: getByTextInA } = render(Comp, { - target: treeA, - props: { - name: 'Tree A' + const { getByText: getByTextInA } = render( + Comp, + { + target: treeA, + props: { + name: 'Tree A' + } + }, + { + container: treeA } - }, { - container: treeA - }) + ) - const { getByText: getByTextInB } = render(Comp, { - target: treeB, - props: { - name: 'Tree B' + const { getByText: getByTextInB } = render( + Comp, + { + target: treeB, + props: { + name: 'Tree B' + } + }, + { + container: treeB } - }, { - container: treeB - }) + ) expect(() => getByTextInA('Hello Tree A!')).not.toThrow() expect(() => getByTextInB('Hello Tree A!')).toThrow() From 38b3031694ccb07777f7e41e6e0213752b6508c6 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 4 Aug 2021 06:08:21 -0700 Subject: [PATCH 2/4] chore(dev-deps): upgrade to svelte-jester 2.0 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e831adf..b232942 100644 --- a/package.json +++ b/package.json @@ -61,10 +61,10 @@ "@commitlint/cli": "^11.0.0", "@commitlint/config-conventional": "^11.0.0", "@testing-library/jest-dom": "^5.0.2", - "@types/jest": "^26.0.0", + "@types/jest": "^27.0.0", "all-contributors-cli": "^6.9.0", "babel-eslint": "^10.0.3", - "babel-jest": "^26.0.1", + "babel-jest": "^27.0.0", "doctoc": "^2.0.0", "eslint": "^7.2.0", "eslint-config-standard": "^16.0.0", @@ -74,12 +74,12 @@ "eslint-plugin-simple-import-sort": "^7.0.0", "eslint-plugin-svelte3": "^3.0.0", "husky": "^4.0.9", - "jest": "^26.0.1", + "jest": "^27.0.0", "lint-staged": "^10.0.0", "npm-run-all": "^4.1.5", "prettier": "^2.0.1", "svelte": "^3.0.0", - "svelte-jester": "^1.0.3" + "svelte-jester": "^2.0.1" }, "husky": { "hooks": { From 0ca4f0576a487743103cece7d362efe540c27b2a Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Mon, 20 Sep 2021 00:16:32 -0400 Subject: [PATCH 3/4] chore: simplify multi-base test setup --- src/__tests__/multi-base.test.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/__tests__/multi-base.test.js b/src/__tests__/multi-base.test.js index 4031275..a928fe4 100644 --- a/src/__tests__/multi-base.test.js +++ b/src/__tests__/multi-base.test.js @@ -2,20 +2,8 @@ import { render } from '..' import Comp from './fixtures/Comp' describe('multi-base', () => { - let treeA - let treeB - - beforeAll(() => { - treeA = document.createElement('div') - treeB = document.createElement('div') - document.body.appendChild(treeA) - document.body.appendChild(treeB) - }) - - afterAll(() => { - treeA = document.createElement('div') - treeB = document.createElement('div') - }) + const treeA = document.createElement('div') + const treeB = document.createElement('div') test('container isolates trees from one another', () => { const { getByText: getByTextInA } = render(Comp, { From 52b269d99c7a1ea4e9e4773e16bd509f12a4b81e Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Mon, 20 Sep 2021 20:56:10 -0700 Subject: [PATCH 4/4] Set svelte-jester version to 2.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe2ff71..238a1d5 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "npm-run-all": "^4.1.5", "prettier": "^2.0.1", "svelte": "^3.0.0", - "svelte-jester": "^2.0.1" + "svelte-jester": "^2.1.4" }, "husky": { "hooks": {