11import { test , expect , Page , BrowserContext } from "@support/coverage/test" ;
22import RHDHDeployment from "../../utils/authentication-providers/rhdh-deployment" ;
3- import { Common , setupBrowser , teardownBrowser } from "../../utils/common" ;
4- import { UIhelper } from "../../utils/ui-helper" ;
3+ import { Common } from "../../utils/common" ;
54import { NO_USER_FOUND_IN_CATALOG_ERROR_MESSAGE } from "../../utils/constants" ;
5+ import { SettingsPage } from "../../support/pages/settings-page" ;
6+ import {
7+ createManagedBrowserSession ,
8+ type ManagedBrowserSession ,
9+ } from "../../support/fixtures/managed-browser" ;
610let page : Page ;
711let context : BrowserContext ;
12+ let browserSession : ManagedBrowserSession ;
813
914/* SUPORTED RESOLVERS
1015GITHUB:
@@ -17,7 +22,7 @@ GITHUB:
1722// oxlint-disable-next-line eslint/require-await -- top-level await configures test.use baseURL
1823test . describe ( "Configure Github Provider" , async ( ) => {
1924 let common : Common ;
20- let uiHelper : UIhelper ;
25+ let settingsPage : SettingsPage ;
2126
2227 const namespace = "albarbaro-test-namespace-github" ;
2328 const appConfigMap = "app-config-rhdh" ;
@@ -53,9 +58,11 @@ test.describe("Configure Github Provider", async () => {
5358 await deployment . loadAllConfigs ( ) ;
5459
5560 // setup playwright helpers
56- ( { context, page } = await setupBrowser ( browser , testInfo ) ) ;
61+ browserSession = await createManagedBrowserSession ( browser , testInfo ) ;
62+ context = browserSession . context ;
63+ page = browserSession . page ;
5764 common = new Common ( page ) ;
58- uiHelper = new UIhelper ( page ) ;
65+ settingsPage = new SettingsPage ( page ) ;
5966
6067 // expect some expected variables
6168
@@ -146,8 +153,8 @@ test.describe("Configure Github Provider", async () => {
146153 ) ;
147154 expect ( login ) . toBe ( "Login successful" ) ;
148155
149- await uiHelper . goToSettingsPage ( ) ;
150- await uiHelper . verifyHeading ( "RHDH QE Admin" ) ;
156+ await settingsPage . open ( ) ;
157+ await settingsPage . verifyProfileHeading ( "RHDH QE Admin" ) ;
151158 await common . signOut ( ) ;
152159 await context . clearCookies ( ) ;
153160 } ) ;
@@ -170,8 +177,8 @@ test.describe("Configure Github Provider", async () => {
170177 ) ;
171178 expect ( login ) . toBe ( "Login successful" ) ;
172179
173- await uiHelper . goToSettingsPage ( ) ;
174- await uiHelper . verifyHeading ( "RHDH QE Admin" ) ;
180+ await settingsPage . open ( ) ;
181+ await settingsPage . verifyProfileHeading ( "RHDH QE Admin" ) ;
175182 await common . signOut ( ) ;
176183 await context . clearCookies ( ) ;
177184 } ) ;
@@ -197,7 +204,7 @@ test.describe("Configure Github Provider", async () => {
197204 ) ;
198205 expect ( login ) . toBe ( "Login successful" ) ;
199206
200- await uiHelper . verifyAlertErrorMessage (
207+ await settingsPage . verifySignInError (
201208 NO_USER_FOUND_IN_CATALOG_ERROR_MESSAGE ,
202209 ) ;
203210 await context . clearCookies ( ) ;
@@ -227,7 +234,7 @@ test.describe("Configure Github Provider", async () => {
227234
228235 expect ( login ) . toBe ( "Login successful" ) ;
229236
230- await uiHelper . verifyAlertErrorMessage (
237+ await settingsPage . verifySignInError (
231238 NO_USER_FOUND_IN_CATALOG_ERROR_MESSAGE ,
232239 ) ;
233240 await context . clearCookies ( ) ;
@@ -271,8 +278,8 @@ test.describe("Configure Github Provider", async () => {
271278 expect ( actualDuration ) . toBeGreaterThan ( threeDays - tolerance ) ;
272279 expect ( actualDuration ) . toBeLessThan ( threeDays + tolerance ) ;
273280
274- await uiHelper . goToSettingsPage ( ) ;
275- await uiHelper . verifyHeading ( "RHDH QE Admin" ) ;
281+ await settingsPage . open ( ) ;
282+ await settingsPage . verifyProfileHeading ( "RHDH QE Admin" ) ;
276283 await common . signOut ( ) ;
277284 await context . clearCookies ( ) ;
278285 } ) ;
@@ -348,15 +355,15 @@ test.describe("Configure Github Provider", async () => {
348355
349356 expect ( login ) . toBe ( "Login successful" ) ;
350357
351- await uiHelper . verifyAlertErrorMessage (
358+ await settingsPage . verifySignInError (
352359 / L o g i n f a i l e d ; c a u s e d b y E r r o r : T h e G i t H u b p r o v i d e r i s n o t c o n f i g u r e d t o s u p p o r t s i g n - i n / u,
353360 ) ;
354361 await context . clearCookies ( ) ;
355362 } ) ;
356363
357364 test . afterAll ( async ( ) => {
358- if ( page !== undefined ) {
359- await teardownBrowser ( page , test . info ( ) ) ;
365+ if ( browserSession !== undefined ) {
366+ await browserSession . dispose ( ) ;
360367 }
361368 console . log ( "[TEST] Starting cleanup..." ) ;
362369 await deployment . killRunningProcess ( ) ;
0 commit comments