Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Vitest because it supports ESM #2066

Merged
merged 3 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- run: pnpm install
- run: pnpm build
- run: pnpm lint
- run: pnpm test:coverage --runInBand
- run: pnpm test:coverage
- run: pnpm test:ember

compatibility:
Expand Down
1 change: 0 additions & 1 deletion packages/qunit-dom/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module.exports = {
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:jest/recommended',
'plugin:prettier/recommended',
],
env: {
Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/does-not-exist.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/does-not-have-class.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/does-not-have-style.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/does-not-have-tagname.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/does-not-include-text.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/exists.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-any-text.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-any-value.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-aria.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-attribute.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-class.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-no-text.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-no-value.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-property.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-style.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-tagname.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-text-regex.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-text.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/has-value.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
4 changes: 2 additions & 2 deletions packages/qunit-dom/lib/__tests__/includes-text.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect, vi } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down Expand Up @@ -142,7 +142,7 @@ describe('assert.dom(...).includesText()', () => {
});

test('explains failures to the user via `console.warn` if expected text contains collapsable whitespace', () => {
const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});

assert.dom(element).includesText('foo\n bar');

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-checked.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-disabled.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-focused.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-not-checked.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-not-disabled.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-not-focused.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-not-required.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-not-valid.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';
import TestAssertions from '../helpers/test-assertions';

describe('assert.dom(...).isNotValid()', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-not-visible.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-required.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-valid.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';
import TestAssertions from '../helpers/test-assertions';

describe('assert.dom(...).isValid()', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/is-visible.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/__tests__/matches-selector.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import TestAssertions from '../helpers/test-assertions';

Expand Down
2 changes: 2 additions & 0 deletions packages/qunit-dom/lib/helpers/__tests__/node-list.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe, test, expect } from 'vitest';

import * as NodeList from '../node-list';

describe('NodeList helpers', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/helpers/collapse-whitespace.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import collapseWhitespace from './collapse-whitespace';

Expand Down
2 changes: 1 addition & 1 deletion packages/qunit-dom/lib/helpers/element-to-string.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env jest */
import { describe, beforeEach, test, expect } from 'vitest';

import elToString from './element-to-string';

Expand Down
19 changes: 4 additions & 15 deletions packages/qunit-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,32 +40,21 @@
"lint::js:fix": "eslint . --fix",
"prepublish": "rollup -c",
"release": "release-it",
"test": "jest",
"test:coverage": "jest --coverage",
"test:watch": "jest --watchAll --notify"
},
"jest": {
"testEnvironment": "jsdom",
"preset": "ts-jest",
"testPathIgnorePatterns": [
"/node_modules/",
"/dist/"
]
"test": "vitest",
"test:coverage": "vitest --coverage"
},
"devDependencies": {
"@arethetypeswrong/cli": "0.11.0",
"@types/jest": "27.5.2",
"@types/qunit": "2.19.6",
"@typescript-eslint/eslint-plugin": "6.7.4",
"@typescript-eslint/parser": "6.7.4",
"@vitest/coverage-v8": "^0.34.6",
"babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
"babel-preset-env": "1.7.0",
"concurrently": "8.2.1",
"eslint": "8.50.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-jest": "27.4.2",
"eslint-plugin-prettier": "5.0.0",
"jest": "27.5.1",
"lerna-changelog": "2.2.0",
"loader.js": "4.7.0",
"prettier": "3.0.3",
Expand All @@ -76,8 +65,8 @@
"rollup": "2.79.1",
"rollup-plugin-copy": "3.5.0",
"rollup-plugin-typescript2": "0.34.1",
"ts-jest": "27.1.5",
"typescript": "5.2.2",
"vitest": "^0.34.6",
"webpack": "5.88.2"
},
"packageManager": "[email protected]",
Expand Down
8 changes: 8 additions & 0 deletions packages/qunit-dom/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { defineConfig } from 'vitest/config';

export default defineConfig({
test: {
environment: 'jsdom',
include: ['**/*.test.ts', '**/__tests__/**/*.ts'],
},
});
Loading