drop mockedGenerators

jhipster · Jul 4, 2024 · 8b707a1 · 8b707a1
1 parent 260ff98
commit 8b707a1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 76 deletions.
diff --git a/generators/server/__snapshots__/generator.spec.js.snap b/generators/server/__snapshots__/generator.spec.js.snap
@@ -17,9 +17,6 @@ exports[`generator - server composing databaseType option no with jwt should mat
   "pom.xml": {
     "stateCleared": "modified",
   },
-  "src/main/docker/jib/entrypoint.sh": {
-    "stateCleared": "modified",
-  },
   "src/main/java/com/mycompany/myapp/ApplicationWebXml.java": {
     "stateCleared": "modified",
   },
@@ -253,9 +250,6 @@ exports[`generator - server composing databaseType option no with oauth2 should
   "pom.xml": {
     "stateCleared": "modified",
   },
-  "src/main/docker/jib/entrypoint.sh": {
-    "stateCleared": "modified",
-  },
   "src/main/java/com/mycompany/myapp/ApplicationWebXml.java": {
     "stateCleared": "modified",
   },
@@ -489,9 +483,6 @@ exports[`generator - server composing databaseType option no with session should
   "pom.xml": {
     "stateCleared": "modified",
   },
-  "src/main/docker/jib/entrypoint.sh": {
-    "stateCleared": "modified",
-  },
   "src/main/java/com/mycompany/myapp/ApplicationWebXml.java": {
     "stateCleared": "modified",
   },

diff --git a/generators/server/__test-support/index.ts b/generators/server/__test-support/index.ts
@@ -3,21 +3,7 @@ import assert from 'assert';
 
 import { messageBrokerTypes, databaseTypes } from '../../../jdl/jhipster/index.js';
 import {
-  GENERATOR_CUCUMBER,
-  GENERATOR_GATLING,
-  GENERATOR_SPRING_CACHE,
-  GENERATOR_SPRING_WEBSOCKET,
-  GENERATOR_SPRING_DATA_RELATIONAL,
-  GENERATOR_SPRING_DATA_CASSANDRA,
-  GENERATOR_SPRING_DATA_COUCHBASE,
-  GENERATOR_SPRING_DATA_MONGODB,
-  GENERATOR_MAVEN,
-  GENERATOR_LIQUIBASE,
-  GENERATOR_LANGUAGES,
   GENERATOR_SPRING_CLOUD_STREAM,
-  GENERATOR_GRADLE,
-  GENERATOR_DOCKER,
-  GENERATOR_COMMON,
   GENERATOR_JAVA,
   GENERATOR_PROJECT_NAME,
   GENERATOR_SERVER,
@@ -28,37 +14,6 @@ import {
 const { KAFKA, PULSAR } = messageBrokerTypes;
 const { SQL, COUCHBASE } = databaseTypes;
 
-export const mockedGenerators = [
-  `jhipster:${GENERATOR_COMMON}`,
-  `jhipster:${GENERATOR_SPRING_DATA_COUCHBASE}`,
-  `jhipster:${GENERATOR_CUCUMBER}`,
-  `jhipster:${GENERATOR_DOCKER}`,
-  `jhipster:${GENERATOR_GATLING}`,
-  `jhipster:${GENERATOR_GRADLE}`,
-  `jhipster:${GENERATOR_GRADLE}:code-quality`,
-  `jhipster:${GENERATOR_GRADLE}:jib`,
-  `jhipster:${GENERATOR_GRADLE}:node-gradle`,
-  `jhipster:${GENERATOR_SPRING_CLOUD_STREAM}`,
-  // `jhipster:${GENERATOR_JAVA}`,
-  // `jhipster:${GENERATOR_JAVA}:domain`,
-  // `jhipster:${GENERATOR_JAVA}:bootstrap`,
-  `jhipster:${GENERATOR_JAVA}:build-tool`,
-  `jhipster:${GENERATOR_JAVA}:code-quality`,
-  `jhipster:${GENERATOR_JAVA}:node`,
-  `jhipster:${GENERATOR_LANGUAGES}`,
-  `jhipster:${GENERATOR_LIQUIBASE}`,
-  `jhipster:${GENERATOR_MAVEN}`,
-  `jhipster:${GENERATOR_MAVEN}:code-quality`,
-  `jhipster:${GENERATOR_MAVEN}:jib`,
-  `jhipster:${GENERATOR_MAVEN}:node`,
-  'jhipster:spring-cloud:gateway',
-  `jhipster:${GENERATOR_SPRING_DATA_CASSANDRA}`,
-  `jhipster:${GENERATOR_SPRING_DATA_MONGODB}`,
-  `jhipster:${GENERATOR_SPRING_DATA_RELATIONAL}`,
-  `jhipster:${GENERATOR_SPRING_CACHE}`,
-  `jhipster:${GENERATOR_SPRING_WEBSOCKET}`,
-];
-
 export const shouldComposeWithLiquibase = (testSample, runResultSupplier) => {
   const liquibaseEnabled = typeof testSample === 'boolean' ? testSample : testSample?.databaseType === SQL;
   if (liquibaseEnabled) {

diff --git a/generators/server/generator.spec.js b/generators/server/generator.spec.js
@@ -24,7 +24,7 @@ import { snakeCase } from 'lodash-es';
 import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js';
 import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js';
 import { GENERATOR_SERVER, GENERATOR_SPRING_BOOT } from '../generator-list.js';
-import { mockedGenerators, shouldComposeWithCouchbase, shouldComposeWithSpringCloudStream } from './__test-support/index.js';
+import { filterBasicServerGenerators, shouldComposeWithCouchbase, shouldComposeWithSpringCloudStream } from './__test-support/index.js';
 import Generator from './index.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -52,7 +52,7 @@ describe(`generator - ${generator}`, () => {
               messageBroker: 'no',
             })
             .withSkipWritingPriorities()
-            .withMockedGenerators(mockedGenerators);
+            .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
         });
 
         shouldComposeWithSpringCloudStream(false, () => runResult);
@@ -66,7 +66,7 @@ describe(`generator - ${generator}`, () => {
               messageBroker: 'kafka',
             })
             .withSkipWritingPriorities()
-            .withMockedGenerators(mockedGenerators);
+            .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
         });
         shouldComposeWithSpringCloudStream(true, () => runResult);
       });
@@ -79,7 +79,7 @@ describe(`generator - ${generator}`, () => {
               messageBroker: 'pulsar',
             })
             .withSkipWritingPriorities()
-            .withMockedGenerators(mockedGenerators);
+            .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
         });
         shouldComposeWithSpringCloudStream(true, () => runResult);
       });
@@ -94,7 +94,7 @@ describe(`generator - ${generator}`, () => {
               databaseType: 'no',
               authenticationType: 'jwt',
             })
-            .withMockedGenerators(mockedGenerators);
+            .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
         });
 
         it('should match generated files', () => {
@@ -111,7 +111,7 @@ describe(`generator - ${generator}`, () => {
               databaseType: 'no',
               authenticationType: 'session',
             })
-            .withMockedGenerators(mockedGenerators);
+            .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
         });
 
         it('should match generated files', () => {
@@ -128,7 +128,7 @@ describe(`generator - ${generator}`, () => {
               databaseType: 'no',
               authenticationType: 'oauth2',
             })
-            .withMockedGenerators(mockedGenerators);
+            .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
         });
 
         it('should match generated files', () => {
@@ -146,7 +146,7 @@ describe(`generator - ${generator}`, () => {
               databaseType: 'couchbase',
             })
             .withSkipWritingPriorities()
-            .withMockedGenerators(mockedGenerators);
+            .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
         });
         shouldComposeWithCouchbase(true, () => runResult);
       });

diff --git a/generators/spring-boot/__snapshots__/generator.spec.ts.snap b/generators/spring-boot/__snapshots__/generator.spec.ts.snap
@@ -17,9 +17,6 @@ exports[`generator - spring-boot with jwt should match generated files snapshot
   "pom.xml": {
     "stateCleared": "modified",
   },
-  "src/main/docker/jib/entrypoint.sh": {
-    "stateCleared": "modified",
-  },
   "src/main/java/com/mycompany/myapp/ApplicationWebXml.java": {
     "stateCleared": "modified",
   },
@@ -388,9 +385,6 @@ exports[`generator - spring-boot with oauth2 should match generated files snapsh
   "pom.xml": {
     "stateCleared": "modified",
   },
-  "src/main/docker/jib/entrypoint.sh": {
-    "stateCleared": "modified",
-  },
   "src/main/java/com/mycompany/myapp/ApplicationWebXml.java": {
     "stateCleared": "modified",
   },

diff --git a/generators/spring-boot/generator.spec.ts b/generators/spring-boot/generator.spec.ts
@@ -6,7 +6,7 @@ import { defaultHelpers as helpers, runResult } from '../../testing/index.js';
 import { shouldSupportFeatures, testBlueprintSupport, checkEnforcements } from '../../test/support/index.js';
 import Generator from '../server/index.js';
 
-import { mockedGenerators } from '../server/__test-support/index.js';
+import { filterBasicServerGenerators } from '../server/__test-support/index.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -23,7 +23,10 @@ describe(`generator - ${generator}`, () => {
 
   describe('with jwt', () => {
     before(async () => {
-      await helpers.runJHipster(generator).withJHipsterConfig({ authenticationType: 'jwt' }).withMockedGenerators(mockedGenerators);
+      await helpers
+        .runJHipster(generator)
+        .withJHipsterConfig({ authenticationType: 'jwt' })
+        .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
     });
 
     it('should match generated files snapshot', () => {
@@ -33,7 +36,10 @@ describe(`generator - ${generator}`, () => {
 
   describe('with oauth2', () => {
     before(async () => {
-      await helpers.runJHipster(generator).withJHipsterConfig({ authenticationType: 'oauth2' }).withMockedGenerators(mockedGenerators);
+      await helpers
+        .runJHipster(generator)
+        .withJHipsterConfig({ authenticationType: 'oauth2' })
+        .withMockedJHipsterGenerators({ filter: filterBasicServerGenerators });
     });
 
     it('should match generated files snapshot', () => {

diff --git a/generators/spring-data-relational/sql-entities.spec.ts b/generators/spring-data-relational/sql-entities.spec.ts
@@ -8,12 +8,10 @@ import {
   defaultHelpers as helpers,
   runResult,
 } from '../../testing/index.js';
-import { mockedGenerators as serverGenerators } from '../server/__test-support/index.js';
+import { filterBasicServerGenerators } from '../server/__test-support/index.js';
 
 import { databaseTypes, cacheTypes } from '../../jdl/jhipster/index.js';
-import { GENERATOR_SERVER, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.js';
-
-const mockedGenerators = serverGenerators.filter(generator => generator !== `jhipster:${GENERATOR_SPRING_DATA_RELATIONAL}`);
+import { GENERATOR_SERVER } from '../generator-list.js';
 
 const { SQL: databaseType, H2_DISK, H2_MEMORY, POSTGRESQL, MARIADB, MYSQL, MSSQL, ORACLE } = databaseTypes;
 const commonConfig = { databaseType, baseName: 'jhipster', nativeLanguage: 'en', languages: ['fr', 'en'] };
@@ -78,7 +76,7 @@ describe(`generator - ${databaseType} - entities`, () => {
           .runJHipster(GENERATOR_SERVER)
           .withJHipsterConfig(sampleConfig, entities)
           .withOptions({ skipPriorities })
-          .withMockedGenerators(mockedGenerators);
+          .withMockedJHipsterGenerators({ except: ['jhipster:spring-data-relational'], filter: filterBasicServerGenerators });
       });
 
       it('should compose with jhipster:common', () => {