Skip to content

Commit f994a0f

Browse files
CristiCanizalesCristiCanizales
committed
test: comment out noise
1 parent 5e44d3d commit f994a0f

5 files changed

Lines changed: 54 additions & 48 deletions

File tree

‎.github/workflows/apexE2E.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Apex End to End Tests
33
on:
44
workflow_dispatch:
55
inputs:
6-
createOasDoc:
7-
description: 'Create OAS Doc'
8-
required: false
9-
default: true
10-
type: boolean
6+
# createOasDoc:
7+
# description: 'Create OAS Doc'
8+
# required: false
9+
# default: true
10+
# type: boolean
1111
apexLsp:
1212
description: 'Apex LSP'
1313
required: false
@@ -40,11 +40,11 @@ on:
4040

4141
workflow_call:
4242
inputs:
43-
createOasDoc:
44-
description: 'Create OAS Doc'
45-
required: false
46-
default: true
47-
type: boolean
43+
# createOasDoc:
44+
# description: 'Create OAS Doc'
45+
# required: false
46+
# default: true
47+
# type: boolean
4848
apexLsp:
4949
description: 'Apex LSP'
5050
required: false
@@ -76,15 +76,15 @@ on:
7676
type: string
7777

7878
jobs:
79-
createOasDoc:
80-
if: ${{ inputs.createOasDoc }}
81-
uses: ./.github/workflows/runE2ETest.yml
82-
secrets: inherit
83-
with:
84-
testToRun: 'createOasDoc.e2e.js'
85-
vscodeVersion: ${{ inputs.vscodeVersion }}
86-
runId: ${{ inputs.runId }}
87-
os: '["ubuntu-latest"]'
79+
# createOasDoc:
80+
# if: ${{ inputs.createOasDoc }}
81+
# uses: ./.github/workflows/runE2ETest.yml
82+
# secrets: inherit
83+
# with:
84+
# testToRun: 'createOasDoc.e2e.js'
85+
# vscodeVersion: ${{ inputs.vscodeVersion }}
86+
# runId: ${{ inputs.runId }}
87+
# os: '["ubuntu-latest"]'
8888

8989
apexLSP:
9090
if: ${{ inputs.apexLsp }}

‎.github/workflows/runE2ETest.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,8 @@ jobs:
395395
with:
396396
name: screenshots-${{ inputs.testToRun }}-${{ matrix.os }}-${{ inputs.vscodeVersion }}
397397
path: salesforcedx-vscode/test-resources/screenshots
398-
- uses: actions/upload-artifact@v4
399-
if: ${{ inputs.testToRun == 'createOasDoc.e2e.js' }}
400-
with:
401-
name: llm-logs-${{ matrix.os }}-${{ inputs.vscodeVersion }}
402-
path: salesforcedx-vscode/e2e-temp/TempProject-CreateOASDoc/llm-logs
398+
# - uses: actions/upload-artifact@v4
399+
# if: ${{ inputs.testToRun == 'createOasDoc.e2e.js' }}
400+
# with:
401+
# name: llm-logs-${{ matrix.os }}-${{ inputs.vscodeVersion }}
402+
# path: salesforcedx-vscode/e2e-temp/TempProject-CreateOASDoc/llm-logs

‎.github/workflows/triggerE2EForCommit.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,13 @@ jobs:
133133
vscodeVersion: ${{ inputs.vscodeVersion || vars.MAX_REDHAT_VSCODE_VERSION || 'latest' }}
134134
runId: ${{ inputs.runId }}
135135

