Merge pull request #9099 from ruddell/fix-angular-ms-entity-module-im…

…port fix exported entity module class name
jhipster · Jan 22, 2019 · 9f12966 · 9f12966
2 parents 1d456dd + 5a3eab1
commit 9f12966
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...ity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs b/...ity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs
@@ -62,7 +62,7 @@ const ENTITY_STATES = [
     <%_ } _%>
     schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
-export class <%= angularXAppName %><%= entityAngularName %>Module {
+export class <%= locals.microserviceName ? upperFirstCamelCase(locals.microserviceName) : angularXAppName %><%= entityAngularName %>Module {
     <%_ if (enableTranslation) { _%>
     constructor(private languageService: JhiLanguageService, private languageHelper: JhiLanguageHelper) {
         this.languageHelper.language.subscribe((languageKey: string) => {

diff --git a/test/entity.spec.js b/test/entity.spec.js
@@ -529,6 +529,10 @@ describe('JHipster generator for entity', () => {
                 assert.file(expectedFiles.clientNg2GatewayMicroserviceEntity);
                 assert.noFile(expectedFiles.gatling);
                 assert.fileContent(`${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar.service.ts`, 'samplemicroservice');
+                assert.fileContent(
+                    `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar.module.ts`,
+                    'SampleMicroserviceBarModule'
+                );
                 assert.noFile(`${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/web/rest/BarResource.java`);
             });
         });