mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 02:54:20 +00:00
fdf0434133
# Which Problems Are Solved The navigation in the console default settings is flaky. Sometimes it arbitrarily jumps to the organizations page. # How the Problems Are Solved The lifecycle hooks were extended to react differently to changes that come from 'outside' and from the component itself. # Additional Changes The e2e tests are supposed to run against Firefox and Chrome. However they are run twice against Electon. Fixing this revealed the console navigation flakiness that was less visible on Electron. The following issues are also fixed with this PR to reduce flakiness in e2e tests. - The custom command in the pipeline is removed from the e2e action step, so the browser argument is respected. - The npm packages of the e2e tests are updated to their latest version. - Notification tests run against a clean state now so they don't depend on each other anymore. This resolved some flakiness and improved debuggability of the tests. - E2E page load timeout is increased, reducing flakiness. - E2E tests wait on some elements to be enabled before they interact with them, reducing flakiness. # Additional Context - Closes #8404 - Follow-up: https://github.com/zitadel/zitadel/issues/8471 The e2e tests ran three times in a row successfully in the pipeline against both browsers. --------- Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>
67 lines
2.0 KiB
TypeScript
67 lines
2.0 KiB
TypeScript
import { ensureItemDoesntExist, ensureItemExists } from './ensure';
|
|
import { API, Entity } from './types';
|
|
|
|
export function ensureProjectExists(api: API, projectName: string, orgId?: string) {
|
|
return ensureItemExists(
|
|
api,
|
|
`${api.mgmtBaseURL}/projects/_search`,
|
|
(project: any) => project.name === projectName,
|
|
`${api.mgmtBaseURL}/projects`,
|
|
{ name: projectName },
|
|
orgId,
|
|
);
|
|
}
|
|
|
|
export function ensureProjectDoesntExist(api: API, projectName: string, orgId?: string) {
|
|
return ensureItemDoesntExist(
|
|
api,
|
|
`${api.mgmtBaseURL}/projects/_search`,
|
|
(project: any) => project.name === projectName,
|
|
(project) => `${api.mgmtBaseURL}/projects/${project.id}`,
|
|
orgId,
|
|
);
|
|
}
|
|
|
|
class ResourceType {
|
|
constructor(
|
|
public resourcePath: string,
|
|
public compareProperty: string,
|
|
public identifierProperty: string,
|
|
) {}
|
|
}
|
|
|
|
export const Apps = new ResourceType('apps', 'name', 'id');
|
|
export const Roles = new ResourceType('roles', 'key', 'key');
|
|
//export const Grants = new ResourceType('apps', 'name')
|
|
|
|
export function ensureProjectResourceDoesntExist(
|
|
api: API,
|
|
projectId: string,
|
|
resourceType: ResourceType,
|
|
resourceName: string,
|
|
orgId?: string,
|
|
): Cypress.Chainable<null> {
|
|
return ensureItemDoesntExist(
|
|
api,
|
|
`${api.mgmtBaseURL}/projects/${projectId}/${resourceType.resourcePath}/_search`,
|
|
(resource: Entity) => resource[resourceType.compareProperty] === resourceName,
|
|
(resource: Entity) =>
|
|
`${api.mgmtBaseURL}/projects/${projectId}/${resourceType.resourcePath}/${resource[resourceType.identifierProperty]}`,
|
|
orgId,
|
|
);
|
|
}
|
|
|
|
export function ensureRoleExists(api: API, projectId: number, roleName: string) {
|
|
return ensureItemExists(
|
|
api,
|
|
`${api.mgmtBaseURL}/projects/${projectId}/${Roles.resourcePath}/_search`,
|
|
(resource: any) => resource.key === roleName,
|
|
`${api.mgmtBaseURL}/projects/${projectId}/${Roles.resourcePath}`,
|
|
{
|
|
name: roleName,
|
|
roleKey: roleName,
|
|
displayName: roleName,
|
|
},
|
|
);
|
|
}
|