136-
# 📚 OpenAPI Documentation
137-
docs-create-oas-doc:
138-
uses: ./.github/workflows/runE2ETest.yml
139-
secrets: inherit
140-
with:
141-
testToRun: 'createOasDoc.e2e.js'
142-
vscodeVersion: ${{ inputs.vscodeVersion || vars.MAX_REDHAT_VSCODE_VERSION || 'latest' }}
143-
runId: ${{ inputs.runId }}
144-
os: '["ubuntu-latest"]'
136+
# Commenting out since it's broken
137+
# # 📚 OpenAPI Documentation
138+
# docs-create-oas-doc:
139+
# uses: ./.github/workflows/runE2ETest.yml
140+
# secrets: inherit
141+
# with:
142+
# testToRun: 'createOasDoc.e2e.js'
143+
# vscodeVersion: ${{ inputs.vscodeVersion || vars.MAX_REDHAT_VSCODE_VERSION || 'latest' }}
144+
# runId: ${{ inputs.runId }}
145+
# os: '["ubuntu-latest"]'

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,19 @@ describe('Authentication', () => {
7575
);
7676
// In the drop down menu that appears, verify the SFDX auth org commands are present...
7777
const expectedSfdxCommands = [
78-
' SFDX: Authorize an Org',
79-
' SFDX: Authorize a Dev Hub',
80-
' SFDX: Create a Default Scratch Org...',
81-
' SFDX: Authorize an Org using Session ID',
82-
' SFDX: Remove Deleted and Expired Orgs'
78+
'SFDX: Authorize an Org',
79+
'SFDX: Authorize a Dev Hub',
80+
'SFDX: Create a Default Scratch Org...',
81+
'SFDX: Authorize an Org using Session ID',
82+
'SFDX: Remove Deleted and Expired Orgs'
8383
];
8484
const foundSfdxCommands: string[] = [];
8585
for (const quickPick of orgPickerOptions) {
86-
const label = (await quickPick.getAttribute('aria-label')).slice(5);
87-
if (expectedSfdxCommands.includes(label)) {
88-
foundSfdxCommands.push(label);
86+
const ariaLabel = await quickPick.getAttribute('aria-label');
87+
for (const expectedCommand of expectedSfdxCommands) {
88+
if (ariaLabel.includes(expectedCommand) && !foundSfdxCommands.includes(expectedCommand)) {
89+
foundSfdxCommands.push(expectedCommand);
90+
}
8991
}
9092
}
9193

@@ -96,12 +98,12 @@ describe('Authentication', () => {
9698
});
9799
}
98100

99-
// In the drop down menu that appears, select "vscodeOrg - user_name".
101+
// In the drop down menu that appears, select the dev hub org by alias.
100102
const environmentSettings = EnvironmentSettings.getInstance();
101103
const devHubAliasName = environmentSettings.devHubAliasName;
102-
const devHubUserName = environmentSettings.devHubUserName;
103104
const inputBox = await InputBox.create();
104-
await inputBox.selectQuickPick(`${devHubAliasName} - ${devHubUserName}`);
105+
const orgWasFound = await findQuickPickItem(inputBox, devHubAliasName, false, true);
106+
expect(orgWasFound).to.equal(true);
105107

106108
// Need to pause here for the "set a default org" command to finish.
107109
await pause(Duration.seconds(5));
@@ -116,10 +118,9 @@ describe('Authentication', () => {
116118
);
117119
expect(expectedOutputWasFound).to.not.be.undefined;
118120

119-
// Look for "vscodeOrg" in the status bar.
120-
const statusBar = workbench.getStatusBar();
121-
const vscodeOrgItem = await statusBar.getItem(`plug ${devHubAliasName}, Change Default Org`);
122-
expect(vscodeOrgItem).to.not.be.undefined;
121+
// Look for the dev hub alias in the status bar.
122+
const devHubStatusBarItem = await getStatusBarItemWhichIncludes(devHubAliasName);
123+
expect(devHubStatusBarItem).to.not.be.undefined;
123124
});
124125

125126
it('Run SFDX: Create a Default Scratch Org', async () => {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,10 @@ describe('Templates', () => {
310310
// Sample Analytics Template
311311
it('Create a Sample Analytics Template', async () => {
312312
logTestStart(testSetup, 'Create a Sample Analytics Template');
313+
314+
// Collapse all folders in the Explorer view.
315+
await executeQuickPick('Collapse Folders in Explorer', Duration.seconds(1));
316+
313317
// Clear the output panel, then use the Command palette to run, "SFDX: Create Sample Analytics Template".
314318
const workbench = getWorkbench();
315319
await clearOutputView();

0 commit comments

Comments
 (0)