@@ -8,13 +8,13 @@ import {
88} from "../../../support/pageObjects/page-obj" ;
99import { Common , setupBrowser } from "../../../utils/common" ;
1010import { UIhelper } from "../../../utils/ui-helper" ;
11- import fs from "fs/promises" ;
1211import { RbacPo } from "../../../support/pageObjects/rbac-po" ;
1312import { RhdhAuthApiHack } from "../../../support/api/rhdh-auth-api-hack" ;
1413import RhdhRbacApi from "../../../support/api/rbac-api" ;
1514import { RbacConstants } from "../../../data/rbac-constants" ;
1615import { Policy } from "../../../support/api/rbac-api-structures" ;
1716import { CatalogImport } from "../../../support/pages/catalog-import" ;
17+ import { downloadAndReadFile } from "../../../utils/helper" ;
1818
1919/*
2020 Note that:
@@ -226,7 +226,10 @@ test.describe.serial("Test RBAC", () => {
226226
227227 test ( "Should download the user list" , async ( { page } ) => {
228228 await page . locator ( 'a:has-text("Download User List")' ) . click ( ) ;
229- const fileContent = await downloadAndReadFile ( page ) ;
229+ const fileContent = await downloadAndReadFile (
230+ page ,
231+ 'a:has-text("Download User List")' ,
232+ ) ;
230233 const lines = fileContent . trim ( ) . split ( "\n" ) ;
231234
232235 const header = "userEntityRef,displayName,email,lastAuthTime" ;
@@ -243,25 +246,6 @@ test.describe.serial("Test RBAC", () => {
243246 }
244247 } ) ;
245248
246- async function downloadAndReadFile (
247- page : Page ,
248- ) : Promise < string | undefined > {
249- const [ download ] = await Promise . all ( [
250- page . waitForEvent ( "download" ) ,
251- page . locator ( 'a:has-text("Download User List")' ) . click ( ) ,
252- ] ) ;
253-
254- const filePath = await download . path ( ) ;
255-
256- if ( filePath ) {
257- const fileContent = await fs . readFile ( filePath , "utf-8" ) ;
258- return fileContent ;
259- } else {
260- console . error ( "Download failed or path is not available" ) ;
261- return undefined ;
262- }
263- }
264-
265249 test ( "View details of a role" , async ( { page } ) => {
266250 const uiHelper = new UIhelper ( page ) ;
267251 await uiHelper . clickLink ( "role:default/rbac_admin" ) ;
@@ -293,7 +277,6 @@ test.describe.serial("Test RBAC", () => {
293277 test ( "Create and edit a role from the roles list page" , async ( {
294278 page,
295279 } ) => {
296- const rolesHelper = new Roles ( page ) ;
297280 const uiHelper = new UIhelper ( page ) ;
298281
299282 await uiHelper . clickButton ( "Create" ) ;
@@ -325,11 +308,12 @@ test.describe.serial("Test RBAC", () => {
325308
326309 const rbacPo = new RbacPo ( page ) ;
327310 const testUser = "Jonathon Page" ;
328- await rbacPo . createRole ( "test-role" , [
329- RbacPo . rbacTestUsers . guest ,
330- RbacPo . rbacTestUsers . tara ,
331- RbacPo . rbacTestUsers . backstage ,
332- ] ) ;
311+ await rbacPo . createRole (
312+ "test-role" ,
313+ [ RbacPo . rbacTestUsers . guest , RbacPo . rbacTestUsers . tara ] ,
314+ [ RbacPo . rbacTestUsers . backstage ] ,
315+ [ { permission : "catalog.entity.delete" } ] ,
316+ ) ;
333317 await page . click (
334318 ROLES_PAGE_COMPONENTS . editRole ( "role:default/test-role" ) ,
335319 ) ;
@@ -361,20 +345,20 @@ test.describe.serial("Test RBAC", () => {
361345 await usersAndGroupsLocator . waitFor ( ) ;
362346 await expect ( usersAndGroupsLocator ) . toBeVisible ( ) ;
363347
364- await rolesHelper . deleteRole ( "role:default/test-role" ) ;
348+ await rbacPo . deleteRole ( "role:default/test-role" ) ;
365349 } ) ;
366350
367351 test ( "Edit users and groups and update policies of a role from the overview page" , async ( {
368352 page,
369353 } ) => {
370- const rolesHelper = new Roles ( page ) ;
371354 const uiHelper = new UIhelper ( page ) ;
372355 const rbacPo = new RbacPo ( page ) ;
373- await rbacPo . createRole ( "test-role1" , [
374- RbacPo . rbacTestUsers . guest ,
375- RbacPo . rbacTestUsers . tara ,
376- RbacPo . rbacTestUsers . backstage ,
377- ] ) ;
356+ await rbacPo . createRole (
357+ "test-role1" ,
358+ [ RbacPo . rbacTestUsers . guest , RbacPo . rbacTestUsers . tara ] ,
359+ [ RbacPo . rbacTestUsers . backstage ] ,
360+ [ { permission : "catalog.entity.delete" } ] ,
361+ ) ;
378362
379363 await uiHelper . searchInputAriaLabel ( "test-role1" ) ;
380364
@@ -423,17 +407,18 @@ test.describe.serial("Test RBAC", () => {
423407 ) ;
424408 await uiHelper . verifyHeading ( "Permission Policies (2)" ) ;
425409
426- await rolesHelper . deleteRole ( "role:default/test-role1" ) ;
410+ await rbacPo . deleteRole ( "role:default/test-role1" ) ;
427411 } ) ;
428412
429413 test ( "Create a role with a permission policy per resource type and verify that the only authorized users can access specific resources." , async ( {
430414 page,
431415 } ) => {
432- const rolesHelper = new Roles ( page ) ;
433416 const uiHelper = new UIhelper ( page ) ;
434- await new RbacPo ( page ) . createRole (
417+ const rbacPo = new RbacPo ( page ) ;
418+ await rbacPo . createConditionalRole (
435419 "test-role1" ,
436- [ "Guest User" , "rhdh-qe" , "Backstage" ] ,
420+ [ "Guest User" , "rhdh-qe" ] ,
421+ [ "Backstage" ] ,
437422 "anyOf" ,
438423 ) ;
439424
@@ -444,7 +429,7 @@ test.describe.serial("Test RBAC", () => {
444429 . locator ( SEARCH_OBJECTS_COMPONENTS . ariaLabelSearch )
445430 . fill ( "test-role1" ) ;
446431 await uiHelper . verifyHeading ( "All roles (1)" ) ;
447- await rolesHelper . deleteRole ( "role:default/test-role1" ) ;
432+ await rbacPo . deleteRole ( "role:default/test-role1" ) ;
448433 } ) ;
449434 } ) ;
450435
0 commit comments