Skip to content

Commit 12e5c3b

Browse files
committed
Remove WDIO
1 parent 5738796 commit 12e5c3b

File tree

16 files changed

+255
-3568
lines changed

16 files changed

+255
-3568
lines changed

package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
"@types/lodash": "^4",
9393
"@types/node": "18.14.2",
9494
"@yarnpkg/types": "^4.0.0",
95-
"chromedriver": "^134.0.5",
9695
"depcheck": "^1.4.7",
9796
"eslint": "^9.11.0",
9897
"eslint-config-prettier": "^9.1.0",
@@ -105,13 +104,12 @@
105104
"eslint-plugin-promise": "^7.1.0",
106105
"execa": "^5.1.1",
107106
"favicons": "^7.1.2",
108-
"geckodriver": "^4.2.0",
109107
"jest": "^29.0.2",
110108
"jest-silent-reporter": "^0.6.0",
111109
"lint-staged": "^12.4.1",
112110
"lodash": "^4.17.21",
113111
"minimatch": "^7.4.1",
114-
"playwright": "^1.51.0",
112+
"playwright": "^1.51.1",
115113
"prettier": "^3.3.3",
116114
"prettier-2": "npm:prettier@^2.8.8",
117115
"prettier-plugin-packagejson": "^2.5.8",
@@ -133,9 +131,7 @@
133131
"@lavamoat/preinstall-always-fail": false,
134132
"simple-git-hooks": false,
135133
"$root$": false,
136-
"chromedriver": true,
137134
"jest>jest-cli>jest-config>ts-node>@swc/core": false,
138-
"geckodriver": true,
139135
"ts-node>@swc/core": true,
140136
"@swc/core": true,
141137
"favicons>sharp": true,
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"branches": 93.34,
3-
"functions": 97.37,
4-
"lines": 98.33,
5-
"statements": 98.06
2+
"branches": 93.17,
3+
"functions": 96.06,
4+
"lines": 97.65,
5+
"statements": 97.35
66
}

