e2e-test: update session tests (#6567)

### Summary
Sessions tests broke when the power button was removed. Updated tests to
be able to handle this.

### QA Notes

@:sessions

Author: midleman

test/e2e/pages/sessions.ts

@@ -205,6 +205,22 @@ export class Sessions {
 		await this.page.keyboard.press('Escape');
 	}
 
+	/**
+	 * Action: Delete all disconnected sessions
+	 */
+	async deleteDisconnectedSessions() {
+		await test.step('Delete all disconnected sessions', async () => {
+			const sessionIds = await this.getAllSessionIds();
+
+			for (const sessionId of sessionIds) {
+				const status = await this.getStatus(sessionId);
+				if (status === 'disconnected') {
+					await this.delete(sessionId);
+				}
+			}
+		});
+	}
+
 	// -- Helpers --
 
 	/**
@@ -224,24 +240,22 @@ export class Sessions {
 	 * @returns id of the session
 	 */
 	async reuseSessionIfExists(session: SessionInfo): Promise<string> {
-		const sessionLocator = this.getSessionTab(session.name);
-		const sessionExists = await sessionLocator.isVisible();
-
-		if (sessionExists) {
-			await sessionLocator.click();
-			const status = await this.getStatus(session.name);
-			let sessionId = await this.getCurrentSessionId();
-
-			if (status === 'idle') {
-				return sessionId;
-			} else if (status === 'disconnected') {
-				sessionId = await this.start(session.name);
-				return sessionId;
+		return await test.step(`Reuse session: ${session.name}`, async () => {
+			const sessionLocator = this.getSessionTab(session.name);
+			const sessionExists = await sessionLocator.isVisible();
+
+			if (sessionExists) {
+				await sessionLocator.click();
+				const status = await this.getStatus(session.name);
+
+				if (status === 'idle') {
+					return await this.getCurrentSessionId();
+				}
 			}
-		}
 
-		// Create a new session if none exists
-		return await this.launch(session);
+			// Create a new session if none exists
+			return await this.launch(session);
+		});
 	}
 
 	/**
@@ -347,7 +361,7 @@ export class Sessions {
 	 * @returns the metadata of the session
 	 */
 	async getMetadata(sessionId?: string): Promise<SessionMetaData> {
-		return await test.step(`Get metadata for session: ${sessionId}`, async () => {
+		return await test.step(`Get metadata for session: ${sessionId ?? 'current tab'}`, async () => {
 			if (sessionId) {
 				await this.page.getByTestId(`console-tab-${sessionId}`).click();
 			}

test/e2e/tests/sessions/sessions.test.ts

@@ -22,7 +22,7 @@ test.use({
 	suiteId: __filename
 });
 
-test.describe.skip('Sessions', {
+test.describe('Sessions', {
 	tag: [tags.WIN, tags.WEB, tags.CONSOLE, tags.SESSIONS]
 }, () => {
 
@@ -35,21 +35,15 @@ test.describe.skip('Sessions', {
 	});
 
 	test.afterEach(async function ({ app }) {
-		const sessionIds = await app.workbench.sessions.getAllSessionIds();
-		sessionIds.map(async sessionId => {
-			const status = await app.workbench.sessions.getStatus(sessionId);
-			if (status === 'disconnected') {
-				await app.workbench.sessions.delete(sessionId);
-			}
-		});
+		await app.workbench.sessions.deleteDisconnectedSessions();
 	});
 
 	test('Validate state between sessions (active, idle, disconnect) ', async function ({ app }) {
 		const sessions = app.workbench.sessions;
 		const console = app.workbench.console;
 
 		// Start Python session
-		pythonSession.id = await app.workbench.sessions.launch({ ...pythonSession, waitForReady: false });
+		pythonSession.id = await sessions.launch({ ...pythonSession, waitForReady: false });
 
 		// Verify Python session is visible and transitions from active --> idle
 		await sessions.expectStatusToBe(pythonSession.id, 'active');
@@ -61,7 +55,7 @@ test.describe.skip('Sessions', {
 		await sessions.expectStatusToBe(pythonSession.id, 'idle');
 
 		// Start R session
-		rSession.id = await app.workbench.sessions.launch({ ...rSession, waitForReady: false });
+		rSession.id = await sessions.launch({ ...rSession, waitForReady: false });
 
 		// Verify R session transitions from active --> idle while Python session remains idle
 		await sessions.expectStatusToBe(rSession.id, 'active');
@@ -92,9 +86,8 @@ test.describe.skip('Sessions', {
 		const console = app.workbench.console;
 
 		// Start Python and R sessions
-		rSession.id = await app.workbench.sessions.reuseSessionIfExists(rSession);
-		pythonSession.id = await app.workbench.sessions.reuseSessionIfExists(pythonSession);
-
+		pythonSession.id = await sessions.reuseSessionIfExists(pythonSession);
+		rSession.id = await sessions.reuseSessionIfExists(rSession);
 
 		// Verify Python session transitions to active when executing code
 		await sessions.select(pythonSession.name);
@@ -179,11 +172,7 @@ test.describe.skip('Sessions', {
 		await variables.expectVariableToBe('z', '4');
 	});
 
-	test('Validate active session list in console matches active session list in session picker', {
-		annotation: [
-			{ type: 'issue', description: 'sessions are not correctly sorted atm. see line 174.' }
-		]
-	}, async function ({ app }) {
+	test('Validate active session list in console matches active session list in session picker', async function ({ app }) {
 		const sessions = app.workbench.sessions;
 		const console = app.workbench.console;
 
@@ -205,8 +194,9 @@ test.describe.skip('Sessions', {
 		await sessions.expectSessionCountToBe(0, 'active');
 		await sessions.expectSessionListsToMatch();
 
-		// Start Python session (again) and verify active sessions
-		await sessions.start(pythonSession.name);
+		// Launch Python session (again) and verify active sessions
+		await sessions.deleteDisconnectedSessions();
+		await sessions.launch(pythonSession);
 		await sessions.expectSessionCountToBe(1, 'active');
 		await sessions.expectSessionListsToMatch();