Skip to content

Commit

Permalink
cleanup(testing): switch cypress tests to use project name and root a…
Browse files Browse the repository at this point in the history 
…s-provided format by default (#18927)
  • Loading branch information
@leosvelperez
leosvelperez authored Aug 31, 2023
1 parent 1abe35c commit a2493b9
Show file tree
Hide file tree
Showing 4 changed files with 252 additions and 230 deletions.
52 changes: 26 additions & 26 deletions packages/cypress/src/generators/cypress-project/__snapshots__/cypress-project.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`Cypress Project < v7 --linter eslint should add eslint-plugin-cypress 1
{
"extends": [
"plugin:cypress/recommended",
"../../.eslintrc.json",
"../.eslintrc.json",
],
"ignorePatterns": [
"!**/*",
Expand Down Expand Up @@ -42,17 +42,17 @@ exports[`Cypress Project < v7 nested should update configuration 1`] = `
},
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/my-dir/my-app-e2e/cypress.json",
"cypressConfig": "my-dir/my-app-e2e/cypress.json",
"devServerTarget": "my-dir-my-app:serve",
"testingType": "e2e",
"tsConfig": "apps/my-dir/my-app-e2e/tsconfig.json",
"tsConfig": "my-dir/my-app-e2e/tsconfig.json",
},
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/my-dir/my-app-e2e/**/*.{js,ts}",
"my-dir/my-app-e2e/**/*.{js,ts}",
],
},
"outputs": [
Expand All @@ -71,8 +71,8 @@ exports[`Cypress Project < v7 project with directory in its name should set righ
"supportFile": "./src/support/index.ts",
"pluginsFile": "./src/plugins/index",
"video": true,
"videosFolder": "../../../dist/cypress/apps/my-dir/my-app-e2e/videos",
"screenshotsFolder": "../../../dist/cypress/apps/my-dir/my-app-e2e/screenshots",
"videosFolder": "../../dist/cypress/my-dir/my-app-e2e/videos",
"screenshotsFolder": "../../dist/cypress/my-dir/my-app-e2e/screenshots",
"chromeWebSecurity": false
}
"
Expand All @@ -88,17 +88,17 @@ exports[`Cypress Project < v7 project with directory in its name should update c
},
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/my-dir/my-app-e2e/cypress.json",
"cypressConfig": "my-dir/my-app-e2e/cypress.json",
"devServerTarget": "my-dir-my-app:serve",
"testingType": "e2e",
"tsConfig": "apps/my-dir/my-app-e2e/tsconfig.json",
"tsConfig": "my-dir/my-app-e2e/tsconfig.json",
},
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/my-dir/my-app-e2e/**/*.{js,ts}",
"my-dir/my-app-e2e/**/*.{js,ts}",
],
},
"outputs": [
Expand All @@ -108,22 +108,22 @@ exports[`Cypress Project < v7 project with directory in its name should update c
}
`;
exports[`Cypress Project < v7 should update configuration (baseUrl) 1`] = `
exports[`Cypress Project < v7 should update project configuration (baseUrl) 1`] = `
{
"e2e": {
"executor": "@nx/cypress:cypress",
"options": {
"baseUrl": "http://localhost:3000",
"cypressConfig": "apps/my-app-e2e/cypress.json",
"cypressConfig": "my-app-e2e/cypress.json",
"testingType": "e2e",
"tsConfig": "apps/my-app-e2e/tsconfig.json",
"tsConfig": "my-app-e2e/tsconfig.json",
},
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/my-app-e2e/**/*.{js,ts}",
"my-app-e2e/**/*.{js,ts}",
],
},
"outputs": [
Expand All @@ -133,7 +133,7 @@ exports[`Cypress Project < v7 should update configuration (baseUrl) 1`] = `
}
`;
exports[`Cypress Project < v7 should update configuration 1`] = `
exports[`Cypress Project < v7 should update project configuration 1`] = `
{
"e2e": {
"configurations": {
Expand All @@ -143,17 +143,17 @@ exports[`Cypress Project < v7 should update configuration 1`] = `
},
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/my-app-e2e/cypress.json",
"cypressConfig": "my-app-e2e/cypress.json",
"devServerTarget": "my-app:serve",
"testingType": "e2e",
"tsConfig": "apps/my-app-e2e/tsconfig.json",
"tsConfig": "my-app-e2e/tsconfig.json",
},
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/my-app-e2e/**/*.{js,ts}",
"my-app-e2e/**/*.{js,ts}",
],
},
"outputs": [
Expand All @@ -163,7 +163,7 @@ exports[`Cypress Project < v7 should update configuration 1`] = `
}
`;
exports[`Cypress Project < v7 should update configuration 2`] = `
exports[`Cypress Project < v7 should update target configurations 1`] = `
{
"e2e": {
"configurations": {
Expand All @@ -173,17 +173,17 @@ exports[`Cypress Project < v7 should update configuration 2`] = `
},
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/my-app-e2e/cypress.json",
"cypressConfig": "my-app-e2e/cypress.json",
"devServerTarget": "my-app:serve:development",
"testingType": "e2e",
"tsConfig": "apps/my-app-e2e/tsconfig.json",
"tsConfig": "my-app-e2e/tsconfig.json",
},
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/my-app-e2e/**/*.{js,ts}",
"my-app-e2e/**/*.{js,ts}",
],
},
"outputs": [
Expand Down Expand Up @@ -219,14 +219,14 @@ exports[`Cypress Project > v10 nested should set right path names in \`tsconfig.
{
"compilerOptions": {
"allowJs": true,
"outDir": "../../../dist/out-tsc",
"outDir": "../../dist/out-tsc",
"sourceMap": false,
"types": [
"cypress",
"node",
],
},
"extends": "../../../tsconfig.base.json",
"extends": "../../tsconfig.base.json",
"include": [
"src/**/*.ts",
"src/**/*.js",
Expand All @@ -249,14 +249,14 @@ exports[`Cypress Project > v10 should set right path names in \`tsconfig.e2e.jso
{
"compilerOptions": {
"allowJs": true,
"outDir": "../../dist/out-tsc",
"outDir": "../dist/out-tsc",
"sourceMap": false,
"types": [
"cypress",
"node",
],
},
"extends": "../../tsconfig.base.json",
"extends": "../tsconfig.base.json",
"include": [
"src/**/*.ts",
"src/**/*.js",
Expand All @@ -270,7 +270,7 @@ exports[`Cypress Project > v10 should update configuration when eslint is passed
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/my-app-e2e/**/*.{js,ts}",
"my-app-e2e/**/*.{js,ts}",
],
},
"outputs": [
Expand Down
Loading

0 comments on commit a2493b9

Please sign in to comment.