correct paths and add ct framework to expected dir

Author: lmiller1990

packages/launchpad/cypress/e2e/scaffold-project.cy.ts

@@ -73,12 +73,13 @@ function scaffoldAndOpenCTProject (
   cy.contains('Choose a Browser')
 }
 
-function assertScaffoldedFilesAreCorrect (language: 'js' | 'ts', testingType: Cypress.TestingType) {
+function assertScaffoldedFilesAreCorrect (language: 'js' | 'ts', testingType: Cypress.TestingType, ctFramework?: string) {
   cy.withCtx((ctx) => ctx.currentProject).then((currentProject) => {
     cy.task<SnapshotScaffoldTestResult>('snapshotCypressDirectory', {
       currentProject,
       testingType,
       language,
+      ctFramework,
     })
     .then((result) => {
       if (result.status === 'ok') {
@@ -106,11 +107,11 @@ describe('scaffolding new projects', () => {
 
   it('scaffolds CT for a JS project', () => {
     scaffoldAndOpenCTProject('pristine', 'js', 'Create React App (v5)')
-    assertScaffoldedFilesAreCorrect('js', 'component')
+    assertScaffoldedFilesAreCorrect('js', 'component', 'Create React App (v5)')
   })
 
   it('scaffolds CT for a TS project', () => {
     scaffoldAndOpenCTProject('pristine', 'ts', 'Create React App (v5)')
-    assertScaffoldedFilesAreCorrect('ts', 'component')
+    assertScaffoldedFilesAreCorrect('ts', 'component', 'Create React App (v5)')
   })
 })

packages/launchpad/cypress/tasks/snapshotsScaffold.ts

@@ -5,7 +5,7 @@ import disparity from 'disparity'
 import dedent from 'dedent'
 import { cyTmpDir } from '@tooling/system-tests/lib/fixtures'
 
-const systemTestsDir = path.posix.join(__dirname, '..', '..', '..', '..', 'system-tests', 'projects')
+const systemTestsDir = path.join(__dirname, '..', '..', '..', '..', 'system-tests', 'projects')
 
 export interface SnapshotScaffoldTestResult {
   status: 'ok' | 'fail'
@@ -78,9 +78,14 @@ interface SnapshotCypressDirectoryOptions {
   currentProject: string
   language: 'js' | 'ts'
   testingType: Cypress.TestingType
+  ctFramework?: string
 }
 
-export async function snapshotCypressDirectory ({ currentProject, language, testingType }: SnapshotCypressDirectoryOptions): Promise<SnapshotScaffoldTestResult> {
+function removeHyphensAndBrackets (str: string) {
+  return str.toLowerCase().replaceAll(' ', '-').replaceAll('(', '').replaceAll(')', '')
+}
+
+export async function snapshotCypressDirectory ({ currentProject, language, testingType, ctFramework }: SnapshotCypressDirectoryOptions): Promise<SnapshotScaffoldTestResult> {
   if (!currentProject.startsWith(cyTmpDir)) {
     throw Error(dedent`
       snapshotCypressDirectory is designed to be used with system-tests infrastructure.
@@ -93,14 +98,18 @@ export async function snapshotCypressDirectory ({ currentProject, language, test
   const projectDir = currentProject.replace(cyTmpDir, systemTestsDir)
   const projectName = projectDir.replace(systemTestsDir, '').slice(1)
 
-  const expectedScaffoldDir = path.posix.join(projectDir, `expected-cypress-${language}-${testingType}`)
+  let expectedScaffoldDir = path.join(projectDir, `expected-cypress-${language}-${testingType}`)
+
+  if (ctFramework) {
+    expectedScaffoldDir += `-${removeHyphensAndBrackets(ctFramework)}`
+  }
 
-  const currentProjectPosix = currentProject.split(path.sep).join(path.posix.sep)
+  const joinPosix = (...s: string[]) => path.join(...s).split(path.sep).join(path.posix.sep)
 
   const files = (
     await Promise.all([
-      globby(path.posix.join(currentProjectPosix, 'cypress'), { onlyFiles: true }),
-      globby(path.posix.join(currentProjectPosix, 'cypress.config.*'), { onlyFiles: true }),
+      globby(joinPosix(currentProject, 'cypress'), { onlyFiles: true }),
+      globby(joinPosix(currentProject, 'cypress.config.*'), { onlyFiles: true }),
     ])
   ).reduce((acc, curr) => {
     return [acc, curr].flat(2)
@@ -112,8 +121,8 @@ export async function snapshotCypressDirectory ({ currentProject, language, test
 
   const filesToDiff = actualRelativeFiles.map<FileToDiff>((file) => {
     return {
-      actual: path.posix.join(currentProjectPosix, file),
-      expected: path.posix.join(expectedScaffoldDir, file),
+      actual: path.join(currentProject, file),
+      expected: path.join(expectedScaffoldDir, file),
     }
   })