From 51b3c1bd8e5ce3d11050de6607d06c7a2021ea02 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Fri, 2 Jul 2021 02:21:33 -0400 Subject: [PATCH 1/6] chore: upgrade to Jest 27 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7db4611..5cdde38 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "graphql-tag": "^2.11.0", "isomorphic-unfetch": "^3.0.0", "jest-serializer-vue": "^2.0.2", - "kcd-scripts": "^10.1.1", + "kcd-scripts": "^11.1.0", "lodash.merge": "^4.6.2", "msw": "^0.26.2", "portal-vue": "^2.1.7", From d9808406a558fe5486b8076ac47066705dec5f88 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Sep 2021 22:39:33 -0400 Subject: [PATCH 2/6] chore: replace vue-jest with vue2-jest for Jest 27 --- jest.config.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jest.config.js b/jest.config.js index b50b81a..7e65300 100644 --- a/jest.config.js +++ b/jest.config.js @@ -11,7 +11,7 @@ module.exports = merge(config, { collectCoverageFrom: ['**/src/**/*.js', '!**/src/__tests__/**'], transform: { '^.+\\.js$': '/node_modules/babel-jest', - '.*\\.(vue)$': '/node_modules/vue-jest', + '.*\\.(vue)$': '/node_modules/@vue/vue2-jest', }, snapshotSerializers: ['/node_modules/jest-serializer-vue'], testPathIgnorePatterns: [ diff --git a/package.json b/package.json index 5cdde38..9212572 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "@testing-library/jest-dom": "^5.11.6", "@testing-library/user-event": "^12.1.10", "@types/estree": "0.0.46", + "@vue/vue2-jest": "^27.0.0-alpha.2", "apollo-boost": "^0.4.9", "apollo-cache-inmemory": "^1.6.6", "axios": "^0.21.1", @@ -71,7 +72,6 @@ "vue": "^2.6.12", "vue-apollo": "^3.0.4", "vue-i18n": "^8.21.1", - "vue-jest": "^4.0.0-rc.0", "vue-router": "^3.4.9", "vue-template-compiler": "^2.6.12", "vuetify": "^2.3.17", From 4b5c4b912c50106cf92d61beecd46dcaa928548a Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Sep 2021 22:57:27 -0400 Subject: [PATCH 3/6] chore: fix lint error --- src/__tests__/disappearance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/__tests__/disappearance.js b/src/__tests__/disappearance.js index 040848f..46bf2fd 100644 --- a/src/__tests__/disappearance.js +++ b/src/__tests__/disappearance.js @@ -11,7 +11,7 @@ test('waits for the data to be loaded', async () => { // Following line reads as follows: // "Wait until element with text 'Loading...' is gone." - await waitForElementToBeRemoved(getByText('Loading...')) + await waitForElementToBeRemoved(queryByText('Loading...')) // It is equivalent to: // // await waitFor(() => { From 507bbcc63158c686614776bd9064981696eec490 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Sep 2021 23:23:18 -0400 Subject: [PATCH 4/6] chore: upgrade msw for bug fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9212572..69ad1bc 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "jest-serializer-vue": "^2.0.2", "kcd-scripts": "^11.1.0", "lodash.merge": "^4.6.2", - "msw": "^0.26.2", + "msw": "^0.35.0", "portal-vue": "^2.1.7", "typescript": "^4.0.5", "vee-validate": "^2.2.15", From cc724658a530ec9d319735776404aa7b36372189 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Sep 2021 23:34:50 -0400 Subject: [PATCH 5/6] chore: update expected test error --- src/__tests__/about-vue-router-mocha.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/__tests__/about-vue-router-mocha.js b/src/__tests__/about-vue-router-mocha.js index 6cb0fa4..39047e3 100644 --- a/src/__tests__/about-vue-router-mocha.js +++ b/src/__tests__/about-vue-router-mocha.js @@ -11,6 +11,6 @@ test('uses require("vue-router").default when require("vue-router") is undefined }) expect(() => render(About, {routes})).toThrowError( - new TypeError("Cannot read property 'default' of undefined"), + new TypeError("Cannot read properties of undefined (reading 'default')"), ) }) From c8b5c901204e8ea54e012036b5c5e4f846e3e532 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Sep 2021 23:55:24 -0400 Subject: [PATCH 6/6] chore: check for type errors based on Node version --- package.json | 1 + src/__tests__/about-vue-router-mocha.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 69ad1bc..d085611 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "lodash.merge": "^4.6.2", "msw": "^0.35.0", "portal-vue": "^2.1.7", + "semver": "^7.3.5", "typescript": "^4.0.5", "vee-validate": "^2.2.15", "vue": "^2.6.12", diff --git a/src/__tests__/about-vue-router-mocha.js b/src/__tests__/about-vue-router-mocha.js index 39047e3..1ed2673 100644 --- a/src/__tests__/about-vue-router-mocha.js +++ b/src/__tests__/about-vue-router-mocha.js @@ -1,5 +1,6 @@ import '@testing-library/jest-dom' import {render} from '@testing-library/vue' +import semver from 'semver' import About from './components/Router/About.vue' @@ -11,6 +12,10 @@ test('uses require("vue-router").default when require("vue-router") is undefined }) expect(() => render(About, {routes})).toThrowError( - new TypeError("Cannot read properties of undefined (reading 'default')"), + new TypeError( + semver.gte(process.version, '16.0.0') + ? "Cannot read properties of undefined (reading 'default')" + : "Cannot read property 'default' of undefined", + ), ) })