Skip to content

Commit a5b8c40

Browse files
rhyslbwrhyslbw
authored
Merge pull request #1727 from input-output-hk/chore/wdio-9
chore(deps): WebdriverIO v9 + dependency upgrades to drop resolutions (33 → 5)
2 parents c1839ab + 6861919 commit a5b8c40

11 files changed

Lines changed: 2189 additions & 1341 deletions

File tree

‎.yarn/constraints.pro‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
1-
gen_enforced_dependency ForbidMaliciousReleases:
2-
backslash "!=0.2.1"
3-
chalk-template "!=1.1.1"
4-
supports-hyperlinks "!=4.1.1"
5-
has-ansi "!=6.0.1"
6-
simple-swizzle "!=0.2.3"
7-
color-string "!=2.1.1"
8-
error-ex "!=1.3.3"
9-
color-name "!=2.0.1"
10-
is-arrayish "!=0.3.3"
11-
slice-ansi "!=7.1.1"
12-
color-convert "!=3.1.1"
13-
wrap-ansi "!=9.0.1"
14-
ansi-regex "!=6.2.1"
15-
supports-color "!=10.2.1"
16-
strip-ansi "!=7.1.1"
17-
chalk "!=5.6.1"
18-
debug "!=4.4.2"
19-
ansi-styles "!=6.2.2"
1+
% Yarn constraints for supply-chain enforcement (`yarn constraints`).
2+
%
3+
% The Sept-2025 qix-hack malicious-version blocklist that previously lived
4+
% here has been removed: those releases are unpublished from npm (404) and
5+
% the affected packages now resolve to clean current versions, so the
6+
% blocklist no longer matches anything.
7+
%
8+
% Add `gen_enforced_dependency` rules below to block future malicious
9+
% releases or pin known-good versions, e.g.:
10+
%
11+
% gen_enforced_dependency ForbidMaliciousReleases:
12+
% some-package "!=1.2.3"

‎package.json‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -97,38 +97,10 @@
9797
},
9898
"packageManager": "yarn@3.2.1",
9999
"resolutions": {
100-
"color": "4.2.3",
101-
"color-string": "1.9.1",
102-
"color-convert": "2.0.1",
103-
"color-name": "1.1.4",
104-
"chalk": "4.1.2",
105-
"chalk-template": "1.1.0",
106-
"wrap-ansi": "7.0.0",
107-
"slice-ansi": "7.1.0",
108-
"strip-ansi": "6.0.1",
109-
"ansi-styles": "4.3.0",
110-
"ansi-regex": "5.0.1",
111-
"supports-color": "7.2.0",
112-
"supports-hyperlinks": "3.0.0",
113-
"debug": "4.3.4",
114-
"is-arrayish": "0.3.2",
115-
"simple-swizzle": "0.2.2",
116-
"error-ex": "1.3.2",
117-
"has-ansi": "5.0.1",
118-
"backslash": "0.2.0",
119-
"protobufjs": "7.6.4",
120100
"@opentelemetry/core": "^2.8.0",
121-
"cross-spawn": "^7.0.6",
122-
"diff": "^5.2.2",
123101
"js-yaml": "^4.2.0",
124-
"nanoid": "^3.3.8",
125-
"serialize-javascript": "^7.0.5",
126102
"tar": "^7.5.16",
127-
"tar-fs": "^2.1.4",
128103
"tmp": "^0.2.6",
129-
"uuid": "^11.1.1",
130-
"ws": "^8.21.0",
131-
"minimatch@~3.0.2": "3.1.5",
132-
"minimatch@5.0.1": "5.1.9"
104+
"uuid": "^11.1.1"
133105
}
134106
}

‎packages/cardano-services/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"axios-mock-adapter": "^2.0.0",
7575
"cbor": "^8.1.0",
7676
"delay": "^5.0.0",
77-
"dockerode": "^3.3.1",
77+
"dockerode": "^4.0.7",
7878
"dockerode-utils": "^0.0.7",
7979
"eslint": "^7.32.0",
8080
"get-port-please": "^2.5.0",