packages/snaps-controllers/package.json

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
"publish:preview": "yarn npm publish --tag preview",
7272
"since-latest-release": "../../scripts/since-latest-release.sh",
7373
"test": "jest --reporters=jest-silent-reporter && yarn test:browser",
74-
"test:browser": "wdio run wdio.config.js",
74+
"test:browser": "vitest",
7575
"test:clean": "jest --clearCache",
76-
"test:post": "ts-node scripts/coverage.ts && rimraf coverage/jest coverage/wdio",
76+
"test:post": "ts-node scripts/coverage.ts && rimraf coverage/jest coverage/vite",
7777
"test:pre": "yarn mkdirp test/fixtures && ./scripts/generate-fixtures.sh",
7878
"test:verbose": "jest --verbose",
7979
"test:watch": "jest --watch"
@@ -109,8 +109,6 @@
109109
"tar-stream": "^3.1.7"
110110
},
111111
"devDependencies": {
112-
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
113-
"@esbuild-plugins/node-modules-polyfill": "^0.2.2",
114112
"@lavamoat/allow-scripts": "^3.0.4",
115113
"@metamask/auto-changelog": "^4.1.0",
116114
"@metamask/browser-passworder": "^6.0.0",
@@ -124,22 +122,14 @@
124122
"@types/gunzip-maybe": "^1.4.0",
125123
"@types/jest": "^27.5.1",
126124
"@types/luxon": "^3",
127-
"@types/mocha": "^10.0.1",
128125
"@types/node": "18.14.2",
129126
"@types/readable-stream": "^4.0.15",
130127
"@types/semver": "^7.5.0",
131128
"@types/tar-stream": "^3.1.1",
132129
"@vitest/browser": "^3.0.8",
133-
"@wdio/browser-runner": "^8.19.0",
134-
"@wdio/cli": "^8.19.0",
135-
"@wdio/globals": "^8.19.0",
136-
"@wdio/mocha-framework": "^8.19.0",
137-
"@wdio/spec-reporter": "^8.19.0",
138-
"@wdio/static-server-service": "^8.19.0",
139130
"deepmerge": "^4.2.2",
140131
"depcheck": "^1.4.7",
141132
"eslint": "^9.11.0",
142-
"expect-webdriverio": "^4.4.1",
143133
"istanbul-lib-coverage": "^3.2.0",
144134
"istanbul-lib-report": "^3.0.0",
145135
"istanbul-reports": "^3.1.5",
@@ -154,10 +144,7 @@
154144
"vite": "^6.2.3",
155145
"vite-plugin-node-polyfills": "^0.23.0",
156146
"vite-tsconfig-paths": "^4.0.5",
157-
"vitest": "^3.0.8",
158-
"wdio-chromedriver-service": "^8.1.1",
159-
"wdio-geckodriver-service": "^5.0.2",
160-
"webdriverio": "^8.19.0"
147+
"vitest": "^3.0.8"
161148
},
162149
"peerDependencies": {
163150
"@metamask/snaps-execution-environments": "workspace:^"

packages/snaps-controllers/src/services/iframe/IframeExecutionService.test.browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ describe('IframeExecutionService', () => {
137137
publishSpy.reset();
138138
});
139139

140-
it.only('properly sandboxes the iframe', async () => {
140+
it('properly sandboxes the iframe', async () => {
141141
const { service } = createService(IframeExecutionService, {
142142
iframeUrl: new URL(IFRAME_URL),
143143
});

packages/snaps-controllers/src/services/iframe/test/index.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,30 @@
1111
<script>
1212
(function () {
1313
try {
14+
// Parent is the iframe created by Vitest containing the Snap iframe
15+
// and this page as a sibling iframe. We try to access the Snap iframe
16+
// from the parent iframe.
1417
const snap = parent.document.querySelector('iframe[data-testid="snaps-iframe"]');
1518
if (!snap) {
16-
window.parent.postMessage('Failed to find snap iframe.', '*');
19+
window.parent.postMessage('Failed to find Snap iframe.', '*');
1720
return;
1821
}
1922

2023
// We try to access the snap iframe document. If this works, it means
2124
// that the iframe is not sandboxed. Otherwise it will throw an error.
22-
if (snap.document === null || snap.document === undefined) {
25+
if (snap.contentDocument === null) {
2326
window.parent.postMessage('Failed to access document of the snap iframe.', '*');
27+
return;
2428
}
2529
} catch (e) {
2630
window.parent.postMessage(
2731
`An unknown error occurred: ${e.toString()}`,
2832
'*',
2933
);
3034
}
35+
36+
// Fall through case, which should not happen.
37+
window.parent.postMessage('Unexpected success.', '*');
3138
})();
3239
</script>
3340
</body>

packages/snaps-controllers/src/services/webworker/WebWorkerExecutionService.test.browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ describe('WebWorkerExecutionService', () => {
124124
});
125125

126126
it('can detect outbound requests', async () => {
127-
expect.assertions(4);
127+
expect.assertions(5);
128128

129129
const { service, messenger } = createService(WebWorkerExecutionService, {
130130
documentUrl: new URL(WORKER_POOL_URL),

packages/snaps-controllers/src/test-utils/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export * from './confirmations';
2+
export * from './constants';
23
export * from './controller';
3-
// export * from './execution-environment';
4+
export * from './execution-environment';
45
export * from './service';
56
export * from './sleep';
67
export * from './location';

packages/snaps-controllers/vitest.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ export default defineConfig({
7474

7575
browser: {
7676
enabled: true,
77+
headless: true,
7778
provider: 'playwright',
7879
instances: [{ browser: 'chromium' }],
79-
isolate: false,
8080
},
8181

8282
coverage: {

packages/snaps-controllers/wdio.config.js

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

packages/snaps-execution-environments/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"test": "jest --reporters=jest-silent-reporter && yarn test:browser",
6060
"test:browser": "vitest",
6161
"test:clean": "jest --clearCache",
62-
"test:post": "ts-node scripts/coverage.ts && rimraf coverage/jest coverage/wdio",
62+
"test:post": "ts-node scripts/coverage.ts && rimraf coverage/jest coverage/vite",
6363
"test:verbose": "jest --verbose",
6464
"test:watch": "jest --watch"
6565
},
@@ -109,7 +109,6 @@
109109
"jest-silent-reporter": "^0.6.0",
110110
"lavamoat": "^8.0.4",
111111
"lavamoat-browserify": "^17.0.5",
112-
"playwright": "^1.51.0",
113112
"prettier": "^3.3.3",
114113
"rimraf": "^4.1.2",
115114
"serve-handler": "^6.1.5",

0 commit comments

Comments
 (0)