Merge branch 'develop' into ms/fsp-fss

Author: madhur310

.github/workflows/apexE2E.yml

@@ -3,11 +3,11 @@ name: Apex End to End Tests
 on:
   workflow_dispatch:
     inputs:
-      createOasDoc:
-        description: 'Create OAS Doc'
-        required: false
-        default: true
-        type: boolean
+      # createOasDoc:
+      #   description: 'Create OAS Doc'
+      #   required: false
+      #   default: true
+      #   type: boolean
       apexLsp:
         description: 'Apex LSP'
         required: false
@@ -40,11 +40,11 @@ on:
 
   workflow_call:
     inputs:
-      createOasDoc:
-        description: 'Create OAS Doc'
-        required: false
-        default: true
-        type: boolean
+      # createOasDoc:
+      #   description: 'Create OAS Doc'
+      #   required: false
+      #   default: true
+      #   type: boolean
       apexLsp:
         description: 'Apex LSP'
         required: false
@@ -76,15 +76,15 @@ on:
         type: string
 
 jobs:
-  createOasDoc:
-    if: ${{ inputs.createOasDoc }}
-    uses: ./.github/workflows/runE2ETest.yml
-    secrets: inherit
-    with:
-      testToRun: 'createOasDoc.e2e.js'
-      vscodeVersion: ${{ inputs.vscodeVersion }}
-      runId: ${{ inputs.runId }}
-      os: '["ubuntu-latest"]'
+  # createOasDoc:
+  #   if: ${{ inputs.createOasDoc }}
+  #   uses: ./.github/workflows/runE2ETest.yml
+  #   secrets: inherit
+  #   with:
+  #     testToRun: 'createOasDoc.e2e.js'
+  #     vscodeVersion: ${{ inputs.vscodeVersion }}
+  #     runId: ${{ inputs.runId }}
+  #     os: '["ubuntu-latest"]'
 
   apexLSP:
     if: ${{ inputs.apexLsp }}

.github/workflows/publishVSCode.yml

@@ -83,3 +83,24 @@ jobs:
     with:
       changeCaseId: ${{ needs.ctc-open.outputs.changeCaseId }}
       status: Not Implemented
+
+  # Set repo variable CBW_TRIGGER_ENABLED=false to disable dispatch to code-builder-web.
+  # Default (unset): dispatch after publish. Use when publishing without CBW promotion.
+  trigger-cbw-release:
+    needs: [publish, prepare-environment-from-main]
+    if: needs.publish.result == 'success' && vars.CBW_TRIGGER_ENABLED != 'false'
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger Code Builder Web release
+        env:
+          GH_TOKEN: ${{ secrets.IDEE_GH_TOKEN }}
+        run: |
+          VERSION="${{ needs.prepare-environment-from-main.outputs.RELEASE_VERSION }}"
+          echo "Dispatching extension-publish event to code-builder-web with version $VERSION"
+          gh api repos/forcedotcom/code-builder-web/dispatches \
+            --method POST \
+            -f event_type=extension-publish \
+            -f "client_payload[version]=$VERSION" \
+            -f "client_payload[source]=publishVSCode"
+          echo "Dispatch sent successfully"

.github/workflows/runE2ETest.yml

@@ -395,8 +395,8 @@ jobs:
         with:
           name: screenshots-${{ inputs.testToRun }}-${{ matrix.os }}-${{ inputs.vscodeVersion }}
           path: salesforcedx-vscode/test-resources/screenshots
-      - uses: actions/upload-artifact@v4
-        if: ${{ inputs.testToRun == 'createOasDoc.e2e.js' }}
-        with:
-          name: llm-logs-${{ matrix.os }}-${{ inputs.vscodeVersion }}
-          path: salesforcedx-vscode/e2e-temp/TempProject-CreateOASDoc/llm-logs
+      # - uses: actions/upload-artifact@v4
+      #   if: ${{ inputs.testToRun == 'createOasDoc.e2e.js' }}
+      #   with:
+      #     name: llm-logs-${{ matrix.os }}-${{ inputs.vscodeVersion }}
+      #     path: salesforcedx-vscode/e2e-temp/TempProject-CreateOASDoc/llm-logs

