E2E: Batch operation permission testing needs namespaces enabled

tolgee · Dec 17, 2024 · 7c84bf5 · 7c84bf5
1 parent 2395ced
commit 7c84bf5
Show file tree

Hide file tree

Showing 16 changed files with 133 additions and 97 deletions.
diff --git a/...nd/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/PermissionsTestData.kt b/...nd/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/PermissionsTestData.kt
@@ -97,6 +97,7 @@ class PermissionsTestData {
     translateLanguageTags: List<String>? = null,
     stateChangeLanguageTags: List<String>? = null,
     organizationBaseScopes: List<Scope>? = null,
+    useNamespaces: Boolean = false,
   ): UserAccount {
     val me =
       root.addUserAccount {
@@ -114,6 +115,8 @@ class PermissionsTestData {
       }
     }
 
+    projectBuilder.self.useNamespaces = useNamespaces
+
     if (organizationBaseScopes != null) {
       organizationBuilder.self.basePermission.type = null
       organizationBuilder.self.basePermission.scopes = organizationBaseScopes.toTypedArray()

diff --git a/...nt/src/main/kotlin/io/tolgee/controllers/internal/e2eData/PermissionsE2eDataController.kt b/...nt/src/main/kotlin/io/tolgee/controllers/internal/e2eData/PermissionsE2eDataController.kt
@@ -28,6 +28,7 @@ class PermissionsE2eDataController() : AbstractE2eDataController() {
     @RequestParam viewLanguageTags: List<String>?,
     @RequestParam translateLanguageTags: List<String>?,
     @RequestParam stateChangeLanguageTags: List<String>?,
+    @RequestParam useNamespaces: Boolean = false,
   ): StandardTestDataResult {
     val user =
       this.permissionsTestData.addUserWithPermissions(
@@ -36,6 +37,7 @@ class PermissionsE2eDataController() : AbstractE2eDataController() {
         viewLanguageTags = viewLanguageTags,
         translateLanguageTags = translateLanguageTags,
         stateChangeLanguageTags = stateChangeLanguageTags,
+        useNamespaces = useNamespaces,
       )
     this.permissionsTestData.addTasks(
       mutableSetOf(user, permissionsTestData.serverAdmin.self),

diff --git a/e2e/cypress/common/apiCalls/testData/testData.ts b/e2e/cypress/common/apiCalls/testData/testData.ts
@@ -126,13 +126,14 @@ export type PermissionsOptions = {
 };
 
 export const generatePermissionsData = {
-  generate: (options: Partial<PermissionsOptions>) => {
+  generate: (options: Partial<PermissionsOptions>, useNamespaces = false) => {
     const params = new URLSearchParams();
     Object.entries(options).forEach(([key, values]) => {
       values.forEach((value) => {
         params.append(key, value);
       });
     });
+    params.append('useNamespaces', String(useNamespaces));
     return internalFetch(
       `e2e-data/permissions/generate-with-user?${params.toString()}`
     );

diff --git a/e2e/cypress/common/permissions/main.ts b/e2e/cypress/common/permissions/main.ts
@@ -88,12 +88,13 @@ export function loginAndGetInfo(user: UserMail, projectId: number) {
 
 export function visitProjectWithPermissions(
   options: Partial<PermissionsOptions>,
+  useNamespaces = false,
   user: UserMail = '[email protected]'
 ): Promise<ProjectInfo> {
   return new Cypress.Promise<ProjectInfo>((resolve) => {
     generatePermissionsData
       .clean()
-      .then(() => generatePermissionsData.generate(options))
+      .then(() => generatePermissionsData.generate(options, useNamespaces))
       .then((res) => {
         return res.body.projects[0].id;
       })

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsAdmin.2.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsAdmin.2.cy.ts
@@ -7,19 +7,21 @@ import {
 
 describe('Permissions admin 2', () => {
   it('admin', () => {
-    visitProjectWithPermissions({ scopes: ['admin'] }).then((projectInfo) => {
-      checkPermissions(projectInfo, {
-        'project-menu-item-dashboard': SKIP,
-        'project-menu-item-translations': RUN,
-        'project-menu-item-tasks': SKIP,
-        'project-menu-item-settings': SKIP,
-        'project-menu-item-languages': SKIP,
-        'project-menu-item-members': SKIP,
-        'project-menu-item-import': SKIP,
-        'project-menu-item-export': SKIP,
-        'project-menu-item-developer': SKIP,
-        'project-menu-item-integrate': SKIP,
-      });
-    });
+    visitProjectWithPermissions({ scopes: ['admin'] }, true).then(
+      (projectInfo) => {
+        checkPermissions(projectInfo, {
+          'project-menu-item-dashboard': SKIP,
+          'project-menu-item-translations': RUN,
+          'project-menu-item-tasks': SKIP,
+          'project-menu-item-settings': SKIP,
+          'project-menu-item-languages': SKIP,
+          'project-menu-item-members': SKIP,
+          'project-menu-item-import': SKIP,
+          'project-menu-item-export': SKIP,
+          'project-menu-item-developer': SKIP,
+          'project-menu-item-integrate': SKIP,
+        });
+      }
+    );
   });
 });
diff --git a/e2e/cypress/e2e/projects/permissions/permissionsBatchJobs.1.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsBatchJobs.1.cy.ts
@@ -7,9 +7,12 @@ import {
 
 describe('Batch jobs permissions 1', () => {
   it('translations.batch-machine', () => {
-    visitProjectWithPermissions({
-      scopes: ['translations.batch-machine'],
-    }).then((projectInfo) => {
+    visitProjectWithPermissions(
+      {
+        scopes: ['translations.batch-machine'],
+      },
+      true
+    ).then((projectInfo) => {
       checkPermissions(projectInfo, {
         'project-menu-item-dashboard': RUN,
         'project-menu-item-translations': RUN,

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsBatchJobs.2.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsBatchJobs.2.cy.ts
@@ -7,9 +7,12 @@ import {
 
 describe('Batch jobs permissions 2', () => {
   it('translations.batch-by-mt', () => {
-    visitProjectWithPermissions({
-      scopes: ['translations.batch-by-tm'],
-    }).then((projectInfo) => {
+    visitProjectWithPermissions(
+      {
+        scopes: ['translations.batch-by-tm'],
+      },
+      true
+    ).then((projectInfo) => {
       checkPermissions(projectInfo, {
         'project-menu-item-dashboard': RUN,
         'project-menu-item-translations': RUN,

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsKeys.1.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsKeys.1.cy.ts
@@ -7,7 +7,7 @@ import {
 
 describe('Keys permissions 1', () => {
   it('screenshots.view', { retries: { runMode: 3 } }, () => {
-    visitProjectWithPermissions({ scopes: ['screenshots.view'] }).then(
+    visitProjectWithPermissions({ scopes: ['screenshots.view'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': SKIP,
@@ -19,7 +19,7 @@ describe('Keys permissions 1', () => {
   });
 
   it('screenshots.upload', { retries: { runMode: 3 } }, () => {
-    visitProjectWithPermissions({ scopes: ['screenshots.upload'] }).then(
+    visitProjectWithPermissions({ scopes: ['screenshots.upload'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': RUN,
@@ -31,7 +31,7 @@ describe('Keys permissions 1', () => {
   });
 
   it('screenshots.delete', () => {
-    visitProjectWithPermissions({ scopes: ['screenshots.delete'] }).then(
+    visitProjectWithPermissions({ scopes: ['screenshots.delete'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': SKIP,
@@ -43,7 +43,7 @@ describe('Keys permissions 1', () => {
   });
 
   it('keys.view', () => {
-    visitProjectWithPermissions({ scopes: ['keys.view'] }).then(
+    visitProjectWithPermissions({ scopes: ['keys.view'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': RUN,

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsKeys.2.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsKeys.2.cy.ts
@@ -7,7 +7,7 @@ import {
 
 describe('Keys permissions 2', () => {
   it('keys.edit', () => {
-    visitProjectWithPermissions({ scopes: ['keys.edit'] }).then(
+    visitProjectWithPermissions({ scopes: ['keys.edit'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': SKIP,
@@ -19,7 +19,7 @@ describe('Keys permissions 2', () => {
   });
 
   it('keys.delete', () => {
-    visitProjectWithPermissions({ scopes: ['keys.delete'] }).then(
+    visitProjectWithPermissions({ scopes: ['keys.delete'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': SKIP,
@@ -31,7 +31,7 @@ describe('Keys permissions 2', () => {
   });
 
   it('keys.create', () => {
-    visitProjectWithPermissions({ scopes: ['keys.create'] }).then(
+    visitProjectWithPermissions({ scopes: ['keys.create'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': SKIP,

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsPerLanguage.1.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsPerLanguage.1.cy.ts
@@ -6,10 +6,13 @@ import {
 
 describe('Permissions per language 1', () => {
   it('translations.view', () => {
-    visitProjectWithPermissions({
-      scopes: ['translations.view'],
-      viewLanguageTags: ['en', 'de'],
-    }).then((projectInfo) => {
+    visitProjectWithPermissions(
+      {
+        scopes: ['translations.view'],
+        viewLanguageTags: ['en', 'de'],
+      },
+      true
+    ).then((projectInfo) => {
       checkPermissions(projectInfo, {
         'project-menu-item-dashboard': RUN,
         'project-menu-item-translations': RUN,
@@ -20,10 +23,13 @@ describe('Permissions per language 1', () => {
   });
 
   it('translations.edit', () => {
-    visitProjectWithPermissions({
-      scopes: ['translations.edit'],
-      translateLanguageTags: ['de'],
-    }).then((projectInfo) => {
+    visitProjectWithPermissions(
+      {
+        scopes: ['translations.edit'],
+        translateLanguageTags: ['de'],
+      },
+      true
+    ).then((projectInfo) => {
       checkPermissions(projectInfo, {
         'project-menu-item-dashboard': RUN,
         'project-menu-item-translations': RUN,

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsPerLanguage.2.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsPerLanguage.2.cy.ts
@@ -6,10 +6,13 @@ import {
 
 describe('Permissions per language 2', () => {
   it('translations.state-edit', () => {
-    visitProjectWithPermissions({
-      scopes: ['translations.view', 'translations.state-edit'],
-      stateChangeLanguageTags: ['de'],
-    }).then((projectInfo) => {
+    visitProjectWithPermissions(
+      {
+        scopes: ['translations.view', 'translations.state-edit'],
+        stateChangeLanguageTags: ['de'],
+      },
+      true
+    ).then((projectInfo) => {
       checkPermissions(projectInfo, {
         'project-menu-item-dashboard': RUN,
         'project-menu-item-translations': RUN,
@@ -20,11 +23,14 @@ describe('Permissions per language 2', () => {
   });
 
   it('combined translations.edit and translations.state-edit', () => {
-    visitProjectWithPermissions({
-      scopes: ['translations.edit', 'translations.state-edit'],
-      translateLanguageTags: ['cs'],
-      stateChangeLanguageTags: ['de'],
-    }).then((projectInfo) => {
+    visitProjectWithPermissions(
+      {
+        scopes: ['translations.edit', 'translations.state-edit'],
+        translateLanguageTags: ['cs'],
+        stateChangeLanguageTags: ['de'],
+      },
+      true
+    ).then((projectInfo) => {
       checkPermissions(projectInfo, {
         'project-menu-item-dashboard': RUN,
         'project-menu-item-translations': RUN,

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.2.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsServerAdmin.2.cy.ts
@@ -8,21 +8,23 @@ import {
 
 describe('Server admin 2', () => {
   it('Server admin', () => {
-    visitProjectWithPermissions({ scopes: ['admin'] }).then((projectInfo) => {
-      // login as admin
-      login('Server admin', 'admin');
-      checkPermissions(projectInfo, {
-        'project-menu-item-dashboard': SKIP,
-        'project-menu-item-translations': RUN,
-        'project-menu-item-tasks': SKIP,
-        'project-menu-item-settings': SKIP,
-        'project-menu-item-languages': SKIP,
-        'project-menu-item-members': SKIP,
-        'project-menu-item-import': SKIP,
-        'project-menu-item-export': SKIP,
-        'project-menu-item-developer': SKIP,
-        'project-menu-item-integrate': SKIP,
-      });
-    });
+    visitProjectWithPermissions({ scopes: ['admin'] }, true).then(
+      (projectInfo) => {
+        // login as admin
+        login('Server admin', 'admin');
+        checkPermissions(projectInfo, {
+          'project-menu-item-dashboard': SKIP,
+          'project-menu-item-translations': RUN,
+          'project-menu-item-tasks': SKIP,
+          'project-menu-item-settings': SKIP,
+          'project-menu-item-languages': SKIP,
+          'project-menu-item-members': SKIP,
+          'project-menu-item-import': SKIP,
+          'project-menu-item-export': SKIP,
+          'project-menu-item-developer': SKIP,
+          'project-menu-item-integrate': SKIP,
+        });
+      }
+    );
   });
 });
diff --git a/e2e/cypress/e2e/projects/permissions/permissionsTask.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsTask.cy.ts
@@ -6,7 +6,7 @@ import {
 
 describe('Permissions task', () => {
   it('tasks.view', () => {
-    visitProjectWithPermissions({ scopes: ['tasks.view'] }).then(
+    visitProjectWithPermissions({ scopes: ['tasks.view'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': RUN,
@@ -20,7 +20,7 @@ describe('Permissions task', () => {
   });
 
   it('tasks.edit', () => {
-    visitProjectWithPermissions({ scopes: ['tasks.edit'] }).then(
+    visitProjectWithPermissions({ scopes: ['tasks.edit'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': RUN,

diff --git a/e2e/cypress/e2e/projects/permissions/permissionsTranslations.1.cy.ts b/e2e/cypress/e2e/projects/permissions/permissionsTranslations.1.cy.ts
@@ -6,7 +6,7 @@ import {
 
 describe('Permissions translations 1', () => {
   it('translations.view', () => {
-    visitProjectWithPermissions({ scopes: ['translations.view'] }).then(
+    visitProjectWithPermissions({ scopes: ['translations.view'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': RUN,
@@ -19,7 +19,7 @@ describe('Permissions translations 1', () => {
   });
 
   it('translations.edit', () => {
-    visitProjectWithPermissions({ scopes: ['translations.edit'] }).then(
+    visitProjectWithPermissions({ scopes: ['translations.edit'] }, true).then(
       (projectInfo) => {
         checkPermissions(projectInfo, {
           'project-menu-item-dashboard': RUN,