Merge branch '10.0-release' into zachw/ct-node-17

Author: ZachJW34

packages/app/cypress/e2e/cypress-in-cypress.cy.ts

@@ -208,8 +208,10 @@ describe('Cypress in Cypress', { viewportWidth: 1500, defaultCommandTimeout: 100
     it(`resets selector playground validity when selecting element with playground selector in ${testingType}`, () => {
       startAtSpecsPage(testingType)
 
-      cy.get('[data-cy="spec-item"]').first().click()
-      cy.get('#unified-reporter').should('be.visible')
+      const spec = testingType === 'e2e' ? 'dom-content.spec.js' : 'TestComponent.spec.jsx'
+
+      cy.get('[data-cy="spec-item"]').contains(spec).click()
+      cy.get('.passed > .num').should('contain', 1)
 
       cy.get('[data-cy="playground-activator"]').click()
       cy.get('[data-cy="playground-selector"]').clear()

packages/app/cypress/e2e/specs.cy.ts

@@ -509,6 +509,8 @@ describe('App: Specs', () => {
 
         it('shows success modal when empty spec is created', () => {
           cy.get('@CreateEmptySpecDialog').within(() => {
+            cy.findByLabelText('Enter a relative path...').invoke('val').should('eq', getPathForPlatform('cypress/component/filename.cy.ts'))
+
             cy.findByLabelText('Enter a relative path...').clear().type('cypress/my-empty-spec.cy.js')
 
             cy.findByRole('button', { name: 'Create Spec' }).click()
@@ -533,6 +535,8 @@ describe('App: Specs', () => {
 
         it('navigates to spec runner when selected', () => {
           cy.get('@CreateEmptySpecDialog').within(() => {
+            cy.findByLabelText('Enter a relative path...').invoke('val').should('eq', getPathForPlatform('cypress/component/filename.cy.ts'))
+
             cy.findByLabelText('Enter a relative path...').clear().type('cypress/my-empty-spec.cy.js')
 
             cy.findByRole('button', { name: 'Create Spec' }).click()
@@ -551,6 +555,8 @@ describe('App: Specs', () => {
 
         it('displays alert with docs link on new spec', () => {
           cy.get('@CreateEmptySpecDialog').within(() => {
+            cy.findByLabelText('Enter a relative path...').invoke('val').should('eq', getPathForPlatform('cypress/component/filename.cy.ts'))
+
             cy.findByLabelText('Enter a relative path...').clear().type('cypress/my-empty-spec.cy.js')
 
             cy.findByRole('button', { name: 'Create Spec' }).click()

packages/app/src/specs/CreateSpecModal.cy.tsx

@@ -14,11 +14,6 @@ describe('<CreateSpecModal />', () => {
         gql={{
           currentProject: {
             id: 'id',
-            codeGenGlobs: {
-              id: 'super-unique-id',
-              __typename: 'CodeGenGlobs',
-              component: '**.vue',
-            },
             currentTestingType: 'component',
             configFile: 'cypress.config.js',
             configFileAbsolutePath: '/path/to/cypress.config.js',
@@ -79,11 +74,6 @@ describe('playground', () => {
         gql={{
           currentProject: {
             id: 'id',
-            codeGenGlobs: {
-              id: 'super-unique-id',
-              __typename: 'CodeGenGlobs',
-              component: '**.vue',
-            },
             currentTestingType: 'component',
             configFile: 'cypress.config.js',
             configFileAbsolutePath: '/path/to/cypress.config.js',

packages/app/src/specs/CreateSpecModal.vue

@@ -20,7 +20,6 @@
         v-if="generator"
         :key="`${generator.id}-${iteration}`"
         v-model:title="title"
-        :code-gen-glob="codeGenGlob"
         :gql="props.gql.currentProject"
         :type="props.gql.currentProject?.currentTestingType"
         :spec-file-name="specFileName"
@@ -78,10 +77,6 @@ fragment CreateSpecModal on Query {
     id
     fileExtensionToUse
     defaultSpecFileName
-    codeGenGlobs {
-      id
-      component
-    }
     ...EmptyGenerator
   }
 }
@@ -114,14 +109,6 @@ const specFileName = computed(() => {
   return getPathForPlatform(fileName)
 })
 
-const codeGenGlob = computed(() => {
-  if (!generator.value) {
-    return null
-  }
-
-  return props.gql.currentProject?.codeGenGlobs[generator.value.id]
-})
-
 const filteredGenerators = getFilteredGeneratorList(props.gql.currentProject?.currentTestingType)
 
 const singleGenerator = computed(() => filteredGenerators.value.length === 1 ? filteredGenerators.value[0] : null)

packages/data-context/package.json

@@ -23,7 +23,6 @@
     "@urql/exchange-graphcache": "4.3.6",
     "chokidar": "3.5.1",
     "common-path-prefix": "3.0.0",
-    "create-cypress-tests": "0.0.0-development",
     "cross-fetch": "^3.1.4",
     "dataloader": "^2.0.0",
     "dayjs": "^1.9.3",

packages/data-context/src/actions/MigrationActions.ts

@@ -260,9 +260,11 @@ export class MigrationActions {
       throw error
     })
 
-    // @ts-ignore configFile needs to be updated with the new one, so it finds the correct one
-    // with the new file, instead of the deleted one which is not supported anymore
-    this.ctx.modeOptions.configFile = this.ctx.migration.configFileNameAfterMigration
+    if (this.ctx.modeOptions.configFile) {
+      // @ts-ignore configFile needs to be updated with the new one, so it finds the correct one
+      // with the new file, instead of the deleted one which is not supported anymore
+      this.ctx.modeOptions.configFile = this.ctx.migration.configFileNameAfterMigration
+    }
   }
 
   async setLegacyConfigForMigration (config: LegacyCypressConfigJson) {

packages/data-context/src/sources/ProjectDataSource.ts

@@ -1,8 +1,6 @@
 import os from 'os'
 import chokidar from 'chokidar'
-import type { ResolvedFromConfig, RESOLVED_FROM, FoundSpec } from '@packages/types'
-import { WIZARD_FRAMEWORKS } from '@packages/scaffold-config'
-import { scanFSForAvailableDependency } from 'create-cypress-tests'
+import type { ResolvedFromConfig, RESOLVED_FROM, FoundSpec, TestingType } from '@packages/types'
 import minimatch from 'minimatch'
 import { debounce, isEqual } from 'lodash'
 import path from 'path'
@@ -104,7 +102,7 @@ export function transformSpec ({
   }
 }
 
-export function getDefaultSpecFileName (specPattern: string, fileExtensionToUse?: 'js' | 'ts') {
+export function getDefaultSpecFileName (specPattern: string, testingType: TestingType, fileExtensionToUse?: 'js' | 'ts') {
   function replaceWildCard (s: string, fallback: string) {
     return s.replace(/\*/g, fallback)
   }
@@ -121,7 +119,7 @@ export function getDefaultSpecFileName (specPattern: string, fileExtensionToUse?
     dirname = dirname.replace('**', 'cypress')
   }
 
-  const splittedDirname = dirname.split('/').filter((s) => s !== '**').map((x) => replaceWildCard(x, 'e2e')).join('/')
+  const splittedDirname = dirname.split('/').filter((s) => s !== '**').map((x) => replaceWildCard(x, testingType)).join('/')
   const fileName = replaceWildCard(parsedGlob.path.filename, 'filename')
 
   const extnameWithoutExt = parsedGlob.path.extname.replace(parsedGlob.path.ext, '')
@@ -282,13 +280,15 @@ export class ProjectDataSource {
   }
 
   async defaultSpecFileName () {
-    const defaultFileName = 'cypress/e2e/filename.cy.js'
+    const getDefaultFileName = (testingType: TestingType) => `cypress/${testingType}/filename.cy.${this.ctx.lifecycleManager.fileExtensionToUse}`
 
     try {
       if (!this.ctx.currentProject || !this.ctx.coreData.currentTestingType) {
         return null
       }
 
+      const defaultFileName = getDefaultFileName(this.ctx.coreData.currentTestingType)
+
       let specPatternSet: string | undefined
       const { specPattern = [] } = await this.ctx.project.specPatterns()
 
@@ -300,15 +300,19 @@ export class ProjectDataSource {
         return defaultFileName
       }
 
-      const specFileName = getDefaultSpecFileName(specPatternSet, this.ctx.lifecycleManager.fileExtensionToUse)
+      if (specPatternSet === defaultSpecPattern[this.ctx.coreData.currentTestingType]) {
+        return defaultFileName
+      }
+
+      const specFileName = getDefaultSpecFileName(specPatternSet, this.ctx.coreData.currentTestingType, this.ctx.lifecycleManager.fileExtensionToUse)
 
       if (!specFileName) {
         return defaultFileName
       }
 
       return specFileName
     } catch {
-      return defaultFileName
+      return getDefaultFileName(this.ctx.coreData.currentTestingType ?? 'e2e')
     }
   }
 
@@ -359,31 +363,6 @@ export class ProjectDataSource {
     return preferences[projectTitle] ?? null
   }
 
-  private guessFramework (projectRoot: string) {
-    const guess = WIZARD_FRAMEWORKS.find((framework) => {
-      const lookingForDeps = framework.detectors.map((x) => x.package).reduce(
-        (acc, dep) => ({ ...acc, [dep]: '*' }),
-        {},
-      )
-
-      return scanFSForAvailableDependency(projectRoot, lookingForDeps)
-    })
-
-    return guess ?? null
-  }
-
-  async getCodeGenGlobs () {
-    assert(this.ctx.currentProject, `Cannot find glob without currentProject.`)
-
-    const looseComponentGlob = '*.{js,jsx,ts,tsx,.vue}'
-
-    const framework = this.guessFramework(this.ctx.currentProject)
-
-    return {
-      component: framework?.glob ?? looseComponentGlob,
-    }
-  }
-
   async getResolvedConfigFields (): Promise<ResolvedFromConfig[]> {
     const config = this.ctx.lifecycleManager.loadedFullConfig?.resolved ?? {}
 

packages/data-context/test/unit/codegen/code-generator.spec.ts

@@ -1,10 +1,8 @@
 import { parse } from '@babel/parser'
-import { WIZARD_FRAMEWORKS } from '@packages/scaffold-config'
 import { expect } from 'chai'
 import dedent from 'dedent'
 import fs from 'fs-extra'
 import path from 'path'
-import sinon from 'sinon'
 import { DataContext } from '../../../src'
 import {
   Action, codeGenerator, CodeGenResult, CodeGenResults,
@@ -221,9 +219,6 @@ describe('code-generator', () => {
       target,
     }
 
-    // @ts-ignore
-    sinon.stub(ctx.project, 'guessFramework').returns(WIZARD_FRAMEWORKS[0])
-
     const newSpecCodeGenOptions = new SpecOptions(ctx, {
       codeGenPath: path.join(__dirname, 'files', 'react', 'Button.jsx'),
       codeGenType: 'component',
@@ -244,9 +239,6 @@ describe('code-generator', () => {
       target,
     }
 
-    // @ts-ignore
-    sinon.stub(ctx.project, 'guessFramework').returns(WIZARD_FRAMEWORKS[1])
-
     const newSpecCodeGenOptions = new SpecOptions(ctx, {
       codeGenPath: path.join(__dirname, 'files', 'vue', 'Button.vue'),
       codeGenType: 'component',