generator-jhipster 7.9.2 → 7.9.4

package/generators/client/templates/vue/package.json.ejs

@@ -92,7 +92,7 @@
     "jest-environment-jsdom": "<%= dependabotPackageJson.devDependencies['jest-environment-jsdom'] %>",
     "jest-junit": "<%= dependabotPackageJson.devDependencies['jest-junit'] %>",
     "jest-serializer-vue": "<%= dependabotPackageJson.devDependencies['jest-serializer-vue'] %>",
-    "jest-sonar-reporter": "<%= dependabotPackageJson.devDependencies['jest-sonar-reporter'] %>",
+    "jest-sonar": "<%= dependabotPackageJson.devDependencies['jest-sonar'] %>",
 <%_ if (enableTranslation) { _%>
     "folder-hash": "<%= dependabotPackageJson.devDependencies['folder-hash'] %>",
     "merge-jsons-webpack-plugin": "<%= dependabotPackageJson.devDependencies['merge-jsons-webpack-plugin'] %>",
@@ -144,8 +144,8 @@
     "default_environment": "prod"
   },
   "scripts": {
-    "prettier:check": "prettier --check \"{,src/**/,webpack/}*.{<%= getPrettierExtensions() %>}\"",
-    "prettier:format": "prettier --write \"{,src/**/,webpack/}*.{<%= getPrettierExtensions() %>}\"",
+    "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= getPrettierExtensions() %>}\"",
+    "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= getPrettierExtensions() %>}\"",
     "lint": "eslint . --ext .ts,.vue ",
     "lint:fix": "eslint . --ext .ts,.vue --fix",
     "cleanup": "rimraf <%= DIST_DIR %>",
@@ -191,10 +191,6 @@
     "webpack-dev-server": "webpack serve --config webpack/webpack.common.js",
     "webpack": "webpack --config webpack/webpack.common.js"
   },