.github/workflows/triggerE2EForCommit.yml

@@ -133,12 +133,13 @@ jobs:
       vscodeVersion: ${{ inputs.vscodeVersion || vars.MAX_REDHAT_VSCODE_VERSION || 'latest' }}
       runId: ${{ inputs.runId }}
 
-  # 📚 OpenAPI Documentation
-  docs-create-oas-doc:
-    uses: ./.github/workflows/runE2ETest.yml
-    secrets: inherit
-    with:
-      testToRun: 'createOasDoc.e2e.js'
-      vscodeVersion: ${{ inputs.vscodeVersion || vars.MAX_REDHAT_VSCODE_VERSION || 'latest' }}
-      runId: ${{ inputs.runId }}
-      os: '["ubuntu-latest"]'
+  # Commenting out since it's broken
+  # # 📚 OpenAPI Documentation
+  # docs-create-oas-doc:
+  #   uses: ./.github/workflows/runE2ETest.yml
+  #   secrets: inherit
+  #   with:
+  #     testToRun: 'createOasDoc.e2e.js'
+  #     vscodeVersion: ${{ inputs.vscodeVersion || vars.MAX_REDHAT_VSCODE_VERSION || 'latest' }}
+  #     runId: ${{ inputs.runId }}
+  #     os: '["ubuntu-latest"]'

contributing/publishing.md

