Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 58ad3ca

Browse files
authored
fix(test): All tests are working with vitest [DXJ-306] (#291)
1 parent 9345040 commit 58ad3ca

22 files changed

+593
-1015
lines changed

packages/core/js-peer/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ node_modules/
1919
jspm_packages/
2020

2121
.idea
22+
23+
# workaround to make integration tests work
24+
src/marine/worker-script/index.js

packages/core/js-peer/src/js-peer/__test__/data/sigService.aqua renamed to packages/core/js-peer/aqua_test/sigService.aqua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Export
22

3-
import SignResult, Sig from "../../../aqua/services.aqua"
3+
import SignResult, Sig from "../aqua/services.aqua"
44
export Sig, DataProvider, callSig
55

66
service DataProvider("data"):

packages/core/js-peer/src/js-peer/__test__/data/srv.aqua renamed to packages/core/js-peer/aqua_test/srv.aqua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Export
22

3-
import Srv from "../../../aqua/single-module-srv.aqua"
4-
import NodeUtils from "../../../aqua/node-utils.aqua"
3+
import Srv from "../aqua/single-module-srv.aqua"
4+
import NodeUtils from "../aqua/node-utils.aqua"
55
export happy_path, list_services, file_not_found, service_removed, removing_non_exiting
66

77
service Greeting("greeting"):
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { copyFileSync } from 'fs';
2+
3+
copyFileSync('./dist/marine/worker-script/index.js', './src/marine/worker-script/index.js');

packages/core/js-peer/jest.config.cjs

Lines changed: 0 additions & 17 deletions
This file was deleted.

packages/core/js-peer/package.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@
1111
"type": "module",
1212
"scripts": {
1313
"build": "tsc",
14-
"compile-aqua": "aqua -i ./aqua/ -o ./src/internal/_aqua",
15-
"test:smoke": "node ./dist/js-peer/__test__/integration/smokeTest.js",
16-
"test": "NODE_OPTIONS=--experimental-vm-modules pnpm jest",
17-
"test:unit": "NODE_OPTIONS=--experimental-vm-modules pnpm jest --testPathPattern=src/__test__/unit",
18-
"test:integration": "NODE_OPTIONS=--experimental-vm-modules pnpm jest --testPathPattern=src/__test__/integration"
14+
"compile-aqua": "fluence aqua -i ./aqua/ -o ./aqua",
15+
"test": "node ./copy-worker-script-workaround.mjs && vitest run"
1916
},
2017
"repository": "https://github.com/fluencelabs/fluence-js",
2118
"author": "Fluence Labs",
@@ -52,15 +49,13 @@
5249
"@multiformats/multiaddr": "11.3.0"
5350
},
5451
"devDependencies": {
55-
"@fluencelabs/aqua": "0.7.7-362",
56-
"@fluencelabs/aqua-api": "0.9.1-373",
52+
"@fluencelabs/cli": "0.3.9",
53+
"@fluencelabs/aqua-api": "0.9.3",
5754
"@fluencelabs/aqua-lib": "0.6.0",
5855
"@fluencelabs/fluence-network-environment": "1.0.13",
5956
"@types/bs58": "4.0.1",
6057
"@types/uuid": "8.3.2",
61-
"@types/jest": "29.4.0",
6258
"@types/debug": "4.1.7",
63-
"jest": "29.4.1",
64-
"ts-jest": "next"
59+
"vitest": "0.29.7"
6560
}
6661
}

packages/core/js-peer/src/compilerSupport/__test__/v3.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { it, describe, expect, test } from 'vitest';
12
import { aqua2ts, ts2aqua } from '../conversions.js';
23

34
const i32 = { tag: 'scalar', name: 'i32' } as const;

packages/core/js-peer/src/js-peer/__test__/integration/avm.spec.ts.skip renamed to packages/core/js-peer/src/js-peer/__test__/integration/avm.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { it, describe, expect } from 'vitest';
2+
13
import { handleTimeout } from '../../utils.js';
24
import { registerHandlersHelper, withPeer } from '../util.js';
35

packages/core/js-peer/src/js-peer/__test__/integration/jsonBuiltin.spec.ts.skip renamed to packages/core/js-peer/src/js-peer/__test__/integration/jsonBuiltin.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { it, describe, expect, beforeEach, afterEach } from 'vitest';
2+
13
import { Particle } from '../../Particle.js';
24
import { doNothing } from '../../utils.js';
35
import { FluencePeer } from '../../FluencePeer.js';

0 commit comments

Comments
 (0)