From 8fd6a1cb821f62abdc5609b82e62625f8910ad54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Gran=C3=A1t?= Date: Fri, 20 Sep 2024 16:56:56 +0200 Subject: [PATCH] chore: fix e2e tests --- .../testDataBuilder/data/PermissionsTestData.kt | 8 ++++++++ .../development/testDataBuilder/data/TaskTestData.kt | 1 + .../data/src/main/kotlin/io/tolgee/model/enums/Scope.kt | 2 +- .../internal/e2eData/PermissionsE2eDataController.kt | 4 +++- .../projects/permissions/permissionsServerAdmin.1.cy.ts | 4 ++-- .../projects/permissions/permissionsServerAdmin.2.cy.ts | 4 ++-- .../projects/permissions/permissionsServerAdmin.3.cy.ts | 4 ++-- .../e2e/projects/permissions/permissionsTask.cy.ts | 3 ++- 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/PermissionsTestData.kt b/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/PermissionsTestData.kt index 8b0ed53ab1..35656b72c5 100644 --- a/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/PermissionsTestData.kt +++ b/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/PermissionsTestData.kt @@ -17,6 +17,7 @@ class PermissionsTestData { var projectBuilder: ProjectBuilder var organizationBuilder: OrganizationBuilder var admin: UserAccountBuilder + var serverAdmin: UserAccountBuilder lateinit var addedProject: Project lateinit var englishLanguage: Language lateinit var keys: List @@ -24,6 +25,13 @@ class PermissionsTestData { val root: TestDataBuilder = TestDataBuilder().apply { admin = addUserAccount { username = "admin@admin.com" } + + serverAdmin = addUserAccount { + username = "Server admin" + name = "Server admin" + role = UserAccount.Role.ADMIN + } + organizationBuilder = admin.defaultOrganizationBuilder val member = addUserAccount { username = "member@member.com" } diff --git a/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/TaskTestData.kt b/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/TaskTestData.kt index a41d8ea8cc..b3c0cbcd78 100644 --- a/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/TaskTestData.kt +++ b/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/TaskTestData.kt @@ -2,6 +2,7 @@ package io.tolgee.development.testDataBuilder.data import io.tolgee.development.testDataBuilder.builders.* import io.tolgee.model.Language +import io.tolgee.model.UserAccount import io.tolgee.model.enums.OrganizationRoleType import io.tolgee.model.enums.ProjectPermissionType import io.tolgee.model.enums.Scope diff --git a/backend/data/src/main/kotlin/io/tolgee/model/enums/Scope.kt b/backend/data/src/main/kotlin/io/tolgee/model/enums/Scope.kt index cb37938dcc..3e31992d44 100644 --- a/backend/data/src/main/kotlin/io/tolgee/model/enums/Scope.kt +++ b/backend/data/src/main/kotlin/io/tolgee/model/enums/Scope.kt @@ -46,7 +46,7 @@ enum class Scope( private val translationsView = HierarchyItem(TRANSLATIONS_VIEW, listOf(keysView)) private val screenshotsView = HierarchyItem(SCREENSHOTS_VIEW, listOf(keysView)) private val translationsEdit = HierarchyItem(TRANSLATIONS_EDIT, listOf(translationsView)) - private val tasksView = HierarchyItem(TASKS_VIEW) + private val tasksView = HierarchyItem(TASKS_VIEW, listOf(translationsView)) val hierarchy = HierarchyItem( diff --git a/backend/development/src/main/kotlin/io/tolgee/controllers/internal/e2eData/PermissionsE2eDataController.kt b/backend/development/src/main/kotlin/io/tolgee/controllers/internal/e2eData/PermissionsE2eDataController.kt index 3a8469842f..2049a8fce9 100644 --- a/backend/development/src/main/kotlin/io/tolgee/controllers/internal/e2eData/PermissionsE2eDataController.kt +++ b/backend/development/src/main/kotlin/io/tolgee/controllers/internal/e2eData/PermissionsE2eDataController.kt @@ -37,7 +37,9 @@ class PermissionsE2eDataController() : AbstractE2eDataController() { translateLanguageTags = translateLanguageTags, stateChangeLanguageTags = stateChangeLanguageTags, ) - this.permissionsTestData.addTasks(mutableSetOf(user)) + this.permissionsTestData.addTasks( + mutableSetOf(user, permissionsTestData.serverAdmin.self) + ) return generate() } diff --git a/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.1.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.1.cy.ts index 3bc0e0ef96..ff72f9628f 100644 --- a/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.1.cy.ts +++ b/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.1.cy.ts @@ -13,10 +13,10 @@ import { } from '../../../common/shared'; describe('Server admin 1', { retries: { runMode: 5 } }, () => { - it('admin', () => { + it('Server admin', () => { visitProjectWithPermissions({ scopes: ['admin'] }).then((projectInfo) => { // login as admin - login('admin', 'admin'); + login('Server admin', 'admin'); // check that admin has no warning banner on his home page switchToOrganization('admin'); diff --git a/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.2.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.2.cy.ts index 79f19ca774..18ae5a2a6e 100644 --- a/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.2.cy.ts +++ b/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.2.cy.ts @@ -7,10 +7,10 @@ import { } from '../../../common/permissions/main'; describe('Server admin 2', () => { - it('admin', () => { + it('Server admin', () => { visitProjectWithPermissions({ scopes: ['admin'] }).then((projectInfo) => { // login as admin - login('admin', 'admin'); + login('Server admin', 'admin'); checkPermissions(projectInfo, { 'project-menu-item-dashboard': SKIP, 'project-menu-item-translations': RUN, diff --git a/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.3.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.3.cy.ts index 854bd177f6..39b813da13 100644 --- a/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.3.cy.ts +++ b/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.3.cy.ts @@ -7,10 +7,10 @@ import { } from '../../../common/permissions/main'; describe('Server admin 3', () => { - it('admin', () => { + it('Server admin', () => { visitProjectWithPermissions({ scopes: ['admin'] }).then((projectInfo) => { // login as admin - login('admin', 'admin'); + login('Server admin', 'admin'); checkPermissions(projectInfo, { 'project-menu-item-dashboard': SKIP, 'project-menu-item-translations': SKIP, diff --git a/e2e/cypress/e2e/projects/permissions/permissionsTask.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsTask.cy.ts index 55cf26cdb9..9c1174a4c8 100644 --- a/e2e/cypress/e2e/projects/permissions/permissionsTask.cy.ts +++ b/e2e/cypress/e2e/projects/permissions/permissionsTask.cy.ts @@ -11,6 +11,7 @@ describe('Permissions task', () => { checkPermissions(projectInfo, { 'project-menu-item-dashboard': RUN, 'project-menu-item-translations': RUN, + 'project-menu-item-tasks': RUN, 'project-menu-item-export': RUN, 'project-menu-item-integrate': RUN, }); @@ -24,7 +25,7 @@ describe('Permissions task', () => { checkPermissions(projectInfo, { 'project-menu-item-dashboard': RUN, 'project-menu-item-translations': RUN, - 'project-menu-item-import': RUN, + 'project-menu-item-tasks': RUN, 'project-menu-item-export': RUN, 'project-menu-item-integrate': RUN, });