fix: Custom Cypress tests

apps/site/pages/docs/faststore-config-options/custom-cypress-test.mdx

@@ -30,11 +30,11 @@ Learn how to add custom integration tests in the following steps.
 
 - Refer to [Cypress documentation](https://docs.cypress.io/guides/overview/why-cypress) for more information on this testing tool.
 
-- Ensure that you are using `@faststore/core` and `@faststore/cli` version 2.1.56 or above. If you are using a previous version, take the following steps:
+- Ensure you are using `@faststore/core`  `2.1.56` version or above and `@faststore/cli` version `2.2.6` or above. If you have versions lower than these requirements, update them as follows:
   1. In your storefront project, open the `package.json` file.
-  2. Navigate to the `@faststore/core` and `@faststore/cli` dependencies and and update their versions to be at least `2.1.56`.
-  3. Run `yarn install` to apply these changes.
-
+  2. Navigate to the `@faststore/core` and update it to at least `2.1.56`.
+  3. Navigate to the `@faststore/cli` and update it to at least `2.2.6`.
+  4. Run `yarn dev` to apply these changes.
 
 ---
 
@@ -51,15 +51,16 @@ Learn how to add custom integration tests in the following steps.
   }
 ```
 
----
-
 ## Step 2: Integrating custom Cypress tests into your FastStore project
 
+Like any other project using Cypress, you'll follow standard practices, including setting up standard Cypress folders and configuration files. This allows you to seamlessly add and execute your custom integration tests within your project. For further details on Cypress configuration, refer to the official [Cypress configuration](https://docs.cypress.io/guides/references/configuration) guide.
+
 1. In the root directory of your storefront project, create a new folder named `cypress`.
-2. Add your custom integration tests within the `cypress` folder. 
-3. Open a pull request with the changes you have made.
-4. Within the pull request, navigate to **Checks > Integration Tests** and check the **Details** section.
+2. Add your custom integration tests within the `cypress/integration` folder.
+3. With the local server running, run `yarn test` to open the Cypress app and to check your tests execution.
+4. Open a pull request with the changes you have made.
+5. Within the pull request, navigate to **Checks > Integration Tests** and check the **Details** section.
 
 ![checks-integration-tests](https://vtexhelp.vtexassets.com/assets/docs/src/custom-test-checks___583ac9b78e43ebdafde93a735a47d61b.png)
 
-5. Review the results to check the execution status of your custom integration tests.
+6. Review the results to check the execution status of your custom integration tests.

packages/cli/src/commands/test.ts

@@ -2,8 +2,8 @@ import { Command } from '@oclif/core'
 import { spawn } from 'child_process'
 import chokidar from 'chokidar'
 
-import { getRoot, tmpDir } from '../utils/directory'
 import { generate } from '../utils/generate'
+import { getRoot, tmpDir } from '../utils/directory'
 
 /**
  * Taken from toolbelt
@@ -29,7 +29,7 @@ const defaultIgnored = [
 const testAbortController = new AbortController()
 
 async function storeTest() {
-  const testProcess = spawn('yarn test', {
+  const testProcess = spawn('yarn test:e2e', {
     shell: true,
     cwd: tmpDir,
     signal: testAbortController.signal,
@@ -59,7 +59,7 @@ export default class Test extends Command {
       watcher.close()
     })
 
-    await generate({ test: true })
+    await generate({ setup: true })
 
     storeTest()
 

packages/cli/src/utils/generate.ts

@@ -36,7 +36,6 @@ import chalk from 'chalk'
 
 interface GenerateOptions {
   setup?: boolean
-  test?: boolean
 }
 
 const ignorePaths = ['node_modules', 'cypress.config.ts']
@@ -89,12 +88,27 @@ async function copyCypressFiles() {
     }
 
     const userStoreConfig = await import(userStoreConfigFileDir)
-    if (userStoreConfig?.experimental?.enableCypressExtension) {
-      copySync(`${userDir}/cypress`, `${tmpDir}/cypress/integration`, {
+
+    // Copy custom Cypress folder and files
+    if (
+      existsSync(`${userDir}/cypress`) &&
+      userStoreConfig?.experimental?.enableCypressExtension
+    ) {
+      copySync(`${userDir}/cypress`, `${tmpDir}/cypress`, {
         overwrite: true,
       })
+
       console.log(`${chalk.green('success')} - Cypress test files copied`)
     }
+
+    // Create default Cypress 12.x (or superior) support file
+    if (userStoreConfig?.experimental?.cypressVersion > 9) {
+      copySync(
+        `${tmpDir}/cypress/support/index.js`,
+        `${tmpDir}/cypress/support/e2e.js`,
+        { overwrite: false }
+      )
+    }
   } catch (e) {
     console.error(e)
   }
@@ -236,14 +250,10 @@ function createNodeModulesSymbolicLink() {
 }
 
 export async function generate(options?: GenerateOptions) {
-  const { setup = false, test = false } = options ?? {}
+  const { setup = false } = options ?? {}
 
   let setupPromise: Promise<unknown> | null = null
 
-  if (test) {
-    return copyCypressFiles()
-  }
-
   if (setup) {
     setupPromise = Promise.all([
       createTmpFolder(),