@lidofinance/wallets-testing-wallets 1.37.0 → 1.38.0-debug-test.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/metamask/metamask-latest/metamask.page.d.ts.map +1 -1
- package/dist/src/metamask/metamask-latest/metamask.page.js +3 -9
- package/dist/src/metamask/metamask-latest/metamask.page.js.map +1 -1
- package/dist/src/metamask/metamask-latest/pages/login.page.d.ts +1 -0
- package/dist/src/metamask/metamask-latest/pages/login.page.d.ts.map +1 -1
- package/dist/src/metamask/metamask-latest/pages/login.page.js +8 -0
- package/dist/src/metamask/metamask-latest/pages/login.page.js.map +1 -1
- package/dist/src/safe/pages/setup.page.d.ts +0 -1
- package/dist/src/safe/pages/setup.page.d.ts.map +1 -1
- package/dist/src/safe/pages/setup.page.js +1 -15
- package/dist/src/safe/pages/setup.page.js.map +1 -1
- package/dist/src/safe/pages/transaction.page.d.ts +3 -0
- package/dist/src/safe/pages/transaction.page.d.ts.map +1 -1
- package/dist/src/safe/pages/transaction.page.js +83 -23
- package/dist/src/safe/pages/transaction.page.js.map +1 -1
- package/dist/src/safe/safeIframe.page.d.ts.map +1 -1
- package/dist/src/safe/safeIframe.page.js +0 -2
- package/dist/src/safe/safeIframe.page.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metamask.page.d.ts","sourceRoot":"","sources":["../../../../src/metamask/metamask-latest/metamask.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAQ,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,QAAQ,EACR,SAAS,EACT,cAAc,EACd,mBAAmB,EACpB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,MAAM,EACN,eAAe,EACf,eAAe,EACf,WAAW,EACX,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAI1B,qBAAa,YAAa,YAAW,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC;IAYlD,OAAO,EAAE,iBAAiB;IAX7C,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,mBAAmB,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,eAAe,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;gBAEN,OAAO,EAAE,iBAAiB;IAEvC,YAAY;IAoBZ,QAAQ;
|
|
1
|
+
{"version":3,"file":"metamask.page.d.ts","sourceRoot":"","sources":["../../../../src/metamask/metamask-latest/metamask.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAQ,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,QAAQ,EACR,SAAS,EACT,cAAc,EACd,mBAAmB,EACpB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,MAAM,EACN,eAAe,EACf,eAAe,EACf,WAAW,EACX,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAI1B,qBAAa,YAAa,YAAW,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC;IAYlD,OAAO,EAAE,iBAAiB;IAX7C,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,mBAAmB,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,eAAe,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;gBAEN,OAAO,EAAE,iBAAiB;IAEvC,YAAY;IAoBZ,QAAQ;IAiBR,KAAK;IAcL,aAAa,CAAC,WAAW,EAAE,MAAM;IAYjC,YAAY,CAAC,aAAa,EAAE,aAAa;IAoBzC,UAAU,CAAC,aAAa,EAAE,aAAa,EAAE,WAAW,UAAQ;IAmB5D,SAAS,CAAC,GAAG,EAAE,MAAM;IASrB,aAAa,CAAC,IAAI,EAAE,IAAI;IAQxB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM;IASjD,uBAAuB,CAAC,WAAW,EAAE,IAAI;IAMzC,qBAAqB,CAAC,OAAO,SAAI;IASjC,eAAe,CAAC,SAAS,EAAE,MAAM;IA0BjC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,OAAO;IAMhD,QAAQ,CAAC,IAAI,EAAE,IAAI;IAMnB,cAAc,CAAC,IAAI,EAAE,IAAI;IAMzB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM;IAS9D,2EAA2E;IACrE,gBAAgB;IAWhB,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,UAAQ;IASjE,oBAAoB,CAAC,OAAO,EAAE,MAAM;IAmBpC,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,UAAO;CAaxE"}
|
|
@@ -27,15 +27,9 @@ class MetamaskPage {
|
|
|
27
27
|
await test_2.test.step('Navigate to metamask Home page', async () => {
|
|
28
28
|
await this.initLocators();
|
|
29
29
|
await this.homePage.goto();
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
timeout: 2000,
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
|
-
catch {
|
|
37
|
-
// Header logo is not visible
|
|
38
|
-
}
|
|
30
|
+
await this.header.appHeaderLogo
|
|
31
|
+
.or(this.loginPage.passwordInput)
|
|
32
|
+
.waitFor({ state: 'visible' });
|
|
39
33
|
await this.popoverElements.closeConnectingProblemPopover();
|
|
40
34
|
await this.loginPage.unlock();
|
|
41
35
|
if (await this.header.accountMenuButton.isVisible()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metamask.page.js","sourceRoot":"","sources":["../../../../src/metamask/metamask-latest/metamask.page.ts"],"names":[],"mappings":";;;AAEA,2CAA0C;AAC1C,2CAA8C;AAC9C,mCAKiB;AACjB,+CAM0B;AAC1B,+BAAkC;AAClC,qCAA4E;AAE5E,MAAa,YAAY;IAYvB,YAAmB,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;IAAG,CAAC;IAEjD,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QACxD,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAQ,CAC1B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CAAC,YAAY,EACzB,IAAI,CAAC,OAAO,CAAC,YAAY,CAC1B,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,sBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,IAAI,iBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACtE,IAAI,CAAC,eAAe,GAAG,IAAI,2BAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAc,CACtC,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CAAC,aAAa,CAC3B,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,IAAI,0BAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,GAAG,IAAI,0BAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,GAAG,IAAI,sBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,WAAI,CAAC,IAAI,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC3B,IAAI
|
|
1
|
+
{"version":3,"file":"metamask.page.js","sourceRoot":"","sources":["../../../../src/metamask/metamask-latest/metamask.page.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.page.d.ts","sourceRoot":"","sources":["../../../../../src/metamask/metamask-latest/pages/login.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAQ,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,qBAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"login.page.d.ts","sourceRoot":"","sources":["../../../../../src/metamask/metamask-latest/pages/login.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAQ,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,qBAAa,SAAS;IAKD,IAAI,EAAE,IAAI;IAAS,aAAa,EAAE,aAAa;IAJlE,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;gBAEJ,IAAI,EAAE,IAAI,EAAS,aAAa,EAAE,aAAa;IAM5D,MAAM;CAgBb"}
|
|
@@ -8,9 +8,17 @@ class LoginPage {
|
|
|
8
8
|
this.accountConfig = accountConfig;
|
|
9
9
|
this.passwordInput = this.page.locator('id=password');
|
|
10
10
|
this.unlockButton = this.page.getByText('Unlock');
|
|
11
|
+
this.loaderSpinner = this.page.locator('.loading-spinner');
|
|
11
12
|
}
|
|
12
13
|
async unlock() {
|
|
13
14
|
await test_1.test.step('Unlock wallet', async () => {
|
|
15
|
+
try {
|
|
16
|
+
await this.loaderSpinner.waitFor({ state: 'visible', timeout: 2000 });
|
|
17
|
+
await this.loaderSpinner.waitFor({ state: 'hidden', timeout: 30000 });
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
// continue after loader is hidden
|
|
21
|
+
}
|
|
14
22
|
if (await this.passwordInput.isVisible()) {
|
|
15
23
|
await this.passwordInput.fill(this.accountConfig.PASSWORD);
|
|
16
24
|
await this.unlockButton.click();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.page.js","sourceRoot":"","sources":["../../../../../src/metamask/metamask-latest/pages/login.page.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AAGvD,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"login.page.js","sourceRoot":"","sources":["../../../../../src/metamask/metamask-latest/pages/login.page.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AAGvD,MAAa,SAAS;IAKpB,YAAmB,IAAU,EAAS,aAA4B;QAA/C,SAAI,GAAJ,IAAI,CAAM;QAAS,kBAAa,GAAb,aAAa,CAAe;QAChE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,WAAI,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;YAC1C,IAAI;gBACF,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBACtE,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;aACvE;YAAC,MAAM;gBACN,kCAAkC;aACnC;YAED,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE;gBACxC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;aAC7C;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA3BD,8BA2BC"}
|
|
@@ -19,7 +19,6 @@ export declare class SetupPage {
|
|
|
19
19
|
firstTimeSetupWallet(): Promise<string>;
|
|
20
20
|
agreeCookiesSetting(): Promise<void>;
|
|
21
21
|
connectWalletExtension(): Promise<void>;
|
|
22
|
-
closeExtraPopup(): Promise<void>;
|
|
23
22
|
closeBeamerAnnouncementBanner(): Promise<void>;
|
|
24
23
|
waitForVisible(locator: Locator, timeout: number): Promise<boolean>;
|
|
25
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.page.d.ts","sourceRoot":"","sources":["../../../../src/safe/pages/setup.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAQ,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,qBAAa,SAAS;IAYX,IAAI,EAAE,IAAI;IACV,aAAa,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC;IACjD,OAAO,EAAE,MAAM;IAbxB,MAAM,gBAAgD;IACtD,qBAAqB,EAAE,OAAO,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;gBAGtB,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC,EACjD,OAAO,EAAE,MAAM;IAwBlB,oBAAoB;IAgBpB,mBAAmB;IAcnB,sBAAsB;
|
|
1
|
+
{"version":3,"file":"setup.page.d.ts","sourceRoot":"","sources":["../../../../src/safe/pages/setup.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAQ,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,qBAAa,SAAS;IAYX,IAAI,EAAE,IAAI;IACV,aAAa,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC;IACjD,OAAO,EAAE,MAAM;IAbxB,MAAM,gBAAgD;IACtD,qBAAqB,EAAE,OAAO,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;gBAGtB,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC,EACjD,OAAO,EAAE,MAAM;IAwBlB,oBAAoB;IAgBpB,mBAAmB;IAcnB,sBAAsB;IA+CtB,6BAA6B;IAQ7B,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM;CAQvD"}
|
|
@@ -13,7 +13,7 @@ class SetupPage {
|
|
|
13
13
|
this.chainId === 1
|
|
14
14
|
? 'https://app.safe.global/welcome/accounts'
|
|
15
15
|
: 'https://app.safe.protofire.io/welcome/accounts'; //Hoodi
|
|
16
|
-
this.saveCookiesSettingBtn = this.page.locator('button:has-text("
|
|
16
|
+
this.saveCookiesSettingBtn = this.page.locator('button:has-text("Save settings")');
|
|
17
17
|
this.connectWalletBtn = this.page.getByTestId('connect-wallet-btn').nth(0);
|
|
18
18
|
this.accountCenter = this.page.getByTestId('open-account-center');
|
|
19
19
|
this.safeAccount = this.page
|
|
@@ -53,7 +53,6 @@ class SetupPage {
|
|
|
53
53
|
}
|
|
54
54
|
async connectWalletExtension() {
|
|
55
55
|
await test_1.test.step('Connect MetaMask wallet', async () => {
|
|
56
|
-
await this.closeExtraPopup();
|
|
57
56
|
await this.agreeCookiesSetting();
|
|
58
57
|
await this.page.waitForTimeout(2000);
|
|
59
58
|
await this.closeBeamerAnnouncementBanner();
|
|
@@ -69,7 +68,6 @@ class SetupPage {
|
|
|
69
68
|
}
|
|
70
69
|
this.logger.log(`[Attempt ${attempt}] Connect wallet to Safe failed`);
|
|
71
70
|
await this.page.reload();
|
|
72
|
-
await this.closeExtraPopup();
|
|
73
71
|
}
|
|
74
72
|
try {
|
|
75
73
|
const [connectWalletPage] = await Promise.all([
|
|
@@ -86,18 +84,6 @@ class SetupPage {
|
|
|
86
84
|
await this.accountCenter.waitFor({ state: 'visible', timeout: 5000 });
|
|
87
85
|
});
|
|
88
86
|
}
|
|
89
|
-
async closeExtraPopup() {
|
|
90
|
-
await test_1.test.step('Close extra popup', async () => {
|
|
91
|
-
await this.closeSecurityNoticeBtn
|
|
92
|
-
.waitFor({ state: 'visible', timeout: 2000 })
|
|
93
|
-
.then(() => {
|
|
94
|
-
this.closeSecurityNoticeBtn.click();
|
|
95
|
-
})
|
|
96
|
-
.catch(() => {
|
|
97
|
-
this.logger.warn('Security Notice is not displayed (maybe need to remove it?)');
|
|
98
|
-
});
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
87
|
async closeBeamerAnnouncementBanner() {
|
|
102
88
|
await test_1.test.step('Close announcement banner (if visible)', async () => {
|
|
103
89
|
if (await this.waitForVisible(this.beamerAnnouncementBar, 3000)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.page.js","sourceRoot":"","sources":["../../../../src/safe/pages/setup.page.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AAGvD,2CAA+C;AAE/C,MAAa,SAAS;IAWpB,YACS,IAAU,EACV,aAAiD,EACjD,OAAe;QAFf,SAAI,GAAJ,IAAI,CAAM;QACV,kBAAa,GAAb,aAAa,CAAoC;QACjD,YAAO,GAAP,OAAO,CAAQ;QAbxB,WAAM,GAAG,IAAI,sBAAa,CAAC,SAAS,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QAepD,IAAI,CAAC,QAAQ;YACX,IAAI,CAAC,OAAO,KAAK,CAAC;gBAChB,CAAC,CAAC,0CAA0C;gBAC5C,CAAC,CAAC,gDAAgD,CAAC,CAAC,OAAO;QAC/D,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAC5C
|
|
1
|
+
{"version":3,"file":"setup.page.js","sourceRoot":"","sources":["../../../../src/safe/pages/setup.page.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,9 @@ export declare class TransactionPage {
|
|
|
9
9
|
transactionCardContent: Locator;
|
|
10
10
|
contractExplorerUrl: Locator;
|
|
11
11
|
tokenAmount: Locator;
|
|
12
|
+
continueTxBtn: Locator;
|
|
12
13
|
executeTxBtn: Locator;
|
|
14
|
+
comboSubmitDropdown: Locator;
|
|
13
15
|
finishTxBtn: Locator;
|
|
14
16
|
switchNetworkBtn: Locator;
|
|
15
17
|
allActionsList: Locator;
|
|
@@ -23,5 +25,6 @@ export declare class TransactionPage {
|
|
|
23
25
|
assertTransactionAmount(expectedAmount: string): Promise<void>;
|
|
24
26
|
private waitForLoaderToBeHidden;
|
|
25
27
|
private failTestIfSafeDisplayFailBanner;
|
|
28
|
+
private selectOptionToExecuteTx;
|
|
26
29
|
}
|
|
27
30
|
//# sourceMappingURL=transaction.page.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.page.d.ts","sourceRoot":"","sources":["../../../../src/safe/pages/transaction.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAgB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,qBAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"transaction.page.d.ts","sourceRoot":"","sources":["../../../../src/safe/pages/transaction.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAgB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,qBAAa,eAAe;IAiBjB,IAAI,EAAE,IAAI;IACV,aAAa,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC;IAjB1D,MAAM,gBAAsD;IAC5D,sBAAsB,EAAE,OAAO,CAAC;IAChC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;IAE1B,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,qBAAqB,EAAE,OAAO,CAAC;gBAGtB,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,UAAU,CAAC,kBAAkB,CAAC,GAAG,CAAC;IAsBpD,4BAA4B,CAAC,eAAe,EAAE,MAAM;IAwEpD,kBAAkB;YAyCV,iBAAiB;IA8BzB,uBAAuB,CAAC,cAAc,EAAE,MAAM;YAyEtC,uBAAuB;YAcvB,+BAA+B;YAoB/B,uBAAuB;CAOtC"}
|
|
@@ -14,7 +14,11 @@ class TransactionPage {
|
|
|
14
14
|
.getByTestId('explorer-btn')
|
|
15
15
|
.first();
|
|
16
16
|
this.tokenAmount = this.transactionCardContent.getByTestId('token-amount');
|
|
17
|
-
this.
|
|
17
|
+
this.continueTxBtn = this.page.getByTestId('continue-sign-btn');
|
|
18
|
+
this.executeTxBtn = this.page
|
|
19
|
+
.getByTestId('execute-form-btn')
|
|
20
|
+
.or(this.page.getByTestId('combo-submit-execute'));
|
|
21
|
+
this.comboSubmitDropdown = this.page.getByTestId('combo-submit-dropdown');
|
|
18
22
|
this.finishTxBtn = this.page.getByTestId('finish-transaction-btn');
|
|
19
23
|
this.switchNetworkBtn = this.page.getByText('Switch to');
|
|
20
24
|
this.allActionsList = this.page.getByTestId('all-actions');
|
|
@@ -31,26 +35,44 @@ class TransactionPage {
|
|
|
31
35
|
isNeedToCheckAllActions = true;
|
|
32
36
|
}
|
|
33
37
|
catch {
|
|
38
|
+
// If only Execution action (without approval)
|
|
34
39
|
const contractExplorerUrl = await this.contractExplorerUrl.getAttribute('href');
|
|
35
40
|
const match = contractExplorerUrl.match(/address\/([^/\s]+)/);
|
|
36
|
-
(0, test_1.expect)(match[1]).toEqual(expectedAddress);
|
|
41
|
+
(0, test_1.expect)(match[1], 'The displayed contract must compare with the correct address').toEqual(expectedAddress);
|
|
37
42
|
}
|
|
43
|
+
// If the tx has 2 actions (Approval and Execution)
|
|
38
44
|
if (isNeedToCheckAllActions) {
|
|
39
45
|
const actions = await this.actionItem.all();
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
46
|
+
(0, test_1.expect)(actions.length, 'Approve and Execution transactions (2 actions)').toBe(2);
|
|
47
|
+
const approveAction = actions[0];
|
|
48
|
+
const txAction = actions[1];
|
|
49
|
+
await test_1.test.step('Check address of Approve action', async () => {
|
|
50
|
+
if ((await approveAction.getAttribute('aria-expanded')) === 'false') {
|
|
51
|
+
await approveAction.click();
|
|
52
|
+
}
|
|
53
|
+
const actionInfo = approveAction
|
|
54
|
+
.locator('../..')
|
|
55
|
+
.locator('[data-testid="tx-row-title"]:has-text("spender")')
|
|
56
|
+
.locator('..');
|
|
57
|
+
const contractsUrls = await actionInfo
|
|
58
|
+
.getByTestId('explorer-btn')
|
|
59
|
+
.all();
|
|
60
|
+
const contractExplorerUrl = await contractsUrls[contractsUrls.length - 1].getAttribute('href');
|
|
61
|
+
const match = contractExplorerUrl.match(/address\/([^/\s]+)/);
|
|
62
|
+
(0, test_1.expect)(match[1], 'The displayed contract must compare with the correct address').toEqual(expectedAddress);
|
|
63
|
+
});
|
|
64
|
+
await test_1.test.step('Check address of the Execution action', async () => {
|
|
65
|
+
if ((await txAction.getAttribute('aria-expanded')) === 'false') {
|
|
66
|
+
await txAction.click();
|
|
67
|
+
}
|
|
68
|
+
const actionInfo = txAction.locator('../..');
|
|
69
|
+
const contractExplorerUrl = await actionInfo
|
|
70
|
+
.getByTestId('explorer-btn')
|
|
71
|
+
.first()
|
|
72
|
+
.getAttribute('href');
|
|
73
|
+
const match = contractExplorerUrl.match(/address\/([^/\s]+)/);
|
|
74
|
+
(0, test_1.expect)(match[1], 'The displayed contract must compare with the correct address').toEqual(expectedAddress);
|
|
75
|
+
});
|
|
54
76
|
}
|
|
55
77
|
}
|
|
56
78
|
async confirmTransaction() {
|
|
@@ -65,6 +87,24 @@ class TransactionPage {
|
|
|
65
87
|
await this.extensionPage.confirmTx(extensionTxPage);
|
|
66
88
|
}
|
|
67
89
|
});
|
|
90
|
+
// we need to do some steps depending on the UI displays
|
|
91
|
+
await test_1.test.step('Prepare the Safe Tx page for the transaction execution', async () => {
|
|
92
|
+
const result = await Promise.race([
|
|
93
|
+
this.executeTxBtn
|
|
94
|
+
.waitFor({ timeout: 5000, state: 'visible' })
|
|
95
|
+
.then(() => 'execute'),
|
|
96
|
+
this.continueTxBtn
|
|
97
|
+
.waitFor({ timeout: 5000, state: 'visible' })
|
|
98
|
+
.then(() => 'continue'),
|
|
99
|
+
this.comboSubmitDropdown
|
|
100
|
+
.waitFor({ timeout: 5000, state: 'visible' })
|
|
101
|
+
.then(() => 'dropdown'),
|
|
102
|
+
]);
|
|
103
|
+
if (result == 'continue')
|
|
104
|
+
await this.continueTxBtn.click();
|
|
105
|
+
if (result == 'continue' || result == 'dropdown')
|
|
106
|
+
await this.selectOptionToExecuteTx();
|
|
107
|
+
});
|
|
68
108
|
const [extensionTxPage] = await Promise.all([
|
|
69
109
|
this.executeTxBtnClick(),
|
|
70
110
|
this.executeTxBtn.click(),
|
|
@@ -109,10 +149,25 @@ class TransactionPage {
|
|
|
109
149
|
isNeedToCheckAllActions = true;
|
|
110
150
|
}
|
|
111
151
|
catch {
|
|
112
|
-
|
|
152
|
+
// continue
|
|
113
153
|
}
|
|
154
|
+
// If only Execution action (without approval)
|
|
155
|
+
if (!isNeedToCheckAllActions) {
|
|
156
|
+
if (await this.tokenAmount.count()) {
|
|
157
|
+
(0, test_1.expect)(await this.tokenAmount.textContent(), "The displayed transaction amount must compare with the user's put amount").toEqual(expectedAmount);
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
// unwrap tx - the only one execution action, but the tx amount displayed in the actions lists
|
|
161
|
+
const valueParam = await this.page
|
|
162
|
+
.getByTestId('tx-data-row')
|
|
163
|
+
.textContent();
|
|
164
|
+
(0, test_1.expect)(String(new big_js_1.Big(valueParam).div(1e18)), "The displayed transaction amount must compare with the user's put amount").toEqual(expectedAmount);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
// If the tx has 2 actions (Approval and Execution)
|
|
114
168
|
if (isNeedToCheckAllActions) {
|
|
115
169
|
const actions = await this.actionItem.all();
|
|
170
|
+
(0, test_1.expect)(actions.length, 'Approve and Execution transactions (2 actions)').toBe(2);
|
|
116
171
|
for (const action of actions) {
|
|
117
172
|
await test_1.test.step(`Check amount of "${await action.textContent()}" action`, async () => {
|
|
118
173
|
if ((await action.getAttribute('aria-expanded')) === 'false') {
|
|
@@ -124,14 +179,12 @@ class TransactionPage {
|
|
|
124
179
|
.all();
|
|
125
180
|
if (actionParameters.length > 1) {
|
|
126
181
|
actionInfo = actionInfo
|
|
127
|
-
.locator('[data-testid="tx-row-title"]:
|
|
128
|
-
.locator('
|
|
182
|
+
.locator('[data-testid="tx-row-title"] :text-matches("value|amount")')
|
|
183
|
+
.locator('../../../..');
|
|
129
184
|
}
|
|
130
|
-
const
|
|
131
|
-
.getByTestId('tx-data-row')
|
|
132
|
-
.textContent();
|
|
185
|
+
const txAmountValue = parseFloat((await actionInfo.getByTestId('tx-data-row').textContent()).replace(/[[\]]/g, ''));
|
|
133
186
|
// Safe UI displays the BigInt type of tx value (100000000000), and we need to convert to before matching
|
|
134
|
-
(0, test_1.expect)(String(new big_js_1.Big(
|
|
187
|
+
(0, test_1.expect)(String(new big_js_1.Big(txAmountValue).div(1e18)), "The displayed transaction amount must compare with the user's put amount").toEqual(expectedAmount);
|
|
135
188
|
});
|
|
136
189
|
}
|
|
137
190
|
}
|
|
@@ -167,6 +220,13 @@ class TransactionPage {
|
|
|
167
220
|
await (0, test_1.expect)(this.transactionFailBanner).not.toBeVisible();
|
|
168
221
|
}
|
|
169
222
|
}
|
|
223
|
+
async selectOptionToExecuteTx() {
|
|
224
|
+
await this.comboSubmitDropdown.click();
|
|
225
|
+
await this.page
|
|
226
|
+
.getByTestId('combo-submit-popover')
|
|
227
|
+
.getByText('Execute')
|
|
228
|
+
.click();
|
|
229
|
+
}
|
|
170
230
|
}
|
|
171
231
|
exports.TransactionPage = TransactionPage;
|
|
172
232
|
//# sourceMappingURL=transaction.page.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.page.js","sourceRoot":"","sources":["../../../../src/safe/pages/transaction.page.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,2CAA+C;AAG/C,mCAA6B;AAE7B,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"transaction.page.js","sourceRoot":"","sources":["../../../../src/safe/pages/transaction.page.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safeIframe.page.d.ts","sourceRoot":"","sources":["../../../src/safe/safeIframe.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAmB,MAAM,SAAS,CAAC;AAElE,qBAAa,cAAe,YAAW,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC;IAOvD,OAAO,EAAE,iBAAiB;IAN7C,MAAM,gBAA0C;IAChD,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,GAAG,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;gBAEN,OAAO,EAAE,iBAAiB;IAEvC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI;IAc9B;;;;;OAKG;IACG,KAAK;
|
|
1
|
+
{"version":3,"file":"safeIframe.page.d.ts","sourceRoot":"","sources":["../../../src/safe/safeIframe.page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAmB,MAAM,SAAS,CAAC;AAElE,qBAAa,cAAe,YAAW,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC;IAOvD,OAAO,EAAE,iBAAiB;IAN7C,MAAM,gBAA0C;IAChD,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,GAAG,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;gBAEN,OAAO,EAAE,iBAAiB;IAEvC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI;IAc9B;;;;;OAKG;IACG,KAAK;IAmBL,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,YAAY;IAIjD,OAAO,CAAC,gBAAgB;IAiBlB,gBAAgB;IAItB,uDAAuD;IACjD,aAAa;IAgBb,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM;IASxD,SAAS,CAAC,IAAI,EAAE,IAAI;IAcpB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM;IASvD,4CAA4C;IACtC,YAAY,CAAC,aAAa,EAAE,aAAa;IAI/C,6CAA6C;IACvC,aAAa,CAAC,WAAW,EAAE,MAAM;IAIvC,8DAA8D;IACxD,oBAAoB,CAAC,OAAO,EAAE,MAAM;IAI1C,yCAAyC;IACnC,SAAS,CAAC,SAAS,EAAE,MAAM;IAIjC,6CAA6C;IACvC,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAIlD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,cAAc,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhC,eAAe,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC;IAInC,qBAAqB,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC,uBAAuB,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5B"}
|
|
@@ -33,7 +33,6 @@ class SafeIframePage {
|
|
|
33
33
|
this.safeUrl = new URL(safeAccountUrl);
|
|
34
34
|
await test_1.test.step('Setup RPC url', async () => {
|
|
35
35
|
await this.navigate('envSetting');
|
|
36
|
-
await this.setupPage.closeExtraPopup();
|
|
37
36
|
await this.settingPage.rpcUrlInput.fill(this.options.standConfig.rpcUrl);
|
|
38
37
|
await this.settingPage.saveSettingBtn.click();
|
|
39
38
|
});
|
|
@@ -59,7 +58,6 @@ class SafeIframePage {
|
|
|
59
58
|
await this.initLocators(this.options.browserContext.pages()[0]);
|
|
60
59
|
await this.navigate('lidoApp');
|
|
61
60
|
await test_1.test.step('Open Lido app in the Safe', async () => {
|
|
62
|
-
await this.setupPage.closeExtraPopup();
|
|
63
61
|
while (await this.setupPage.waitForVisible(this.setupPage.inAppContinueBtn, 5000)) {
|
|
64
62
|
await this.setupPage.inAppContinueBtn.click();
|
|
65
63
|
await this.page.waitForTimeout(1000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safeIframe.page.js","sourceRoot":"","sources":["../../../src/safe/safeIframe.page.ts"],"names":[],"mappings":";;;AAAA,2CAA8C;AAG9C,2CAA+C;AAC/C,mCAAkE;AAElE,MAAa,cAAc;IAOzB,YAAmB,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;QAN7C,WAAM,GAAG,IAAI,sBAAa,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAMA,CAAC;IAEjD,KAAK,CAAC,YAAY,CAAC,IAAW;QAC5B,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;SACzD;aAAM;YACL,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;SAClB;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,iBAAS,CAC5B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CAAC,aAAa,EAC1B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CACjC,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,mBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAEzC,MAAM,WAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,oBAAoB,EAAE,CAAC;YACnE,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;YAEvC,MAAM,WAAI,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC1C,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;gBAClC,MAAM,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"safeIframe.page.js","sourceRoot":"","sources":["../../../src/safe/safeIframe.page.ts"],"names":[],"mappings":"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"}
|