test: refactor group existance function to be more specific for id

Author: anon-pradip

tests/e2e-playwright/specs/admin-settings/groups.spec.ts

@@ -4,7 +4,6 @@ import { ActorsEnvironment, UsersEnvironment } from '../../../e2e/support/enviro
 import { setAccessAndRefreshToken } from '../../helpers/setAccessAndRefreshToken'
 import * as ui from '../../steps/ui/index'
 import * as api from '../../steps/api/api'
-import { objects } from '../../../e2e/support'
 
 test.describe('groups management', () => {
   let actorsEnvironment
@@ -46,7 +45,7 @@ test.describe('groups management', () => {
       await ui.checkGroupsPresenceById({
         actorsEnvironment,
         stepUser: 'Admin',
-        groupIds: ['sales', 'security']
+        expectedGroupIds: ['sales', 'security']
       })
     ).toBeTruthy()
   })
@@ -69,7 +68,7 @@ test.describe('groups management', () => {
       await ui.checkGroupsPresenceById({
         actorsEnvironment,
         stepUser: 'Admin',
-        groupIds: ['sales']
+        expectedGroupIds: ['sales']
       })
     ).toBeFalsy()
 
@@ -84,7 +83,7 @@ test.describe('groups management', () => {
       await ui.checkGroupsPresenceById({
         actorsEnvironment,
         stepUser: 'Admin',
-        groupIds: ['security', 'finance']
+        expectedGroupIds: ['security', 'finance']
       })
     ).toBeFalsy()
   })

tests/e2e-playwright/steps/api/api.ts

@@ -9,8 +9,8 @@ import { ResourceType } from '../../../e2e/support/api/share/share'
 import { Group, Space, User } from '../../../e2e/support/types'
 import fs from 'fs'
 import { integer } from 'vscode-languageserver-types'
-import { join } from 'path/win32'
-import { checkResponseStatus, request } from '../../../e2e/support/api/http.js'
+import join from 'join-path'
+import { checkResponseStatus, request } from '../../../e2e/support/api/http'
 
 export async function userHasBeenCreated({
   usersEnvironment,

tests/e2e-playwright/steps/ui/adminSettings.ts

@@ -73,17 +73,17 @@ export async function createGroups({
 export async function checkGroupsPresenceById({
   actorsEnvironment,
   stepUser,
-  groupIds
+  expectedGroupIds
 }: {
   actorsEnvironment: ActorsEnvironment
   stepUser: string
-  groupIds: string[]
+  expectedGroupIds: string[]
 }): Promise<boolean> {
   const { page } = actorsEnvironment.getActor({ key: stepUser })
   const groupsObject = new objects.applicationAdminSettings.Groups({ page })
-  const groups = await groupsObject.getDisplayedGroups()
-  for (const group of groupIds) {
-    if (!groups.includes(groupsObject.getUUID({ key: group }))) {
+  const actualGroupsIds = await groupsObject.getDisplayedGroupsIds()
+  for (const group of expectedGroupIds) {
+    if (!actualGroupsIds.includes(groupsObject.getUUID({ key: group }))) {
       return false
     }
   }

tests/e2e/cucumber/steps/ui/adminSettings.ts

@@ -415,7 +415,7 @@ Then(
   ): Promise<void> {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const groupsObject = new objects.applicationAdminSettings.Groups({ page })
-    const groups = await groupsObject.getDisplayedGroups()
+    const groups = await groupsObject.getDisplayedGroupsIds()
 
     for (const { group } of stepTable.hashes()) {
       switch (action) {

tests/e2e/support/objects/app-admin-settings/groups/actions.ts

@@ -46,7 +46,7 @@ export const createGroup = async (args: { page: Page; key: string }) => {
   return await response.json()
 }
 
-export const getDisplayedGroups = async (args: { page: Page }): Promise<string[]> => {
+export const getDisplayedGroupsIds = async (args: { page: Page }): Promise<string[]> => {
   const { page } = args
   const groups = []
   const result = page.locator(groupTrSelector)

tests/e2e/support/objects/app-admin-settings/groups/index.ts

@@ -26,8 +26,8 @@ export class Groups {
     })
   }
 
-  getDisplayedGroups(): Promise<string[]> {
-    return po.getDisplayedGroups({ page: this.#page })
+  getDisplayedGroupsIds(): Promise<string[]> {
+    return po.getDisplayedGroupsIds({ page: this.#page })
   }
 
   async getGroupsDisplayName(): Promise<string> {