‎packages/e2e/package.json‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,25 +136,24 @@
136136
"@types/lodash": "^4.14.182",
137137
"@types/ora": "^3.2.0",
138138
"@types/webextension-polyfill": "^0.8.0",
139-
"@wdio/cli": "^7.19.5",
140-
"@wdio/local-runner": "^7.19.5",
141-
"@wdio/mocha-framework": "^7.19.5",
142-
"@wdio/spec-reporter": "^7.19.5",
143-
"@wdio/static-server-service": "^7.19.5",
139+
"@wdio/cli": "^9.29.0",
140+
"@wdio/local-runner": "^9.29.0",
141+
"@wdio/mocha-framework": "^9.29.0",
142+
"@wdio/spec-reporter": "^9.29.0",
143+
"@wdio/static-server-service": "^9.29.0",
144144
"artillery": "^2.0.33",
145145
"axios-mock-adapter": "^2.0.0",
146146
"babel-loader": "^8.2.5",
147147
"blake2b-no-wasm": "2.1.4",
148148
"buffer": "^6.0.3",
149-
"chromedriver": "^127.0.0",
150149
"copy-webpack-plugin": "^10.2.4",
151150
"crypto-browserify": "^3.12.0",
152151
"delay": "^5.0.0",
153-
"dockerode": "^3.3.1",
152+
"dockerode": "^4.0.7",
154153
"dockerode-utils": "^0.0.7",
155154
"eslint": "^7.32.0",
156155
"events": "^3.3.0",
157-
"expect-webdriverio": "^3.2.1",
156+
"expect-webdriverio": "^5.6.8",
158157
"jest": "^28.1.3",
159158
"jest-webextension-mock": "^3.7.22",
160159
"json-bigint": "^1.0.0",
@@ -170,9 +169,8 @@
170169
"typescript": "^4.7.4",
171170
"url": "^0.11.4",
172171
"util": "^0.12.4",
173-
"wdio-chromedriver-service": "^7.3.2",
174172
"webassembly-loader-sw": "^1.1.0",
175-
"webdriverio": "^7.20.5",
173+
"webdriverio": "^9.29.0",
176174
"webpack": "^5.72.0",
177175
"webpack-cli": "^4.9.2",
178176
"webpack-merge": "^5.8.0"

‎packages/e2e/test/web-extension/specs/dapp-cip30.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('dapp/cip30', () => {
2424
});
2525

2626
it('dapp should detect test wallet', async () => {
27-
await expect($(pWalletFound)).toHaveTextContaining('true');
27+
await expect($(pWalletFound)).toHaveText('true', { containing: true });
2828
});
2929

3030
describe('dapp can use cip30 wallet api', () => {
@@ -50,14 +50,14 @@ describe('dapp/cip30', () => {
5050
});
5151

5252
it('dapp gets correct addresses from cip30 wallet api', async () => {
53-
await expect($(dappChangeAddress)).toHaveTextContaining(walletAddr);
54-
await expect($(dappStakeAddress)).toHaveTextContaining(walletStakeAddr);
55-
await expect($(dappUsedAddress)).toHaveTextContaining(walletAddr);
53+
await expect($(dappChangeAddress)).toHaveText(walletAddr, { containing: true });
54+
await expect($(dappStakeAddress)).toHaveText(walletStakeAddr, { containing: true });
55+
await expect($(dappUsedAddress)).toHaveText(walletAddr, { containing: true });
5656
});
5757

5858
it('dapp can build and send a transaction using cip30 WalletApi', async () => {
5959
await $(dappBtnRun).click();
60-
await expect($(dappSubmittedTxConfirmation)).toHaveTextContaining('check your wallet');
60+
await expect($(dappSubmittedTxConfirmation)).toHaveText('check your wallet', { containing: true });
6161
});
6262
});
6363
});

‎packages/e2e/test/web-extension/specs/dapp-cip95.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('dapp/cip95', () => {
4242
});
4343

4444
it('dapp should detect test wallet', async () => {
45-
await expect($(pWalletFound)).toHaveTextContaining('true');
45+
await expect($(pWalletFound)).toHaveText('true', { containing: true });
4646
});
4747

