test: resolve merge conflicts
This commit is contained in:
@@ -281,7 +281,6 @@ test.describe('Role management page', () => {
|
||||
const modal = await adminRolesPage.clickDeleteRole(row);
|
||||
await modal.deleteButton.click();
|
||||
await expect(modal.deleteAlert).toHaveCount(1);
|
||||
await adminRolesPage.closeSnackbar();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -61,7 +61,6 @@ test.describe('User management page', () => {
|
||||
'snackbar-edit-user-success'
|
||||
);
|
||||
await expect(snackbar.variant).toBe('success');
|
||||
await adminUsersPage.closeSnackbar();
|
||||
|
||||
await adminUsersPage.findUserPageWithEmail(user.email);
|
||||
userRow = await adminUsersPage.getUserRowByEmail(user.email);
|
||||
@@ -79,8 +78,6 @@ test.describe('User management page', () => {
|
||||
'snackbar-delete-user-success'
|
||||
);
|
||||
await expect(snackbar.variant).toBe('success');
|
||||
await adminUsersPage.closeSnackbar();
|
||||
await expect(userRow).not.toBeVisible(false);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -115,8 +112,6 @@ test.describe('User management page', () => {
|
||||
);
|
||||
await expect(snackbar).not.toBeNull();
|
||||
await expect(snackbar.variant).toBe('success');
|
||||
await adminUsersPage.closeSnackbar();
|
||||
await expect(userRow).not.toBeVisible(false);
|
||||
});
|
||||
|
||||
await test.step('Create the user again', async () => {
|
||||
|
||||
Reference in New Issue
Block a user