@@ -80,6 +80,8 @@ find ~/Downloads/v64.8.0 -type f -name "*.vsix" -exec code --install-extension {
 
 After completing your release testing following our internal template, approve the publish job "Publish in Microsoft Marketplace" and "Publish in Open VSX Registry" to allow the extensions to be uploaded and complete the release process.
 
+**Code Builder Web promotion:** After publishing to the MS Marketplace, the workflow dispatches to `code-builder-web` to trigger a CBW release and auto-promote to production. Set repo variable `CBW_TRIGGER_ENABLED=false` (Settings → Secrets and variables → Actions → Variables) to publish without triggering CBW. Default (unset) enables the trigger.
+
 ## Troubleshooting
 
 - 401 errors on publish? You probably need to update the VSCE PAT. https://salesforce.quip.com/E8GWA5TuI8jp

packages/salesforcedx-vscode-automation-tests/test/specs/auraLsp.e2e.ts

@@ -4,8 +4,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Duration, TestReqConfig, ProjectShapeOption } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/core';
-import { log, pause } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/core/miscellaneous';
+import { Duration, ProjectShapeOption, TestReqConfig } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/core';
+import { log, openFile, pause } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/core/miscellaneous';
 import {
   retryOperation,
   verifyNotificationWithRetry
@@ -20,6 +20,7 @@ import {
   reloadWindow
 } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/ui-interaction';
 import { expect } from 'chai';
+import * as path from 'node:path';
 import { By, after } from 'vscode-extension-tester';
 import { defaultExtensionConfigs } from '../testData/constants';
 import { getFolderPath } from '../utils/buildFilePathHelper';
@@ -63,6 +64,7 @@ describe('Aura LSP', () => {
   it('Go to Definition', async () => {
     logTestStart(testSetup, 'Go to Definition');
     // Get open text editor
+    await openFile(path.join(auraFolderPath, 'aura1.cmp'));
     const workbench = getWorkbench();
     const textEditor = await getTextEditor(workbench, 'aura1.cmp');
 

packages/salesforcedx-vscode-automation-tests/test/specs/authentication.e2e.ts

@@ -23,7 +23,8 @@ import {
   executeQuickPick,
   findQuickPickItem,
   getStatusBarItemWhichIncludes,
-  getWorkbench
+  getWorkbench,
+  reloadWindow
 } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/ui-interaction';
 import { expect } from 'chai';
 import { By, InputBox, after } from 'vscode-extension-tester';
@@ -75,17 +76,19 @@ describe('Authentication', () => {
     );
     // In the drop down menu that appears, verify the SFDX auth org commands are present...
     const expectedSfdxCommands = [
-      ' SFDX: Authorize an Org',
-      ' SFDX: Authorize a Dev Hub',
-      ' SFDX: Create a Default Scratch Org...',
-      ' SFDX: Authorize an Org using Session ID',
-      ' SFDX: Remove Deleted and Expired Orgs'
+      'SFDX: Authorize an Org',
+      'SFDX: Authorize a Dev Hub',
+      'SFDX: Create a Default Scratch Org...',
+      'SFDX: Authorize an Org using Session ID',
+      'SFDX: Remove Deleted and Expired Orgs'
     ];
     const foundSfdxCommands: string[] = [];
     for (const quickPick of orgPickerOptions) {
-      const label = (await quickPick.getAttribute('aria-label')).slice(5);
-      if (expectedSfdxCommands.includes(label)) {
-        foundSfdxCommands.push(label);
+      const ariaLabel = await quickPick.getAttribute('aria-label');
+      for (const expectedCommand of expectedSfdxCommands) {
+        if (ariaLabel.includes(expectedCommand) && !foundSfdxCommands.includes(expectedCommand)) {
+          foundSfdxCommands.push(expectedCommand);
+        }
       }
     }
 
@@ -96,12 +99,12 @@ describe('Authentication', () => {
       });
     }
 
-    // In the drop down menu that appears, select "vscodeOrg - user_name".
+    // In the drop down menu that appears, select the dev hub org by alias.
     const environmentSettings = EnvironmentSettings.getInstance();
     const devHubAliasName = environmentSettings.devHubAliasName;
-    const devHubUserName = environmentSettings.devHubUserName;
     const inputBox = await InputBox.create();
-    await inputBox.selectQuickPick(`${devHubAliasName} - ${devHubUserName}`);
+    const orgWasFound = await findQuickPickItem(inputBox, devHubAliasName, false, true);
+    expect(orgWasFound).to.equal(true);
 
     // Need to pause here for the "set a default org" command to finish.
     await pause(Duration.seconds(5));
@@ -116,10 +119,9 @@ describe('Authentication', () => {
     );
     expect(expectedOutputWasFound).to.not.be.undefined;
 
-    // Look for "vscodeOrg" in the status bar.
-    const statusBar = workbench.getStatusBar();
-    const vscodeOrgItem = await statusBar.getItem(`plug  ${devHubAliasName}, Change Default Org`);
-    expect(vscodeOrgItem).to.not.be.undefined;
+    // Look for the dev hub alias in the status bar.
+    const devHubStatusBarItem = await getStatusBarItemWhichIncludes(devHubAliasName);
+    expect(devHubStatusBarItem).to.not.be.undefined;
   });
 
   it('Run SFDX: Create a Default Scratch Org', async () => {
@@ -135,6 +137,10 @@ describe('Authentication', () => {
 
   it('Run SFDX: Set the Scratch Org As the Default Org', async () => {
     logTestStart(testSetup, 'Running SFDX: Set the Scratch Org As the Default Org');
+
+    // Reload window to get the new scratch org to appear in the list of orgs.
+    await reloadWindow(Duration.seconds(30));
+
     const inputBox = await executeQuickPick('SFDX: Set a Default Org', Duration.seconds(10));
 
     const scratchOrgQuickPickItemWasFound = await findQuickPickItem(inputBox, scratchOrgAliasName, false, true);

packages/salesforcedx-vscode-automation-tests/test/specs/lwcLsp.e2e.ts

@@ -7,26 +7,27 @@
 import { retryOperation, verifyNotificationWithRetry } from '@salesforce/salesforcedx-vscode-test-tools/lib/src';
 import {
   Duration,
-  pause,
-  log,
   ProjectShapeOption,
-  TestReqConfig
+  TestReqConfig,
+  log,
+  openFile,
+  pause
 } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/core';
 import { createLwc } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/salesforce-components';
 import { TestSetup } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/testSetup';
 import {
+  closeAllEditors,
   executeQuickPick,
-  getWorkbench,
   getTextEditor,
-  reloadWindow,
+  getWorkbench,
   moveCursorWithFallback,
-  closeAllEditors
+  reloadWindow
 } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/ui-interaction';
 import { expect } from 'chai';
+import * as path from 'node:path';
 import { By, after } from 'vscode-extension-tester';
 import { defaultExtensionConfigs } from '../testData/constants';
 import { getFolderPath } from '../utils/buildFilePathHelper';
-// import { tryToHideCopilot } from '../utils/copilotHidingHelper';
 import { logTestStart } from '../utils/loggingHelper';
 
 describe('LWC LSP', () => {
@@ -70,6 +71,7 @@ describe('LWC LSP', () => {
   it('Go to Definition (JavaScript)', async () => {
     logTestStart(testSetup, 'Go to Definition (Javascript)');
     // Get open text editor
+    await openFile(path.join(lwcFolderPath, 'lwc1.js'));
     const workbench = getWorkbench();
     const textEditor = await getTextEditor(workbench, 'lwc1.js');
 

packages/salesforcedx-vscode-automation-tests/test/specs/snippets.e2e.ts

@@ -17,13 +17,13 @@ import { TestSetup } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/te
 import {
   getWorkbench,
   getTextEditor,
-  executeQuickPick
+  executeQuickPick,
+  reloadWindow
 } from '@salesforce/salesforcedx-vscode-test-tools/lib/src/ui-interaction';
 import { expect } from 'chai';
 import { By, after } from 'vscode-extension-tester';
 import { defaultExtensionConfigs } from '../testData/constants';
 import { getFolderPath } from '../utils/buildFilePathHelper';
-import { tryToHideCopilot } from '../utils/copilotHidingHelper';
 import { logTestStart } from '../utils/loggingHelper';
 
 describe('Snippets', () => {
@@ -41,9 +41,6 @@ describe('Snippets', () => {
   before('Set up the testing environment', async () => {
     testSetup = await TestSetup.setUp(testReqConfig);
     classesFolderPath = getFolderPath(testSetup.projectFolderPath!, 'classes');
-
-    // Hide copilot
-    await tryToHideCopilot();
   });
 
   it.skip('Use out-of-the-box Apex Snippets', async () => {
@@ -138,10 +135,13 @@ describe('Snippets', () => {
     await inputBox.confirm();
     await inputBox.confirm();
 
+    // Reload window to get the LWC to be indexed by the LWC Language Server
+    await reloadWindow(Duration.seconds(20));
+
     // Type snippet "lwc", select "lwc-event" and check it inserted the right thing
     const textEditor = await getTextEditor(workbench, 'lwc.js');
     await textEditor.typeText('lwc');
-    await pause(Duration.seconds(1));
+    await pause(Duration.seconds(5));
     const autocompletionOptions = await workbench.findElements(By.css('div.monaco-list-row.show-file-icons'));
     const ariaLabel = await autocompletionOptions[2].getAttribute('aria-label');
     expect(ariaLabel).to.contain('lwc-event');

packages/salesforcedx-vscode-automation-tests/test/specs/templates.e2e.ts

@@ -310,6 +310,10 @@ describe('Templates', () => {
   // Sample Analytics Template
   it('Create a Sample Analytics Template', async () => {
     logTestStart(testSetup, 'Create a Sample Analytics Template');
+
+    // Collapse all folders in the Explorer view.
+    await executeQuickPick('Collapse Folders in Explorer', Duration.seconds(1));
+
     // Clear the output panel, then use the Command palette to run, "SFDX: Create Sample Analytics Template".
     const workbench = getWorkbench();
     await clearOutputView();