TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-01-10 04:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cy10' of github.com:zitadel/zitadel into cy10

Browse Source
This commit is contained in:
Christian Jakob 2022-07-21 17:05:10 +02:00
commit 56283d4e5d
7 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console/cypress/e2e/humans/humans.cy.ts
View File

@ -12,7 +12,7 @@ describe('humans', () => {
beforeEach(() => {
login(user);
cy.visit(humansPath);
cy.get('[data-cy=timestamp]');
cy.get('[data-e2e=timestamp]');
});
describe('add', () => {
@ -23,7 +23,7 @@ describe('humans', () => {
});
it('should add a user', () => {
cy.get('a[href="/users/create"]').click();
cy.get('[data-e2e="create-user-button"]').click();
cy.url().should('contain', 'users/create');
cy.get('[formcontrolname="email"]').type(username('e2ehuman'));
//force needed due to the prefilled username prefix

4
console/cypress/e2e/machines/machines.cy.ts
View File

@ -12,7 +12,7 @@ describe('machines', () => {
beforeEach(() => {
login(user);
cy.visit(machinesPath);
cy.get('[data-cy=timestamp]');
cy.get('[data-e2e=timestamp]');
});
describe('add', () => {
@ -23,7 +23,7 @@ describe('machines', () => {
});
it('should add a machine', () => {
cy.get('a[href="/users/create-machine"]').click();
cy.get('[data-e2e="create-user-button"]').click();
cy.url().should('contain', 'users/create-machine');
//force needed due to the prefilled username prefix
cy.get('[formcontrolname="userName"]').type(testMachineUserNameAdd, { force: true });

2
console/cypress/e2e/permissions/permissions.cy.ts
View File

@ -24,7 +24,7 @@ describe('permissions', () => {
api = apiCalls
ensureProjectExists(apiCalls, testProjectName).then(projId => {
projectId = projId
cy.visit(`${Cypress.env('baseUrl')}/ui/console/projects/${projId}`)
cy.visit(`${Cypress.env('baseUrl')}/ui/console/projects/${projId}?id=roles`)
})
})
})

7
console/cypress/e2e/projects/projects.cy.ts
View File

@ -42,10 +42,10 @@ describe('projects', () => {
it('removes the project', () => {
cy.get('[data-e2e=toggle-grid]').click();
cy.get('[data-cy=timestamp]');
cy.get('[data-e2e=timestamp]');
cy.contains('tr', testProjectNameDeleteList, { timeout: 1000 })
.find('[data-e2e=delete-project-button]')
.click({ force: true });
.find('[data-e2e=table-actions-button]')
.click({force: true});
cy.get('[e2e-data="confirm-dialog-button"]').click();
cy.get('.data-e2e-success');
cy.wait(200);
@ -66,6 +66,7 @@ describe('projects', () => {
.find('[data-e2e=delete-project-button]')
.trigger('mouseover')
.click();
cy.get('[e2e-data="confirm-dialog-input"]').type(testProjectNameDeleteGrid);
cy.get('[e2e-data="confirm-dialog-button"]').click();
cy.get('.data-e2e-success');
cy.wait(200);

2
console/src/app/modules/paginator/paginator.component.html
View File

@ -3,7 +3,7 @@
<p class="length">
<span>{{ length }} </span>{{ 'PAGINATOR.COUNT' | translate }}
</p>
<p class="ts cnsl-secondary-text" *ngIf="timestamp">
<p class="ts cnsl-secondary-text" *ngIf="timestamp" [attr.data-e2e]="'timestamp'">
{{ timestamp | timestampToDate | localizedDate: 'EEEE dd. MMM YYYY, HH:mm' }}
</p>
</div>

3
console/src/app/modules/table-actions/table-actions.component.html
View File

@ -3,7 +3,8 @@
<ng-content select="[hoverActions]"></ng-content>
<ng-content select="[actions]"></ng-content>
<button (click)="$event.stopPropagation()" *ngIf="hasActions" class="table-actions-trigger" mat-icon-button
[matMenuTriggerFor]="actions">
[matMenuTriggerFor]="actions"
[attr.data-e2e]="'table-actions-button'">
<mat-icon>more_horiz</mat-icon>
</button>

5
console/src/app/pages/users/user-list/user-table/user-table.component.html
View File

@ -9,10 +9,10 @@
[showBorder]="true"
>
<div leftActions class="user-table-left-actions">
<button class="type-button" [ngClass]="{ active: type === Type.TYPE_HUMAN }" (click)="setType(Type.TYPE_HUMAN)">
<button class="type-button" [ngClass]="{ active: type === Type.TYPE_HUMAN }" (click)="setType(Type.TYPE_HUMAN)" [attr.data-e2e]="'list-humans'">
{{ 'USER.TABLE.TYPES.HUMAN' | translate }}
</button>
<button class="type-button" [ngClass]="{ active: type === Type.TYPE_MACHINE }" (click)="setType(Type.TYPE_MACHINE)">
<button class="type-button" [ngClass]="{ active: type === Type.TYPE_MACHINE }" (click)="setType(Type.TYPE_MACHINE)" [attr.data-e2e]="'list-machines'">
{{ 'USER.TABLE.TYPES.MACHINE' | translate }}
</button>
</div>
@ -52,6 +52,7 @@
mat-raised-button
[disabled]="!canWrite"
class="cnsl-action-button"
[attr.data-e2e]="'create-user-button'"
>
<mat-icon class="icon">add</mat-icon>
<span>{{ 'ACTIONS.NEW' | translate }}</span>