-
+
{{ t('runs.connect.modal.selectProject.project') }}
*
diff --git a/packages/frontend-shared/src/locales/en-US.json b/packages/frontend-shared/src/locales/en-US.json
index 9436a8769730..572adb0646d4 100644
--- a/packages/frontend-shared/src/locales/en-US.json
+++ b/packages/frontend-shared/src/locales/en-US.json
@@ -13,6 +13,7 @@
"noMatchesForFileName": "",
"byFilenameInput": "Search by filename...",
"byExtensionInput": "Extensions to include e.g. *.tsx, *.vue",
+ "expandToSearchByExtensions": "Search for files with extensions e.g. *.tsx, *.vue",
"matchesIndicatorEmptyFileSearch": "No matches | 1 match | { denominator } matches",
"matchesIndicator": "No matches | {numerator} of {denominator} matches | {numerator} of {denominator} matches"
},
diff --git a/packages/launchpad/cypress/e2e/project-setup.cy.ts b/packages/launchpad/cypress/e2e/project-setup.cy.ts
index 4aa029b3f051..62cb67118e1f 100644
--- a/packages/launchpad/cypress/e2e/project-setup.cy.ts
+++ b/packages/launchpad/cypress/e2e/project-setup.cy.ts
@@ -507,7 +507,7 @@ describe('Launchpad: Setup Project', () => {
cy.contains('Pick a framework').click()
cy.findByRole('option', { name: 'Vue.js 3' }).click()
- cy.findByRole('button', { name: 'Bundler Pick a bundler' }).click()
+ cy.findByRole('button', { name: 'Pick a bundler' }).click()
cy.findByRole('option', { name: 'Vite' }).click()
cy.findByRole('button', { name: 'Next step' }).should('not.have.disabled')
diff --git a/packages/launchpad/src/setup/ButtonBar.vue b/packages/launchpad/src/setup/ButtonBar.vue
index 6334cb355d51..c6d8c7719d33 100644
--- a/packages/launchpad/src/setup/ButtonBar.vue
+++ b/packages/launchpad/src/setup/ButtonBar.vue
@@ -28,7 +28,7 @@
class="flex px-3 items-center"
>
diff --git a/packages/launchpad/src/setup/EnvironmentSetup.cy.tsx b/packages/launchpad/src/setup/EnvironmentSetup.cy.tsx
index f5b6acb6e45d..90a95e8df228 100644
--- a/packages/launchpad/src/setup/EnvironmentSetup.cy.tsx
+++ b/packages/launchpad/src/setup/EnvironmentSetup.cy.tsx
@@ -15,7 +15,7 @@ describe('
', { viewportWidth: 800 }, () => {
})
cy.findByRole('button', {
- name: 'Front-end framework Pick a framework',
+ name: 'Pick a framework',
expanded: false,
})
.should('have.attr', 'aria-haspopup', 'true')
@@ -55,7 +55,7 @@ describe('
', { viewportWidth: 800 }, () => {
})
cy.findByRole('button', {
- name: 'Front-end framework Pick a framework',
+ name: 'Pick a framework',
expanded: false,
}).click()
@@ -80,7 +80,6 @@ describe('
', { viewportWidth: 800 }, () => {
),
})
- cy.findByLabelText('Bundler').should('be.visible')
cy.findByLabelText('Pick a bundler').should('be.visible')
})
diff --git a/packages/launchpad/src/setup/SelectFrameworkOrBundler.vue b/packages/launchpad/src/setup/SelectFrameworkOrBundler.vue
index 3a92dea293ff..10ffc2ae0ef9 100644
--- a/packages/launchpad/src/setup/SelectFrameworkOrBundler.vue
+++ b/packages/launchpad/src/setup/SelectFrameworkOrBundler.vue
@@ -4,11 +4,12 @@
:placeholder="props.placeholder"
:options="props.options"
item-key="id"
+ :label-id="props.selectorType"
@update:model-value="selectOption"
>
-
+
{{ props.label }}
{
+ sinon.stub(process, 'platform').value('win32')
+ // Create a table that matches what 'Get-CimInstance -className win32_process | select Name,ProcessId,ParentProcessId,CommandLine,ExecutablePath' does in powershell
+ const process1 = 'Name : abc\r\nProcessId : 123\r\nParentProcessId : 456\r\nCommandLine : "c:\\path\\to\\abc.exe"\r\nExecutablePath : c:\\path\\to\\abc.exe'
+ const process2 = 'Name : xyz\r\nProcessId : 789\r\nParentProcessId : 1011\r\nCommandLine : "c:\\path\\to\\xyz.exe"\r\nExecutablePath : c:\\path\\to\\xyz.exe'
+ const process3 = 'Name : def\r\nProcessId : 1213\r\nParentProcessId : 1415\r\nCommandLine : "c:\\path\\to\\def.exe"\r\nExecutablePath : c:\\path\\to\\def.exe'
+ const process4 = 'Name : ghi\r\nProcessId : 1617\r\nParentProcessId : 1819\r\nCommandLine : "c:\\path\\to\\ghi.exe"\r\nExecutablePath : c:\\path\\to\\ghi.exe'
+ const process5 = 'Name : jkl\r\nProcessId : 2021\r\nParentProcessId : 2223\r\nCommandLine : "c:\\path\\to\\jkl.exe"\r\nExecutablePath : c:\\path\\to\\jkl.exe'
+ // Include all of this regex: (\r\n\r\n|\r\n\n|\n\r\n|\n\n)
+ const returnString = `${process1}\r\n\r\n${process2}\r\n\n${process3}\n\r\n${process4}\n\n${process5}`
+
+ sinon.stub(utils, 'spawn').returns({
+ stdout: {
+ on: (event: string, callback: (data: string) => void) => {
+ if (event === 'data') {
+ callback(returnString)
+ }
+ },
+ },
+ on: (event: string, callback: (code: number) => void) => {
+ if (event === 'close') {
+ callback(0)
+ }
+ },
+ })
+
+ const result1 = await byPid(123)
+
+ expect(result1).to.eql([{
+ pid: 123,
+ ppid: 456,
+ name: 'abc',
+ cmd: '"c:\\path\\to\\abc.exe"',
+ bin: 'c:\\path\\to\\abc.exe',
+ }])
+
+ const result2 = await byPid(789)
+
+ expect(result2).to.eql([{
+ pid: 789,
+ ppid: 1011,
+ name: 'xyz',
+ cmd: '"c:\\path\\to\\xyz.exe"',
+ bin: 'c:\\path\\to\\xyz.exe',
+ }])
+
+ const result3 = await byPid(1213)
+
+ expect(result3).to.eql([{
+ pid: 1213,
+ ppid: 1415,
+ name: 'def',
+ cmd: '"c:\\path\\to\\def.exe"',
+ bin: 'c:\\path\\to\\def.exe',
+ }])
+
+ const result4 = await byPid(1617)
+
+ expect(result4).to.eql([{
+ pid: 1617,
+ ppid: 1819,
+ name: 'ghi',
+ cmd: '"c:\\path\\to\\ghi.exe"',
+ bin: 'c:\\path\\to\\ghi.exe',
+ }])
+
+ const result5 = await byPid(2021)
+
+ expect(result5).to.eql([{
+ pid: 2021,
+ ppid: 2223,
+ name: 'jkl',
+ cmd: '"c:\\path\\to\\jkl.exe"',
+ bin: 'c:\\path\\to\\jkl.exe',
+ }])
+ })
+})
diff --git a/patches/find-process+1.4.7.patch b/patches/find-process+1.4.7.patch
new file mode 100644
index 000000000000..74a0f4161282
--- /dev/null
+++ b/patches/find-process+1.4.7.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/find-process/lib/utils.js b/node_modules/find-process/lib/utils.js
+index fb7592b..a192426 100644
+--- a/node_modules/find-process/lib/utils.js
++++ b/node_modules/find-process/lib/utils.js
+@@ -134,7 +134,7 @@ const utils = {
+ * @return {Array}
+ */
+ parseTable (data) {
+- const lines = data.split(/(\r\n\r\n|\r\n\n|\n\r\n)|\n\n/).filter(line => {
++ const lines = data.split(/(\r\n\r\n|\r\n\n|\n\r\n|\n\n)/).filter(line => {
+ return line.trim().length > 0
+ }).map((e) => e.split(/(\r\n|\n|\r)/).filter(line => line.trim().length > 0))
+
diff --git a/scripts/verify-accessibility-results.js b/scripts/verify-accessibility-results.js
new file mode 100644
index 000000000000..a3ec766f796f
--- /dev/null
+++ b/scripts/verify-accessibility-results.js
@@ -0,0 +1,76 @@
+const { getAccessibilityResults } = require('@cypress/extract-cloud-results')
+
+/**
+ * The list of rules that currently have 1+ elements that have been flagged with
+ * violations within the Cypress Accessibility report that need to be addressed.
+ *
+ * For example, the `aria-required-children` rule can have multiple
+ * elements that caused this rule to fail.
+ *
+ * Once the violation is fixed in the Cypress App's Accessibility report,
+ * the fixed rule should be removed from this list.
+ *
+ * View the Accessibility report for the Cypress run in the Cloud
+ * for more details on how to address these failures.
+ */
+const rulesWithExistingViolations = [
+ 'aria-required-children',
+ 'aria-required-parent',
+ 'image-alt',
+ 'aria-allowed-role',
+ 'empty-heading',
+ 'heading-order',
+ 'page-has-heading-one',
+ 'aria-dialog-name',
+ 'aria-hidden-focus',
+ 'color-contrast',
+ 'link-in-text-block',
+ 'list',
+ 'listitem',
+ 'nested-interactive',
+ 'scrollable-region-focusable',
+]
+
+// This polls up to 30 times every 30 seconds.
+// This resolves when the Accessibility report is ready for the Cypress run.
+getAccessibilityResults({
+ projectId: 'ypt4pf',
+})
+.then((results) => {
+ const {
+ runNumber,
+ accessibilityReportUrl,
+ summary,
+ rules,
+ } = results
+ const { total } = summary.violationCounts
+
+ console.log(`Received ${summary.isPartialReport ? 'partial' : ''} results for run #${runNumber}.`)
+ console.log(`See full report at ${accessibilityReportUrl}.`)
+
+ // write your logic to conditionally fail based on the results
+ if (total === 0) {
+ console.log('No Accessibility violations detected!')
+
+ return
+ }
+
+ const { critical, serious, moderate, minor } = summary.violationCounts
+
+ console.log(`${total} Accessibility violations were detected - ${critical} critical, ${serious} serious, ${moderate} moderate, and ${minor} minor.`)
+
+ const newRuleViolations = rules.filter((rule) => !rulesWithExistingViolations.includes(rule.name))
+
+ if (newRuleViolations.length > 0) {
+ console.error('The following rules were violated that were previously passing:')
+ console.error(newRuleViolations)
+
+ throw new Error(`${newRuleViolations.length} rule regressions were introduced and must be fixed.`)
+ }
+
+ if (total < rulesWithExistingViolations.length) {
+ console.warn(`It seems you have resolved ${rulesWithExistingViolations.length - total} rule(s). Remove them from the list of problematic rules so regressions are not introduced.`)
+ }
+
+ console.log('No new Accessibility violations detected!')
+})