@@ -13,10 +13,18 @@ walletConfigs.forEach((walletConfig) => {
13
13
walletConfig . extension . Name === "Typhon" ,
14
14
"https://github.com/input-output-hk/catalyst-voices/issues/753"
15
15
) ;
16
+ test . skip (
17
+ walletConfig . extension . Name === "Yoroi" ,
18
+ "https://github.com/input-output-hk/catalyst-voices/issues/753"
19
+ ) ;
16
20
test . skip (
17
21
walletConfig . extension . Name === "Lace" ,
18
22
"https://github.com/input-output-hk/catalyst-voices/issues/1190"
19
23
) ;
24
+ test . skip (
25
+ walletConfig . extension . Name === "Nufi" ,
26
+ "https://github.com/input-output-hk/catalyst-voices/issues/1190"
27
+ ) ;
20
28
test . beforeAll ( async ( ) => {
21
29
browser = await restoreWallet ( walletConfig ) ;
22
30
await enableWallet ( walletConfig , browser ) ;
@@ -40,11 +48,7 @@ walletConfigs.forEach((walletConfig) => {
40
48
walletConfig . extension . Name
41
49
) ;
42
50
const homePage = new HomePage ( page ) ;
43
- const [ walletPopup ] = await Promise . all ( [
44
- browser . waitForEvent ( "page" ) ,
45
- homePage . signDataButton . click ( ) ,
46
- ] ) ;
47
- await signWalletPopup ( walletPopup , walletConfig ) ;
51
+ await signWalletPopup ( browser , walletConfig , homePage . signDataButton ) ;
48
52
await homePage . assertModal ( ModalName . SignData ) ;
49
53
} ) ;
50
54
@@ -56,11 +60,11 @@ walletConfigs.forEach((walletConfig) => {
56
60
walletConfig . extension . Name
57
61
) ;
58
62
const homePage = new HomePage ( page ) ;
59
- const [ walletPopup ] = await Promise . all ( [
60
- browser . waitForEvent ( "page" ) ,
61
- homePage . signAndSubmitTxButton . click ( ) ,
62
- ] ) ;
63
- await signWalletPopup ( walletPopup , walletConfig ) ;
63
+ await signWalletPopup (
64
+ browser ,
65
+ walletConfig ,
66
+ homePage . signAndSubmitTxButton
67
+ ) ;
64
68
await homePage . assertModal ( ModalName . SignAndSubmitTx ) ;
65
69
} ) ;
66
70
@@ -74,11 +78,11 @@ walletConfigs.forEach((walletConfig) => {
74
78
walletConfig . extension . Name
75
79
) ;
76
80
const homePage = new HomePage ( page ) ;
77
- const [ walletPopup ] = await Promise . all ( [
78
- browser . waitForEvent ( "page" ) ,
79
- homePage . signAndSubmitRBACTxButton . click ( ) ,
80
- ] ) ;
81
- await signWalletPopup ( walletPopup , walletConfig ) ;
81
+ await signWalletPopup (
82
+ browser ,
83
+ walletConfig ,
84
+ homePage . signAndSubmitRBACTxButton
85
+ ) ;
82
86
await homePage . assertModal ( ModalName . SignAndSubmitRBACTx ) ;
83
87
}
84
88
) ;
@@ -94,13 +98,14 @@ walletConfigs.forEach((walletConfig) => {
94
98
walletConfig . extension . Name
95
99
) ;
96
100
const homePage = new HomePage ( page ) ;
97
- const [ walletPopup ] = await Promise . all ( [
98
- browser . waitForEvent ( "page" ) ,
99
- homePage . signDataButton . click ( ) ,
100
- ] ) ;
101
101
const walletConfigClone = structuredClone ( walletConfig ) ;
102
102
walletConfigClone . password = "BadPassword" ;
103
- await signWalletPopup ( walletPopup , walletConfigClone , false ) ;
103
+ await signWalletPopup (
104
+ browser ,
105
+ walletConfigClone ,
106
+ homePage . signDataButton ,
107
+ false
108
+ ) ;
104
109
await homePage . assertModal ( ModalName . SignDataUserDeclined ) ;
105
110
}
106
111
) ;
@@ -116,13 +121,14 @@ walletConfigs.forEach((walletConfig) => {
116
121
walletConfig . extension . Name
117
122
) ;
118
123
const homePage = new HomePage ( page ) ;
119
- const [ walletPopup ] = await Promise . all ( [
120
- browser . waitForEvent ( "page" ) ,
121
- homePage . signAndSubmitTxButton . click ( ) ,
122
- ] ) ;
123
124
const walletConfigClone = structuredClone ( walletConfig ) ;
124
125
walletConfigClone . password = "BadPassword" ;
125
- await signWalletPopup ( walletPopup , walletConfigClone , false ) ;
126
+ await signWalletPopup (
127
+ browser ,
128
+ walletConfigClone ,
129
+ homePage . signAndSubmitTxButton ,
130
+ false
131
+ ) ;
126
132
await homePage . assertModal ( ModalName . SignTxUserDeclined ) ;
127
133
}
128
134
) ;
@@ -138,13 +144,14 @@ walletConfigs.forEach((walletConfig) => {
138
144
walletConfig . extension . Name
139
145
) ;
140
146
const homePage = new HomePage ( page ) ;
141
- const [ walletPopup ] = await Promise . all ( [
142
- browser . waitForEvent ( "page" ) ,
143
- homePage . signAndSubmitRBACTxButton . click ( ) ,
144
- ] ) ;
145
147
const walletConfigClone = structuredClone ( walletConfig ) ;
146
148
walletConfigClone . password = "BadPassword" ;
147
- await signWalletPopup ( walletPopup , walletConfigClone , false ) ;
149
+ await signWalletPopup (
150
+ browser ,
151
+ walletConfigClone ,
152
+ homePage . signAndSubmitRBACTxButton ,
153
+ false
154
+ ) ;
148
155
await homePage . assertModal ( ModalName . SignRBACTxUserDeclined ) ;
149
156
}
150
157
) ;
0 commit comments