Skip to content
Open
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/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: yarn

- name: Run tests
run: yarn test -- -- --coverage --coverageProvider=v8
run: yarn test -- -- --coverage --coverage.provider=v8

- name: Run linter
run: yarn lint
Expand Down
6 changes: 0 additions & 6 deletions examples/testing-suite/jest.config.js

This file was deleted.

8 changes: 0 additions & 8 deletions examples/testing-suite/jest.setup.js

This file was deleted.

16 changes: 6 additions & 10 deletions examples/testing-suite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@
},
"scripts": {
"build": "yarn clean && yarn compile",
"build:test": "yarn clean:test && yarn compile:test",
"clean": "rm -rf ./dist",
"clean:test": "rm -rf ./dist-test",
"compile": "tsc -p tsconfig.json && tsx tasks/index.ts compile",
"compile:test": "tsc -p tsconfig.test.json && tsx tasks/index.ts compile",
"compile": "tsc -p tsconfig.json && yarn run task:compile",
"lint": "eslint . --ext .ts --ignore-path ../../.eslintignore",
"prepare": "yarn build",
"prepublishOnly": "yarn test && yarn lint",
"pretest": "yarn build:test",
"test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
"task:compile": "tsx tasks/index.ts compile",
"pretest": "yarn run task:compile",
"test": "vitest run"
},
"dependencies": {
"@bitauth/libauth": "^3.1.0-next.2",
Expand All @@ -31,10 +29,8 @@
"url-join": "^5.0.0"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@types/jest": "^29.5.14",
"jest": "^29.7.0",
"tsx": "^4.20.3",
"typescript": "^5.9.2"
"typescript": "^5.9.2",
"vitest": "^3.2.4"
}
}
1 change: 0 additions & 1 deletion examples/testing-suite/test/example.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import artifact from '../artifacts/example.artifact.js';
import { Contract, MockNetworkProvider, TransactionBuilder, randomUtxo } from 'cashscript';
import 'cashscript/jest';

describe('test example contract functions', () => {
it('should check for output logs and error messages', async () => {
Expand Down
2 changes: 1 addition & 1 deletion examples/testing-suite/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"module": "esnext",
"declaration": true,
"lib": ["es2021", "dom"],
"types": ["node", "jest"],
"types": ["node", "vitest/globals"],
"sourceMap": true,
"strict": true,
"strictPropertyInitialization": false,
Expand Down
12 changes: 0 additions & 12 deletions examples/testing-suite/tsconfig.test.json

This file was deleted.

16 changes: 16 additions & 0 deletions examples/testing-suite/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { defineConfig } from 'vitest/config';

export default defineConfig({
root: './test',
test: {
environment: 'node',
globals: true,
testTimeout: 50000,
reporters: ['verbose'],
setupFiles: ['./vitest.setup.ts'],
coverage: {
provider: 'v8',
reporter: ['json-summary'],
},
},
});
1 change: 1 addition & 0 deletions examples/testing-suite/vitest.setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'cashscript/vitest.setup.js';
10 changes: 0 additions & 10 deletions packages/cashc/jest.config.js

This file was deleted.

12 changes: 3 additions & 9 deletions packages/cashc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,12 @@
"antlr": "antlr -Dlanguage=TypeScript -visitor -no-listener src/grammar/CashScript.g4",
"postantlr": "find src/grammar -type f -name 'CashScriptVisitor.ts' | xargs sed -i '' 's|\\(import .* \".*/.*\\)\";|\\1\\.js\";|g'",
"build": "yarn clean && yarn compile",
"build:test": "yarn clean:test && yarn compile:test && cpy './test/**/*.cash' ./dist-test/test",
"clean": "rm -rf ./dist",
"clean:test": "rm -rf ./dist-test",
"compile": "tsc -p tsconfig.build.json",
"compile:test": "tsc -p tsconfig.test.json",
"lint": "eslint . --ext .ts --ignore-path ../../.eslintignore",
"prepare": "yarn build",
"prepublishOnly": "yarn test && yarn lint",
"pretest": "yarn build:test",
"test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
"test": "vitest run"
},
"dependencies": {
"@bitauth/libauth": "^3.1.0-next.2",
Expand All @@ -58,17 +54,15 @@
"semver": "^7.7.2"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@types/jest": "^29.5.14",
"@types/node": "^22.17.0",
"@types/semver": "^7.7.0",
"cpy-cli": "^5.0.0",
"eslint": "^8.54.0",
"eslint-plugin-import": "^2.31.0",
"jest": "^29.7.0",
"tsx": "^4.20.3",
"typescript": "^5.9.2",
"url-join": "^5.0.0"
"url-join": "^5.0.0",
"vitest": "^3.2.4"
},
"gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"
}
1 change: 1 addition & 0 deletions packages/cashc/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

"compilerOptions": {
"outDir": "./dist",
"types": ["vitest/globals"]
},

"include": [
Expand Down
12 changes: 0 additions & 12 deletions packages/cashc/tsconfig.test.json

This file was deleted.

18 changes: 18 additions & 0 deletions packages/cashc/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { defineConfig } from 'vitest/config';

export default defineConfig({
root: './test',
test: {
environment: 'node',
globals: true,
silent: 'passed-only',
include: ['**/*.{test,spec}.?(c|m)[jt]s?(x)'],
setupFiles: ['./vitest.setup.ts'],
exclude: ['**/types/**'],
reporters: ['verbose'],
coverage: {
provider: 'v8',
reporter: ['json-summary'],
},
},
});
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/cashscript/.npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*
!dist/**
!jest/package.json
!vitest/package.json
*.map
11 changes: 0 additions & 11 deletions packages/cashscript/jest.config.js

This file was deleted.

8 changes: 0 additions & 8 deletions packages/cashscript/jest.setup.js

This file was deleted.

5 changes: 0 additions & 5 deletions packages/cashscript/jest/package.json

This file was deleted.

11 changes: 3 additions & 8 deletions packages/cashscript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,12 @@
},
"scripts": {
"build": "yarn clean && yarn compile",
"build:test": "yarn clean:test && yarn compile:test",
"clean": "rm -rf ./dist",
"clean:test": "rm -rf ./dist-test",
"compile": "tsc -p tsconfig.build.json",
"compile:test": "tsc -p tsconfig.test.json",
"lint": "eslint . --ext .ts --ignore-path ../../.eslintignore",
"prepare": "yarn build",
"prepublishOnly": "yarn test && yarn lint",
"pretest": "yarn build:test",
"test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
"test": "vitest run"
},
"dependencies": {
"@bitauth/libauth": "^3.1.0-next.2",
Expand All @@ -54,13 +50,12 @@
"semver": "^7.7.2"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@psf/bch-js": "^6.8.0",
"@types/pako": "^2.0.3",
"@types/semver": "^7.5.8",
"eslint": "^8.54.0",
"jest": "^29.7.0",
"typescript": "^5.9.2"
"typescript": "^5.9.2",
"vitest": "^3.2.4"
},
"gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"
}
134 changes: 0 additions & 134 deletions packages/cashscript/src/test/JestExtensions.ts

This file was deleted.

Loading