4848
describe('dapp can use cip95 wallet api', () => {
@@ -68,9 +68,9 @@ describe('dapp/cip95', () => {
6868
});
6969

7070
it('dapp gets correct addresses from cip95 wallet api', async () => {
71-
await expect($(dappChangeAddress)).toHaveTextContaining(walletAddr);
72-
await expect($(dappStakeAddress)).toHaveTextContaining(walletStakeAddr);
73-
await expect($(dappUsedAddress)).toHaveTextContaining(walletAddr);
71+
await expect($(dappChangeAddress)).toHaveText(walletAddr, { containing: true });
72+
await expect($(dappStakeAddress)).toHaveText(walletStakeAddr, { containing: true });
73+
await expect($(dappUsedAddress)).toHaveText(walletAddr, { containing: true });
7474
});
7575

7676
it('getRegisteredPubStakeKeys gets active public stake keys from cip95 wallet api', async () => {
@@ -81,12 +81,12 @@ describe('dapp/cip95', () => {
8181
it('getPubDRepKey gets the DRep key from cip95 wallet api', async () => {
8282
const dappDrepKey = await $(dappGetPubDrepKey).getText();
8383
expect(dappDrepKey.length).toBeGreaterThan(0);
84-
await expect($(dappDrepId)).toHaveTextContaining('drep');
84+
await expect($(dappDrepId)).toHaveText('drep', { containing: true });
8585
});
8686

8787
it('supportedExtensions and getExtensions both return cip95', async () => {
88-
await expect($(liSupportedExtensions)).toHaveTextContaining('95');
89-
await expect($(liGetExtensions)).toHaveTextContaining('95');
88+
await expect($(liSupportedExtensions)).toHaveText('95', { containing: true });
89+
await expect($(liGetExtensions)).toHaveText('95', { containing: true });
9090
});
9191
});
9292
});

‎packages/e2e/test/web-extension/specs/wallet.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ describe('wallet', () => {
7676
});
7777
walletAddr1 = await $(spanAddress).getText();
7878
walletStakeAddr1 = await $(spanStakeAddress).getText();
79-
expect(walletAddr1).toHaveTextContaining('addr');
80-
expect(walletStakeAddr1).toHaveTextContaining('stake');
79+
expect(walletAddr1).toContain('addr');
80+
expect(walletStakeAddr1).toContain('stake');
8181
await expect($(activeWalletName)).toHaveText(getObservableWalletName(0));
8282
});
8383
});
@@ -102,14 +102,14 @@ describe('wallet', () => {
102102

103103
// Delegation transaction was submitted successfully
104104
const txId = await $('#multiDelegation .delegateTxId').getText();
105-
expect(txId).toHaveTextContaining('TxId');
105+
expect(txId).toContain('TxId');
106106

107107
// Wallet reports delegating to 3 pools
108108
await browser.waitUntil(
109109
async () => {
110110
try {
111-
const delegatedPools = await $$(liPools);
112-
return delegatedPools.length === NUM_POOLS;
111+
const delegatedPoolCount = await $$(liPools).length;
112+
return delegatedPoolCount === NUM_POOLS;
113113
} catch {
114114
return false;
115115
}
@@ -125,8 +125,8 @@ describe('wallet', () => {
125125
it('can switch to another wallet', async () => {
126126
// Automatically deactivates first wallet, but keeps the store available for future activation
127127
await $(btnActivateWallet2).click();
128-
await expect($(spanAddress)).not.toHaveTextContaining(walletAddr1);
129-
await expect($(spanAddress)).toHaveTextContaining('addr');
128+
await expect($(spanAddress)).not.toHaveText(walletAddr1, { containing: true });
129+
await expect($(spanAddress)).toHaveText('addr', { containing: true });
130130
await expect($(activeWalletName)).toHaveText(getObservableWalletName(1));
131131
});
132132

@@ -138,10 +138,10 @@ describe('wallet', () => {
138138
it('can destroy second wallet before switching back to the first wallet', async () => {
139139
// Destroy also clears associated store. Store will be rebuilt during future activation of same wallet
140140
await $(destroyWallet).click();
141-
await expect($(spanAddress)).toHaveTextContaining('-');
141+
await expect($(spanAddress)).toHaveText('-', { containing: true });
142142

143143
await $(btnActivateWallet1).click();
144-
await expect($(spanAddress)).toHaveTextContaining(walletAddr1);
144+
await expect($(spanAddress)).toHaveText(walletAddr1, { containing: true });
145145
await expect($(activeWalletName)).toHaveText(getObservableWalletName(0));
146146
});
147147

‎packages/e2e/test/web-extension/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"baseUrl": "./extension",
55
"types": [
66
"node",
7-
"webdriverio/async",
7+
"@wdio/globals/types",
88
"@wdio/mocha-framework",
99
"expect-webdriverio"
1010
]

‎packages/e2e/test/web-extension/wdio.conf.js‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ const path = require('path');
22

33
module.exports = {
44
config: {
5-
autoCompileOpts: {
6-
autoCompile: true,
7-
tsNodeOpts: {
8-
project: 'test/web-extension/tsconfig.json',
9-
transpileOnly: true
10-
}
11-
},
125
bail: 0,
136
baseUrl: 'http://localhost:4567',
147
capabilities: [
@@ -51,10 +44,11 @@ module.exports = {
5144
{ mount: '/cip95-cardano-wallet-connector', path: path.join(__dirname, 'dapp-cip95/build') }
5245
]
5346
}
54-
],
55-
'chromedriver'
47+
]
5648
],
5749
specs: ['./**/*.spec.ts'],
50+
// WebdriverIO v8+ auto-compiles TS via tsx; point it at the local tsconfig
51+
tsConfigPath: path.join(__dirname, 'tsconfig.json'),
5852
waitforTimeout: 10_000
5953
}
6054
};

‎packages/util-dev/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@types/dockerode": "^3.3.8",
5050
"axios": "^1.7.4",
5151
"delay": "^5.0.0",
52-
"dockerode": "^3.3.1",
52+
"dockerode": "^4.0.7",
5353
"dockerode-utils": "^0.0.7",
5454
"envalid": "^7.3.1",
5555
"get-port-please": "^2.5.0",

0 commit comments

Comments
 (0)