ENG-5324 7.3.0 into develop (#253)

* ENGPM-554 Version Update * ENG-5211 Upgrade Cypress Version * ENG-4141 Fix checkbox display in case of true value * ENG-5324 bump version to 7.4.0 --------- Co-authored-by: Alessio Pintus <[email protected]> Co-authored-by: Alessio Pintus <[email protected]>
entando · Nov 23, 2023 · 455c1d4 · 455c1d4
1 parent aab5316
commit 455c1d4
Show file tree

Hide file tree

Showing 12 changed files with 1,733 additions and 794 deletions.
diff --git a/generators/entity-microfrontend/files.js b/generators/entity-microfrontend/files.js
@@ -18,8 +18,8 @@ const microFrontendFiles = {
           renameTo: generator => `${generator.entityFileName}/detailsWidget/.gitignore`,
         },
         {
-          file: 'entity/_shared/cypress.json',
-          renameTo: generator => `${generator.entityFileName}/detailsWidget/cypress.json`,
+          file: 'entity/_shared/cypress.config.js',
+          renameTo: generator => `${generator.entityFileName}/detailsWidget/cypress.config.js`,
         },
         {
           file: 'entity/detailsWidget/jsconfig.json',
@@ -56,8 +56,8 @@ const microFrontendFiles = {
           renameTo: generator => `${generator.entityFileName}/formWidget/.gitignore`,
         },
         {
-          file: 'entity/_shared/cypress.json',
-          renameTo: generator => `${generator.entityFileName}/formWidget/cypress.json`,
+          file: 'entity/_shared/cypress.config.js',
+          renameTo: generator => `${generator.entityFileName}/formWidget/cypress.config.js`,
         },
         {
           file: 'entity/formWidget/jsconfig.json',
@@ -94,8 +94,8 @@ const microFrontendFiles = {
           renameTo: generator => `${generator.entityFileName}/tableWidget/.gitignore`,
         },
         {
-          file: 'entity/_shared/cypress.json',
-          renameTo: generator => `${generator.entityFileName}/tableWidget/cypress.json`,
+          file: 'entity/_shared/cypress.config.js',
+          renameTo: generator => `${generator.entityFileName}/tableWidget/cypress.config.js`,
         },
         {
           file: 'entity/tableWidget/jsconfig.json',

diff --git a/generators/entity-microfrontend/templates/ui/widgets/entity/_shared/cypress.config.js.ejs b/generators/entity-microfrontend/templates/ui/widgets/entity/_shared/cypress.config.js.ejs
@@ -0,0 +1,27 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+    oauth2: {
+        url: 'http://localhost:9080',
+        realm: 'jhipster',
+        clientId: 'web_app',
+    },
+    video: false,
+    fixturesFolder: 'src/test/cypress/fixtures',
+    screenshotsFolder: 'target/cypress/screenshots',
+    chromeWebSecurity: false,
+    viewportWidth: 1200,
+    viewportHeight: 720,
+    retries: 2,
+    includeShadowDom: true,
+    e2e: {
+            // We've imported your old cypress plugins here.
+            // You may want to clean this up later by importing these.
+            setupNodeEvents(on, config) {
+            return require('./src/test/cypress/plugins/index.js')(on, config)
+        },
+    baseUrl: 'http://localhost:3000',
+    specPattern: 'src/test/cypress/integration/**/*.spec.js',
+    supportFile: 'src/test/cypress/support/index.js',
+    },
+})
diff --git a/generators/entity-microfrontend/templates/ui/widgets/entity/_shared/cypress.json.ejs b/generators/entity-microfrontend/templates/ui/widgets/entity/_shared/cypress.json.ejs