Skip to content

fix: user-storage related E2Es mock setup #39632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mathieuartu wants to merge 12 commits into
base: main
Choose a base branch
from
+52 −52
Open

fix: user-storage related E2Es mock setup #39632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
19389d7
fix: try to remove flakyness from user-storage related E2Es
mathieuartu Jan 29, 2026
6f37e58
fix: tentative
mathieuartu Jan 29, 2026
1552271
fix: add console logs
mathieuartu Jan 29, 2026
dc6c3c0
fix: revert add-wallet and re-trigger CI run
mathieuartu Jan 29, 2026
c2cde9d
fix: add more logs
mathieuartu Jan 29, 2026
c90de61
Merge branch 'main' into fix/user-storage-e2e-flakes
mathieuartu Jan 29, 2026
18df6f1
fix: relaunch CI
mathieuartu Jan 29, 2026
f084384
fix: clean up
mathieuartu Jan 29, 2026
d9f63b0
fix: revert unnecessary change
mathieuartu Jan 29, 2026
d16a196
fix: cursor feedback
mathieuartu Jan 30, 2026
1165662
fix: add more logs
mathieuartu Jan 30, 2026
83ac9d2
Merge branch 'main' into fix/user-storage-e2e-flakes
mathieuartu Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions test/e2e/helpers/identity/user-storage/userStorageMockttpController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
request: Pick<CompletedRequest, 'path' | 'headers'>,
statusCode: number = 200,
) => {
// #region agent log
console.log(`[SYNC_DEBUG:onGet] path=${path}, url=${request.path}`);
// #endregion
Copy link

@cursor cursor bot Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debug console.log statements accidentally committed

Low Severity

Multiple console.log statements with [SYNC_DEBUG:...] prefixes wrapped in // #region agent log comments have been added across several files. These appear to be temporary debugging statements used during development that were not removed before committing. The coding guidelines specify to remove console.logs before committing.

Additional Locations (2)

Fix in Cursor Fix in Web

const srpIdentifier = getSrpIdentifierFromHeaders(request.headers);
const internalPathData = this.paths.get(path);

Expand Down Expand Up @@ -154,6 +157,9 @@
request: Pick<CompletedRequest, 'path' | 'body' | 'headers'>,
statusCode: number = 204,
) => {
// #region agent log
console.log(`[SYNC_DEBUG:onPut] path=${path}, url=${request.path}`);
// #endregion
const srpIdentifier = getSrpIdentifierFromHeaders(request.headers);
const isFeatureEntry = determineIfFeatureEntryFromURL(request.path);

Expand Down Expand Up @@ -330,6 +336,15 @@
},
) => {
const previouslySetupPath = this.paths.get(path);
// #region agent log
const hadPreviousData = !!previouslySetupPath;

Check failure on line 340 in test/e2e/helpers/identity/user-storage/userStorageMockttpController.ts

View workflow job for this annotation

GitHub Actions / test-lint / Test lint 

use `Boolean(previouslySetupPath)` instead
const previousResponseCount = previouslySetupPath?.response?.length ?? 0;
const newResponseCount =
overrides?.getResponse?.length ?? previousResponseCount;
console.log(
`[SYNC_DEBUG:setupPath] path=${path}, hadPreviousData=${hadPreviousData}, previousResponseCount=${previousResponseCount}, newResponseCount=${newResponseCount}`,
);
// #endregion

this.paths.set(path, {
response: overrides?.getResponse || previouslySetupPath?.response || [],
Expand Down Expand Up @@ -357,5 +372,8 @@
.thenCallback((request) =>
this.onDelete(path, request, overrides?.deleteStatusCode),
);
// #region agent log
console.log(`[SYNC_DEBUG:setupPath] Handlers registered for path=${path}`);
// #endregion
};
}
17 changes: 17 additions & 0 deletions test/e2e/page-objects/pages/home/homepage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,26 @@ class HomePage {
);
await this.driver.delay(POST_UNLOCK_DELAY);
console.log('Check if account syncing has synced at least once');
// #region agent log
let pollCount = 0;
// #endregion
await this.driver.waitUntil(
async () => {
const uiState = await getCleanAppState(this.driver);
// #region agent log
pollCount += 1;
const syncState =
uiState?.metamask?.hasAccountTreeSyncingSyncedAtLeastOnce;
const isSignedIn = uiState?.metamask?.isSignedIn;
const isUnlocked = uiState?.metamask?.isUnlocked;
const isBackupAndSyncEnabled =
uiState?.metamask?.isBackupAndSyncEnabled;
const isAccountSyncingEnabled =
uiState?.metamask?.isAccountSyncingEnabled;
console.log(
`[SYNC_DEBUG:poll#${pollCount}] syncState=${syncState}, isSignedIn=${isSignedIn}, isUnlocked=${isUnlocked}, isBackupAndSyncEnabled=${isBackupAndSyncEnabled}, isAccountSyncingEnabled=${isAccountSyncingEnabled}`,
);
// #endregion
// Check for nullish, as the state we might seems to be `null` sometimes.
return (
uiState?.metamask?.hasAccountTreeSyncingSyncedAtLeastOnce === true
Expand Down
69 changes: 17 additions & 52 deletions test/e2e/tests/identity/mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,46 +31,22 @@ export async function mockIdentityServices(
mockAPICall(server, AuthMocks.getMockAuthAccessTokenResponse());

// Storage
if (
!userStorageMockttpControllerInstance?.paths.get(
USER_STORAGE_FEATURE_NAMES.accounts,
)
) {
userStorageMockttpControllerInstance.setupPath(
USER_STORAGE_FEATURE_NAMES.accounts,
server,
);
}
if (
!userStorageMockttpControllerInstance?.paths.get(
USER_STORAGE_FEATURE_NAMES.addressBook,
)
) {
userStorageMockttpControllerInstance.setupPath(
USER_STORAGE_FEATURE_NAMES.addressBook,
server,
);
}
if (
!userStorageMockttpControllerInstance?.paths.get(
USER_STORAGE_WALLETS_FEATURE_KEY,
)
) {
userStorageMockttpControllerInstance.setupPath(
USER_STORAGE_WALLETS_FEATURE_KEY,
server,
);
}
if (
!userStorageMockttpControllerInstance?.paths.get(
USER_STORAGE_GROUPS_FEATURE_KEY,
)
) {
userStorageMockttpControllerInstance.setupPath(
USER_STORAGE_GROUPS_FEATURE_KEY,
server,
);
}
userStorageMockttpControllerInstance.setupPath(
USER_STORAGE_FEATURE_NAMES.accounts,
server,
);
userStorageMockttpControllerInstance.setupPath(
USER_STORAGE_FEATURE_NAMES.addressBook,
server,
);
userStorageMockttpControllerInstance.setupPath(
USER_STORAGE_WALLETS_FEATURE_KEY,
server,
);
userStorageMockttpControllerInstance.setupPath(
USER_STORAGE_GROUPS_FEATURE_KEY,
server,
);
}

export const MOCK_SRP_E2E_IDENTIFIER_BASE_KEY = 'MOCK_SRP_IDENTIFIER';
Expand Down Expand Up @@ -163,17 +139,6 @@ export async function mockInfuraAndAccountSync(
): Promise<void> {
const accounts = options.accountsToMockBalances ?? [];

// Set up User Storage / Account Sync mock
userStorageMockttpController.setupPath(
USER_STORAGE_WALLETS_FEATURE_KEY,
mockServer,
);

userStorageMockttpController.setupPath(
USER_STORAGE_GROUPS_FEATURE_KEY,
mockServer,
);

// Account Balances
if (accounts.length > 0) {
accounts.forEach((account) => {
Expand All @@ -195,7 +160,7 @@ export async function mockInfuraAndAccountSync(
});
}

mockIdentityServices(mockServer, userStorageMockttpController);
await mockIdentityServices(mockServer, userStorageMockttpController);
}

/**
Expand Down
Loading