Skip to content

Commit 748ed7c

Browse files
committed
fix: e2e tests
1 parent 6c0d03b commit 748ed7c

File tree

3 files changed

+31
-4
lines changed

3 files changed

+31
-4
lines changed

test/data/confirmations/typed_sign.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export const seaportSignatureMsg = {
203203
networkClientId: 'mainnet',
204204
securityAlertResponse: {
205205
result_type: 'loading',
206-
reason: 'CheckingChain',
206+
reason: 'validation_in_progress',
207207
securityAlertId: 'def3b0ef-c96b-4c87-b1b1-c69cc02a0f78',
208208
},
209209
status: 'unapproved',

test/e2e/tests/confirmations/signatures/signature-helpers.ts

+25-2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ type AssertSignatureMetricsOptions = {
3939
withAnonEvents?: boolean;
4040
securityAlertReason?: string;
4141
securityAlertResponse?: string;
42+
securityAlertSource?: string;
4243
decodingChangeTypes?: string[];
4344
decodingResponse?: string;
4445
decodingDescription?: string | null;
@@ -52,6 +53,7 @@ type SignatureEventProperty = {
5253
locale: 'en';
5354
security_alert_reason: string;
5455
security_alert_response: string;
56+
security_alert_source?: string;
5557
signature_type: string;
5658
eip712_primary_type?: string;
5759
decoding_change_types?: string[];
@@ -83,6 +85,7 @@ export async function initializePages(driver: Driver) {
8385
* @param uiCustomizations
8486
* @param securityAlertReason
8587
* @param securityAlertResponse
88+
* @param securityAlertSource
8689
* @param decodingChangeTypes
8790
* @param decodingResponse
8891
* @param decodingDescription
@@ -93,6 +96,7 @@ function getSignatureEventProperty(
9396
uiCustomizations: string[],
9497
securityAlertReason: string = BlockaidReason.inProgress,
9598
securityAlertResponse: string = BlockaidResultType.Loading,
99+
securityAlertSource: string = 'api',
96100
decodingChangeTypes?: string[],
97101
decodingResponse?: string,
98102
decodingDescription?: string | null,
@@ -106,6 +110,7 @@ function getSignatureEventProperty(
106110
locale: 'en',
107111
security_alert_reason: securityAlertReason,
108112
security_alert_response: securityAlertResponse,
113+
security_alert_source: securityAlertSource,
109114
ui_customizations: uiCustomizations,
110115
};
111116

@@ -118,6 +123,7 @@ function getSignatureEventProperty(
118123
signatureEventProperty.decoding_response = decodingResponse;
119124
signatureEventProperty.decoding_description = decodingDescription;
120125
}
126+
121127
return signatureEventProperty;
122128
}
123129

@@ -150,6 +156,7 @@ export async function assertSignatureConfirmedMetrics({
150156
withAnonEvents = false,
151157
securityAlertReason,
152158
securityAlertResponse,
159+
securityAlertSource,
153160
decodingChangeTypes,
154161
decodingResponse,
155162
decodingDescription,
@@ -161,6 +168,7 @@ export async function assertSignatureConfirmedMetrics({
161168
uiCustomizations,
162169
securityAlertReason,
163170
securityAlertResponse,
171+
securityAlertSource,
164172
decodingChangeTypes,
165173
decodingResponse,
166174
decodingDescription,
@@ -197,6 +205,7 @@ export async function assertSignatureRejectedMetrics({
197205
withAnonEvents = false,
198206
securityAlertReason,
199207
securityAlertResponse,
208+
securityAlertSource,
200209
decodingChangeTypes,
201210
decodingResponse,
202211
decodingDescription,
@@ -208,6 +217,7 @@ export async function assertSignatureRejectedMetrics({
208217
uiCustomizations,
209218
securityAlertReason,
210219
securityAlertResponse,
220+
securityAlertSource,
211221
decodingChangeTypes,
212222
decodingResponse,
213223
decodingDescription,
@@ -264,7 +274,7 @@ function assertEventPropertiesMatch(
264274

265275
compareDecodingAPIResponse(actualProperties, expectedProps, eventName);
266276

267-
compareSecurityAlertResponse(actualProperties, expectedProps, eventName);
277+
compareSecurityAlertProperties(actualProperties, expectedProps, eventName);
268278

269279
assert(event, `${eventName} event not found`);
270280
assert.deepStrictEqual(
@@ -274,7 +284,7 @@ function assertEventPropertiesMatch(
274284
);
275285
}
276286

277-
function compareSecurityAlertResponse(
287+
function compareSecurityAlertProperties(
278288
actualProperties: Record<string, unknown>,
279289
expectedProperties: Record<string, unknown>,
280290
eventName: string,
@@ -296,6 +306,19 @@ function compareSecurityAlertResponse(
296306
delete actualProperties.security_alert_response;
297307
delete expectedProperties.security_alert_response;
298308
}
309+
310+
if (expectedProperties.security_alert_source) {
311+
if (
312+
actualProperties.security_alert_source !== 'api' &&
313+
expectedProperties.security_alert_source !== 'api'
314+
) {
315+
assert.fail(
316+
`${eventName} event properties do not match: security_alert_source is ${actualProperties.security_alert_source}`,
317+
);
318+
}
319+
delete actualProperties.security_alert_source;
320+
delete expectedProperties.security_alert_source;
321+
}
299322
}
300323

301324
function compareDecodingAPIResponse(

test/e2e/tests/metrics/signature-approved.spec.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const expectedEventPropertiesBase = {
5252
locale: 'en',
5353
chain_id: '0x539',
5454
environment_type: 'background',
55-
security_alert_reason: 'CheckingChain',
55+
security_alert_reason: 'validation_in_progress',
5656
security_alert_response: 'loading',
5757
ui_customizations: ['redesigned_confirmation'],
5858
};
@@ -94,6 +94,7 @@ describe('Signature Approved Event', function () {
9494
signature_type: 'eth_signTypedData_v4',
9595
eip712_primary_type: 'Mail',
9696
security_alert_response: 'Benign',
97+
security_alert_source: 'api',
9798
});
9899
},
99100
);
@@ -133,6 +134,7 @@ describe('Signature Approved Event', function () {
133134
...expectedEventPropertiesBase,
134135
signature_type: 'eth_signTypedData_v3',
135136
security_alert_response: 'Benign',
137+
security_alert_source: 'api',
136138
});
137139
},
138140
);
@@ -172,6 +174,7 @@ describe('Signature Approved Event', function () {
172174
...expectedEventPropertiesBase,
173175
signature_type: 'eth_signTypedData',
174176
security_alert_response: 'Benign',
177+
security_alert_source: 'api',
175178
});
176179
},
177180
);
@@ -211,6 +214,7 @@ describe('Signature Approved Event', function () {
211214
...expectedEventPropertiesBase,
212215
signature_type: 'personal_sign',
213216
security_alert_response: 'Benign',
217+
security_alert_source: 'api',
214218
});
215219
},
216220
);

0 commit comments

Comments
 (0)