-  "jestSonar": {
-    "reportPath": "<%= BUILD_DIR %>test-results/jest",
-    "reportFile": "TESTS-results-sonar.xml"
-  },
   "browserslist": [
     "> 1%",
     "last 2 versions",

package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs

@@ -31,7 +31,8 @@ export default class JhiNavbar extends Vue {
 
   created() {
 <%_ if (enableTranslation) { _%>
-    this.translationService().refreshTranslation(this.currentLanguage);
+    const currentLanguage = Object.keys(this.languages).includes(navigator.language) ? navigator.language : this.currentLanguage;
+    this.translationService().refreshTranslation(currentLanguage);
 <%_ } _%>
   }
 

package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs

@@ -53,7 +53,7 @@
             <font-awesome-icon icon="users-cog" />
             <span class="no-bold" v-text="$t('global.menu.admin.main')">Administration</span>
           </span>
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
           <b-dropdown-item to="/admin/gateway" active-class="active">
             <font-awesome-icon icon="road" />
             <span v-text="$t('global.menu.admin.gateway')">Gateway</span>

package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs

@@ -33,7 +33,7 @@ import '../content/scss/vendor.scss';
 <%_ if (enableTranslation) { _%>
 import TranslationService from '@/locale/translation.service';
 <%_ } _%>
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { %>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { %>
 import GatewayService from '@/admin/gateway/gateway.service';
 <%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
@@ -107,7 +107,7 @@ router.beforeEach(async (to, from, next) => {
     registerService: () => new RegisterService(),
     userManagementService: () => new UserManagementService(),
 <%_ } _%>
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { %>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { %>
     gatewayService: () => new GatewayService(),
 <%_ } _%>
 <%_ if (withAdminUi) { _%>

package/generators/client/templates/vue/src/main/webapp/app/router/admin.ts.ejs

@@ -12,7 +12,7 @@ import {Authority} from "@/shared/security/authority";
   const <%= jhiPrefixCapitalized %>LogsComponent = () => import('@/admin/logs/logs.vue');
   const <%= jhiPrefixCapitalized %>MetricsComponent = () => import('@/admin/metrics/metrics.vue');
 <%_ } _%>
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
   const <%= jhiPrefixCapitalized %>GatewayComponent = () => import('@/admin/gateway/gateway.vue');
 <%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
@@ -78,7 +78,7 @@ export default [
       meta: { authorities: [Authority.ADMIN] }
     },
 <%_ } _%>
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
     {
       path: '/admin/gateway',
       name: '<%= jhiPrefixCapitalized %>GatewayComponent',

package/generators/client/templates/vue/src/test/javascript/e2e/modules/administration/administration.spec.ts.ejs

@@ -30,7 +30,7 @@ describe('Administration', () => {
   });
 <%_ } _%>
 
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
   it('should load gateway', async () => {
     const gatewayPage = await navBarPage.getGatewayPage();
     expect(await gatewayPage.title.isDisplayed()).to.be.true;

package/generators/client/templates/vue/src/test/javascript/e2e/page-objects/administration-page.ts.ejs

@@ -88,7 +88,7 @@ export class UserManagementDeletePage {
   okButton: ElementFinder = element(by.id('confirm-delete-user'));
 }
 
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
 export class GatewayPage {
   title: ElementFinder = element(by.id('gateway-page-heading'));
 }

package/generators/client/templates/vue/src/test/javascript/e2e/page-objects/navbar-page.ts.ejs

@@ -8,7 +8,7 @@ import SettingsPage from './settings-page';
 <%_ } _%>
 import {
   ConfigurationsPage,
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
   GatewayPage,
 <%_ } _%>
   HealthPage,
@@ -155,7 +155,7 @@ async getRegisterPage() {
     await waitUntilDisplayed(logsPage.title);
     return logsPage;
   }
-<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
+<%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
 
   async getGatewayPage() {
     await this.clickOnAdminMenuItem('gateway');

package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs

@@ -24,10 +24,13 @@ module.exports = {
   },
   reporters: [
     'default',
-    [ 'jest-junit', { outputDirectory: './<%= BUILD_DIR %>test-results/', outputName: 'TESTS-results-jest.xml' } ],
+    ['jest-junit', { outputDirectory: './<%= BUILD_DIR %>test-results/', outputName: 'TESTS-results-jest.xml' }],
+    ['jest-sonar', { outputDirectory: './<%= BUILD_DIR %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
   ],
-  testResultsProcessor: 'jest-sonar-reporter',
   testMatch: ['<rootDir>/<%= CLIENT_TEST_SRC_DIR %>spec/**/@(*.)@(spec.ts)'],
+  testEnvironmentOptions: {
+    url: 'https://jhipster.tech',
+  },
   snapshotSerializers: ['jest-serializer-vue'],
   globals: {
 <%_ if (enableTranslation) { _%>
@@ -42,11 +45,7 @@ module.exports = {
   coverageThreshold: {
     global: {
       statements: 80,
-<%_ if (microfrontend) { _%>
-      branches: 57,
-<%_ } else { _%>
       branches: 60,
-<%_ } _%>
       functions: 70,
       lines: 80,
     },

package/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs

@@ -88,6 +88,8 @@ describe('Account Service test suite', () => {
   });
 
   it('should init service and check for authority after retrieving account', async () => {
+    const reqUrl = 'requrl';
+    sessionStorage.setItem('requested-url', reqUrl);
 <%_ if (authenticationTypeJwt) { _%>
     localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'token');
 <%_ } %>
@@ -95,6 +97,8 @@ describe('Account Service test suite', () => {
     accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationTypeSession || authenticationTypeOauth2) { _%>mockedCookie,<%_ } %> router);
 
     return accountService.hasAnyAuthorityAndCheckAuth('USER').then((value: boolean) => {
+      expect((<any>router).history.current.fullPath).toBe(`/${reqUrl}`);
+      expect(sessionStorage.getItem('requested-url')).toBe(null);
       expect(value).toBe(true);
     });
   });

package/generators/client/templates/vue/src/test/javascript/spec/app/shared/alert/alert.service.spec.ts.ejs

@@ -40,7 +40,7 @@ describe('Alert Service test suite', () => {
     // WHEN
     alertService.showError((<any>vueInstance) as Vue, <% if (enableTranslation) { %>translationKey<%} else {%>message<% } %>);
 
-    //THEN
+    // THEN
     <%_ if (enableTranslation) { _%>
     expect(translationStub.withArgs(translationKey).callCount).toEqual(1);
     <%_ } _%>
@@ -71,7 +71,7 @@ describe('Alert Service test suite', () => {
     // WHEN
     alertService.showHttpError((<any>vueInstance) as Vue, httpErrorResponse);
 
-    //THEN
+    // THEN
     <%_ if (enableTranslation) { _%>
     expect(translationStub.withArgs(translationKey).callCount).toEqual(1);
     <%_ } _%>
@@ -107,7 +107,7 @@ describe('Alert Service test suite', () => {
     // WHEN
     alertService.showHttpError((<any>vueInstance) as Vue, httpErrorResponse);
 
-    //THEN
+    // THEN
     <%_ if (enableTranslation) { _%>
     expect(translationStub.withArgs(translationKey, { entityName: 'DummyEntity' }).callCount).toEqual(1);
     <%_ } _%>
@@ -121,4 +121,107 @@ describe('Alert Service test suite', () => {
       })
     ).toBeTruthy();
   });
+
+  it('should show error toast with data.message when http status = 400 and entity headers', async () => {
+    const message = 'Validation error';
+    const httpErrorResponse = {
+      status: 400,
+      headers: {
+        'x-jhipsterapp-error400': 'error',
+        'x-jhipsterapp-params400': 'dummyEntity',
+      },
+      data: {
+        message,
+        fieldErrors: {
+          'field1': 'error1',
+        },
+      },
+    };
+
+    <%_ if (enableTranslation) { _%>
+    // GIVEN
+    translationStub.withArgs(message).returns(message);
+    <%_ } _%>
+
+    // WHEN
+    alertService.showHttpError((<any>vueInstance) as Vue, httpErrorResponse);
+
+    // THEN
+    <%_ if (enableTranslation) { _%>
+    expect(translationStub.withArgs(message).callCount).toEqual(1);
+    <%_ } _%>
+    expect(
+      toastStub.calledOnceWith(message, {
+        toaster: 'b-toaster-top-center',
+        title: 'Error',
+        variant: 'danger',
+        solid: true,
+        autoHideDelay: 5000,
+      })
+    ).toBeTruthy();
+  });
+
+  it('should show error toast when http status = 404', async () => {
+    <%_ if (enableTranslation) { _%>
+    const translationKey = 'error.http.404';
+    <%_ } _%>
+    const message = 'Not found';
+    const httpErrorResponse = {
+      status: 404,
+    };
+
+    <%_ if (enableTranslation) { _%>
+    // GIVEN
+    translationStub.withArgs(translationKey).returns(message);
+    <%_ } _%>
+
+    // WHEN
+    alertService.showHttpError((<any>vueInstance) as Vue, httpErrorResponse);
+
+    // THEN
+    <%_ if (enableTranslation) { _%>
+    expect(translationStub.withArgs(translationKey).callCount).toEqual(1);
+    <%_ } _%>
+    expect(
+      toastStub.calledOnceWith(message, {
+        toaster: 'b-toaster-top-center',
+        title: 'Error',
+        variant: 'danger',
+        solid: true,
+        autoHideDelay: 5000,
+      })
+    ).toBeTruthy();
+  });
+
+  it('should show error toast when http status != 400,404', async () => {
+    const message = 'Error 500';
+    const httpErrorResponse = {
+      status: 500,
+      data: {
+        message,
+      }
+    };
+
+    <%_ if (enableTranslation) { _%>
+    // GIVEN
+    translationStub.withArgs(message).returns(message);
+    <%_ } _%>
+
+    // WHEN
+    alertService.showHttpError((<any>vueInstance) as Vue, httpErrorResponse);
+
+    // THEN
+    <%_ if (enableTranslation) { _%>
+    expect(translationStub.withArgs(message).callCount).toEqual(1);
+    <%_ } _%>
+    expect(
+      toastStub.calledOnceWith(message, {
+        toaster: 'b-toaster-top-center',
+        title: 'Error',
+        variant: 'danger',
+        solid: true,
+        autoHideDelay: 5000,
+      })
+    ).toBeTruthy();
+  });
 });

package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/axios-interceptor.spec.ts.ejs

@@ -56,5 +56,17 @@ describe('Axios errors interceptor', () => {
         expect(callback.called).toBeTruthy();
       }
     });
+    it('should not use callback for errors different 50x, 401, 403', async () => {
+      const callback = sinon.spy();
+  
+      setupAxiosConfig.setupAxiosInterceptors(() => {}, callback);
+  
+      try {
+        mock.onGet().reply(402);
+        await axios('/api/test');
+      } catch {
+        expect(callback.called).toBeFalsy();
+      }
+    });
   });
   

package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/formatter.spec.ts.ejs

@@ -12,4 +12,10 @@ describe('Formatter i18n', () => {
 
     expect(result[0]).toBe('val1');
   });
+
+  it('should not interpolate message without values', () => {
+    const result = formatter.interpolate('this is a text', undefined);
+
+    expect(result[0]).toBe('this is a text');
+  });
 });

package/generators/client/templates/vue/src/test/javascript/spec/app/shared/sort/sorts.spec.ts.ejs

@@ -0,0 +1,10 @@
+import buildPaginationQueryOpts from '@/shared/sort/sorts';
+
+describe('Sort', () => {
+
+  it('should return an empty string if there is no pagination', () => {
+    const result = buildPaginationQueryOpts(undefined);
+
+    expect(result).toBe('');
+  });
+});

package/generators/client/templates/vue/webpack/webpack.common.js.ejs

@@ -156,7 +156,7 @@ module.exports = async (env, options) => {
               globOptions: { ignore: ['**/index.html'] },
             },
             {
-              from: require.resolve('axios/dist/axios.min.js'), 
+              from: require.resolve('axios/dist/axios.min.js'),
               to: 'swagger-ui/',
             },
             { from: './<%= CLIENT_MAIN_SRC_DIR %>swagger-ui/', to: 'swagger-ui/' },

package/generators/client/templates/vue/webpack/webpack.dev.js.ejs

@@ -31,8 +31,8 @@ module.exports = (env, options) => {
     // cheap-module-eval-source-map is faster for development
     devtool: config.dev.devtool,
     output: {
-      filename: 'app/[contenthash].bundle.js',
-      chunkFilename: 'app/[id].chunk.js'
+      filename: 'app/[name].[contenthash].bundle.js',
+      chunkFilename: 'app/[id].[chunkhash].chunk.js'
     },
     optimization: {
       moduleIds: 'named',

package/generators/common/files.js

@@ -46,13 +46,14 @@ const commonFiles = {
           file: 'editorconfig',
           renameTo: () => '.editorconfig',
         },
-        {
-          file: 'sonar-project.properties',
-          renameTo: () => 'sonar-project.properties',
-        },
       ],
     },
   ],
+  sonar: [
+    {
+      templates: ['sonar-project.properties'],
+    },
+  ],
   commitHooks: [
     {
       condition: generator => !generator.skipCommitHook,

package/generators/common/templates/package.json

@@ -3,7 +3,7 @@
     "concurrently": "7.3.0",
     "husky": "7.0.4",
     "lint-staged": "13.0.3",
-    "npm": "8.15.1",
+    "npm": "8.19.1",
     "wait-on": "6.0.1"
   }
 }

package/generators/common/templates/sonar-project.properties.ejs

@@ -1,16 +1,21 @@
 sonar.projectKey=<%= baseName %>
 sonar.projectName=<%= baseName %> generated by jhipster
-sonar.projectVersion=1.0
 
-sonar.sources=<%= MAIN_DIR %>
+# Typescript tests files must be inside sources and tests, othewise `INFO: Test execution data ignored for 80 unknown files, including:` is shown.
+sonar.sources=src
+sonar.tests=src
 sonar.host.url=http://localhost:9001
 
-<%_ if (!skipClient && clientFrameworkAngular) { _%>
+<%_ if (clientFrameworkAny) { _%>
+  <%_ if (clientFrameworkAngular) { _%>
 sonar.test.inclusions=<%= TEST_DIR %>**/*.*, <%= CLIENT_MAIN_SRC_DIR %>app/**/*.spec.ts
-<%_ } else if (!skipClient && clientFrameworkReact) { _%>
+  <%_ } else if (clientFrameworkReact) { _%>
 sonar.test.inclusions=<%= TEST_DIR %>**/*.*, <%= CLIENT_MAIN_SRC_DIR %>app/**/*.spec.ts, <%= CLIENT_MAIN_SRC_DIR %>app/**/*.spec.tsx
+  <%_ } else { _%>
+sonar.test.inclusions=<%= TEST_DIR %>**/*.*
+  <%_ } _%>
 <%_ } else { _%>
-sonar.tests=<%= TEST_DIR %>
+sonar.test.inclusions=<%= TEST_DIR %>**/*.*
 <%_ } _%>
 <%_ if (!skipServer) { _%>
     <%_ if (buildToolMaven) { _%>
@@ -33,21 +38,24 @@ sonar.javascript.lcov.reportPaths=<%_ if (buildToolMaven) { _%>target<%_ } else
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=<%= CLIENT_MAIN_SRC_DIR %>content/**/*.*, <%= CLIENT_MAIN_SRC_DIR %>i18n/*.js, <%= CLIENT_DIST_DIR %>**/*.*
 
-sonar.issue.ignore.multicriteria=<%_ if (!skipServer) { _%>S3437,<% if (authenticationTypeJwt) { %>S4502,<% } %>S4684,UndocumentedApi<%_ } _%>
+sonar.issue.ignore.multicriteria=<%_ if (!skipServer) { _%>S3437,<% if (authenticationTypeJwt) { %>S4502,<% } %>S4684,S5145,UndocumentedApi<%_ } _%>
 
 <%_ if (!skipServer) { _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-3437 is ignored, as a JPA-managed field cannot be transient
 sonar.issue.ignore.multicriteria.S3437.resourceKey=<%= MAIN_DIR %>java/**/*
 sonar.issue.ignore.multicriteria.S3437.ruleKey=squid:S3437
-# Rule https://rules.sonarsource.com/java/RSPEC-1176 is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names should be self-explanatory
-sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey=<%= MAIN_DIR %>java/**/*
-sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey=squid:UndocumentedApi
-<%_ if (authenticationTypeJwt) { _%>
+  <%_ if (authenticationTypeJwt) { _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-4502 is ignored, as for JWT tokens we are not subject to CSRF attack
 sonar.issue.ignore.multicriteria.S4502.resourceKey=<%= MAIN_DIR %>java/**/*
 sonar.issue.ignore.multicriteria.S4502.ruleKey=java:S4502
-<%_ } _%>
+  <%_ } _%>
 # Rule https://rules.sonarsource.com/java/RSPEC-4684
 sonar.issue.ignore.multicriteria.S4684.resourceKey=<%= MAIN_DIR %>java/**/*
 sonar.issue.ignore.multicriteria.S4684.ruleKey=java:S4684
+# Rule https://rules.sonarsource.com/java/RSPEC-5145 log filter is applied
+sonar.issue.ignore.multicriteria.S5145.resourceKey=<%= MAIN_DIR %>java/**/*
+sonar.issue.ignore.multicriteria.S5145.ruleKey=javasecurity:S5145
+# Rule https://rules.sonarsource.com/java/RSPEC-1176 is ignored, as we want to follow "clean code" guidelines and classes, methods and arguments names should be self-explanatory
+sonar.issue.ignore.multicriteria.UndocumentedApi.resourceKey=<%= MAIN_DIR %>java/**/*
+sonar.issue.ignore.multicriteria.UndocumentedApi.ruleKey=squid:UndocumentedApi
 <%_ } _%>

package/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'],
     },
   ],

package/generators/cypress/index.js

@@ -69,7 +69,7 @@ module.exports = class extends BaseBlueprintGenerator {
   _prompting() {
     return {
       async askForCypressOptions() {
-        if (this.options.existingProject || !this.jhipsterConfig.testFrameworks.includes(CYPRESS)) {
+        if (this.options.existingProject || !(this.jhipsterConfig.testFrameworks || []).includes(CYPRESS)) {
           return;
         }
         await this.prompt(

package/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs

@@ -5,14 +5,14 @@
 Launch all your infrastructure by running: `docker-compose up -d`.
 
 ## Configured Docker services
-<%_ if (serviceDiscoveryType) { _%>
+<%_ if (serviceDiscoveryAny) { _%>
 
 ### Service registry and configuration server:
 <%_ } _%>
-<%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ if (serviceDiscoveryEureka) { _%>
 - [JHipster Registry](http://localhost:8761)
 <%_ } _%>
-<%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ if (serviceDiscoveryConsul) { _%>
 - [Consul](http://localhost:8500)
 <%_ } _%>
 

package/generators/docker-compose/templates/docker-compose.yml.ejs

@@ -49,7 +49,7 @@ services:
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
   <%_ if (usesOauth2) { _%>
-      - JHIPSTER_SLEEP=30
+      - JHIPSTER_SLEEP=80
   <%_ } _%>
       - SPRING_PROFILES_ACTIVE=dev<% if (usesOauth2) { %>,oauth2<% } %>
       - SPRING_SECURITY_USER_PASSWORD=<%= adminPassword %>