Merge pull request #19955 from mshima/skip_ci-fix_cypress

cypress template path should be constant
jhipster · Oct 25, 2022 · 9620de0 · 9620de0
2 parents e35eef3 + f0d9070
commit 9620de0
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/generators/cypress/files.js b/generators/cypress/files.js
@@ -24,8 +24,12 @@
 
 const faker = require('@faker-js/faker');
 
+const constants = require('../generator-constants');
+
 const { stringHashCode } = require('../utils');
 
+const CYPRESS_TEMPLATES_DIR = `${constants.CLIENT_TEST_SRC_DIR}cypress/`;
+
 const cypressFiles = {
   common: [
     {
@@ -34,7 +38,8 @@ const cypressFiles = {
   ],
   clientTestFw: [
     {
-      path: generator => generator.cypressFolder,
+      path: CYPRESS_TEMPLATES_DIR,
+      renameTo: (ctx, file) => `${ctx.cypressFolder}${file}`,
       templates: [
         '.eslintrc.json',
         'fixtures/integration-test.png',
@@ -50,12 +55,14 @@ const cypressFiles = {
     },
     {
       condition: generator => !generator.authenticationTypeOauth2,
-      path: generator => generator.cypressFolder,
+      path: CYPRESS_TEMPLATES_DIR,
+      renameTo: (ctx, file) => `${ctx.cypressFolder}${file}`,
       templates: ['e2e/account/login-page.cy.ts'],
     },
     {
       condition: generator => !generator.authenticationTypeOauth2 && !generator.databaseTypeNo && !generator.applicationTypeMicroservice,
-      path: generator => generator.cypressFolder,
+      path: CYPRESS_TEMPLATES_DIR,
+      renameTo: (ctx, file) => `${ctx.cypressFolder}${file}`,
       templates: [
         'e2e/account/register-page.cy.ts',
         'e2e/account/settings-page.cy.ts',
@@ -65,14 +72,16 @@ const cypressFiles = {
     },
     {
       condition: generator => generator.authenticationTypeOauth2,
-      path: generator => generator.cypressFolder,
+      path: CYPRESS_TEMPLATES_DIR,
+      renameTo: (ctx, file) => `${ctx.cypressFolder}${file}`,
       templates: ['support/oauth2.ts'],
     },
   ],
   audit: [
     {
       condition: generator => generator.cypressAudit,
-      path: generator => generator.cypressFolder,
+      path: CYPRESS_TEMPLATES_DIR,
+      renameTo: (ctx, file) => `${ctx.cypressFolder}${file}`,
       templates: ['e2e/lighthouse.audits.ts'],
     },
     {
@@ -83,7 +92,8 @@ const cypressFiles = {
   coverage: [
     {
       condition: generator => generator.cypressCoverage,
-      path: generator => generator.cypressFolder,
+      path: CYPRESS_TEMPLATES_DIR,
+      renameTo: (ctx, file) => `${ctx.cypressFolder}${file}`,
       templates: ['plugins/global.d.ts'],
     },
   ],