Skip to content

Commit 36c2a93

Browse files
committed
push
1 parent be940d2 commit 36c2a93

2 files changed

Lines changed: 21 additions & 10 deletions

File tree

commands/playwright.js

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,21 @@ module.exports = {
6060
async metamaskExtensionId() {
6161
const extensionsData = await module.exports.getExtensionsData();
6262
console.log('Available extensions:', Object.keys(extensionsData));
63+
console.log('Available extensions (with quotes):', Object.keys(extensionsData).map(key => `"${key}"`));
6364

6465
const metamaskExtensionData = extensionsData.metamask;
6566
if (!metamaskExtensionData) {
66-
throw new Error(`MetaMask extension not found in extensions list. Available extensions: ${Object.keys(extensionsData).join(', ')}`);
67+
// 尝试查找包含 "metamask" 的扩展
68+
const metamaskKey = Object.keys(extensionsData).find(key =>
69+
key.toLowerCase().includes('metamask')
70+
);
71+
72+
if (metamaskKey) {
73+
console.log(`Found MetaMask with key: "${metamaskKey}"`);
74+
return extensionsData[metamaskKey].id;
75+
}
76+
77+
throw new Error(`MetaMask extension not found in extensions list. Available extensions: ${Object.keys(extensionsData).map(key => `"${key}"`).join(', ')}`);
6778
}
6879

6980
return metamaskExtensionData.id;
@@ -489,23 +500,23 @@ module.exports = {
489500

490501
for (const extensionData of extensionDataItems) {
491502
try {
492-
const extensionName = (
493-
await extensionData
494-
.locator('#name-and-version')
495-
.locator('#name')
496-
.textContent()
497-
).toLowerCase();
503+
const extensionName = (
504+
await extensionData
505+
.locator('#name-and-version')
506+
.locator('#name')
507+
.textContent()
508+
).toLowerCase().trim();
498509

499510
const extensionVersion = (
500511
await extensionData
501512
.locator('#name-and-version')
502513
.locator('#version')
503514
.textContent()
504-
).replace(/(\n| )/g, '');
515+
).trim().replace(/(\n| )/g, '');
505516

506517
const extensionId = (
507518
await extensionData.locator('#extension-id').textContent()
508-
).split(': ')[1];
519+
).trim().split(': ')[1];
509520

510521
console.log(`Found extension: ${extensionName} (${extensionVersion}) - ID: ${extensionId}`);
511522

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gracefnr/synpress",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"packageManager": "pnpm@9.1.3",
55
"description": "Synpress is e2e testing framework based around Cypress.io & playwright with included MetaMask support. Test your dapps with ease.",
66
"keywords": [

0 commit comments

Comments
 (0)