From 5168f51c5b856d626156b6e0e1b97d47236303de Mon Sep 17 00:00:00 2001
From: Jan Cizmar <cizmar@chlupac.com>
Date: Wed, 29 Jan 2025 11:54:13 +0100
Subject: [PATCH] chore: Fix more E2E tests
---
e2e/cypress/common/permissions/keys.ts | 4 ++--
e2e/cypress/common/translations.ts | 33 +++++++++++++++++++++++---
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/e2e/cypress/common/permissions/keys.ts b/e2e/cypress/common/permissions/keys.ts
index fae8750b31..967b87899d 100644
--- a/e2e/cypress/common/permissions/keys.ts
+++ b/e2e/cypress/common/permissions/keys.ts
@@ -4,7 +4,7 @@ import { waitForGlobalLoading } from '../loading';
import { confirmStandard } from '../shared';
import { getCell } from '../state';
import { createTag } from '../tags';
-import { createTranslation, editCell } from '../translations';
+import { createTranslation, editKeyName } from '../translations';
import { getLanguageId, getLanguages, ProjectInfo } from './shared';
export function testKeys(info: ProjectInfo) {
@@ -30,7 +30,7 @@ export function testKeys(info: ProjectInfo) {
cy.focused().type('{esc}', { force: true });
if (scopes.includes('keys.edit')) {
- editCell('key-1', 'new-key');
+ editKeyName('key-1', 'new-key');
createTag('Test tag');
}
diff --git a/e2e/cypress/common/translations.ts b/e2e/cypress/common/translations.ts
index 50a27fc926..37afcc1751 100644
--- a/e2e/cypress/common/translations.ts
+++ b/e2e/cypress/common/translations.ts
@@ -7,7 +7,7 @@ import {
import { HOST } from './constants';
import { ProjectDTO } from '../../../webapp/src/service/response.types';
import { waitForGlobalLoading } from './loading';
-import { assertMessage, dismissMenu, gcyAdvanced } from './shared';
+import { assertMessage, dismissMenu, gcy, gcyAdvanced } from './shared';
import { selectNamespace } from './namespace';
import { buildXpath } from './XpathBuilder';
import Chainable = Cypress.Chainable;
@@ -127,6 +127,25 @@ export const visitTranslations = (projectId: number) => {
return cy.visit(`${HOST}/projects/${projectId}/translations`);
};
+export const editKeyName = (keyName: string, newName?: string) => {
+ getKeyCell(keyName).click();
+
+ // wait for editor to appear
+ cy.gcy('global-editor').should('be.visible');
+ cy.contains(keyName).first().should('be.visible');
+ cy.wait(10);
+
+ if (newName !== undefined) {
+ // select all, delete and type new text
+ gcy('translations-key-edit-key-field')
+ .find('[contenteditable]')
+ .clear()
+ .type(newName);
+ getCellSaveButton().click();
+ waitForGlobalLoading();
+ }
+};
+
export const editCell = (oldValue: string, newValue?: string, save = true) => {
getCell(oldValue).click();
@@ -155,12 +174,20 @@ export function getTranslationEditor() {
.getElement();
}
-export function getTranslationCell(key: string, languageTag: string) {
+function getKeyCellXpath(key: string) {
return buildXpath()
.descendant()
.withDataCy('translations-key-name')
.descendantOrSelf()
- .hasText(key)
+ .hasText(key);
+}
+
+function getKeyCell(key: string) {
+ return getKeyCellXpath(key).getElement();
+}
+
+export function getTranslationCell(key: string, languageTag: string) {
+ return getKeyCellXpath(key)
.closestAncestor()
.withDataCy('translations-row')
.descendant()