Merge branch 'main' into mi/add-tr-back

posit-dev · Dec 14, 2024 · dd0cd2f · dd0cd2f
2 parents 34df38f + 485eee5
commit dd0cd2f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/test-full-suite.yml b/.github/workflows/test-full-suite.yml
@@ -48,12 +48,12 @@ jobs:
       - name: Echo Input Details
         run: |
           echo "Workflow Inputs:"
-          echo "- E2E Electron (Linux): `${{ inputs.run_e2e_linux }}`"
-          echo "- E2E Electron (Windows): `${{ inputs.run_e2e_windows }}`"
-          echo "- E2E Chromium (Linux): `${{ inputs.run_e2e_browser }}`"
-          echo "- Unit Tests: `${{ inputs.run_unit_tests }}`"
-          echo "- Integration Tests: `${{ inputs.run_integration_tests }}`"
-          echo "- Slack Notification On: `${{ inputs.notify_on }}`"
+          echo "- E2E Electron (Linux): ${{ inputs.run_e2e_linux }}"
+          echo "- E2E Electron (Windows): ${{ inputs.run_e2e_windows }}"
+          echo "- E2E Chromium (Linux): ${{ inputs.run_e2e_browser }}"
+          echo "- Unit Tests: ${{ inputs.run_unit_tests }}"
+          echo "- Integration Tests: ${{ inputs.run_integration_tests }}"
+          echo "- Slack Notification On: ${{ inputs.notify_on }}"
 
   e2e-electron:
     name: e2e

diff --git a/src/vs/platform/positronActionBar/browser/components/actionBarButton.tsx b/src/vs/platform/positronActionBar/browser/components/actionBarButton.tsx
@@ -125,6 +125,7 @@ export const ActionBarButton = forwardRef<
 				onPressed={props.onPressed}
 			>
 				<ActionBarButtonFace />
+				{props.children}
 			</Button>
 		);
 	} else {

diff --git a/test/e2e/features/new-project-wizard/new-project-python.test.ts b/test/e2e/features/new-project-wizard/new-project-python.test.ts
@@ -61,7 +61,11 @@ test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] },
 		await app.workbench.quickaccess.runCommand('workbench.action.toggleAuxiliaryBar');
 	});
 
-	test('With ipykernel already installed [C609619]', { tag: [tags.WIN] }, async function ({ app, page, python }) {
+	// Skip test due to https://github.com/posit-dev/positron/issues/5730. Both have to skipped as they depend o
+	test.skip('With ipykernel already installed [C609619]', {
+		tag: [tags.WIN],
+		annotation: [{ type: 'issue', description: 'https://github.com/posit-dev/positron/issues/5730' }],
+		}, async function ({ app, page, python }) {
 		const projSuffix = addRandomNumSuffix('_ipykernelInstalled');
 		const pw = app.workbench.positronNewProjectWizard;
 		const pythonFixtures = new PositronPythonFixtures(app);
@@ -96,7 +100,10 @@ test.describe('Python - New Project Wizard', { tag: [tags.NEW_PROJECT_WIZARD] },
 		await expect(app.workbench.positronConsole.activeConsole.getByText('>>>')).toBeVisible({ timeout: 90000 });
 	});
 
-	test('With ipykernel not already installed [C609617]', { tag: [tags.WIN] }, async function ({ app, page }) {
+	test.skip('With ipykernel not already installed [C609617]', {
+		tag: [tags.WIN],
+		annotation: [{ type: 'issue', description: 'https://github.com/posit-dev/positron/issues/5730' }],
+		}, async function ({ app, page }) {
 		const projSuffix = addRandomNumSuffix('_noIpykernel');
 		const pw = app.workbench.positronNewProjectWizard;
 		const pythonFixtures = new PositronPythonFixtures(app);