Merge pull request #5 from pascalgrimaud/pierrebesson-feign-gateway-jwt

Fix expected files with Feign Configuration
jhipster · Oct 12, 2018 · 2a2c28a · 2a2c28a
2 parents fd93b9e + f12d8ce
commit 2a2c28a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/test/app.spec.js b/test/app.spec.js
@@ -1398,6 +1398,7 @@ describe('JHipster generator', () => {
             it('creates expected files with the gateway application type', () => {
                 assert.file(expectedFiles.jwtServer);
                 assert.file(expectedFiles.gateway);
+                assert.file(expectedFiles.feignConfig);
                 assert.file(expectedFiles.eureka);
                 assert.noFile(expectedFiles.consul);
             });
@@ -1434,6 +1435,7 @@ describe('JHipster generator', () => {
             it('creates expected files with the microservice application type', () => {
                 assert.file(expectedFiles.jwtServer);
                 assert.file(expectedFiles.microservice);
+                assert.file(expectedFiles.feignConfig);
                 assert.file(expectedFiles.dockerServices);
                 assert.file(expectedFiles.eureka);
                 assert.noFile(expectedFiles.consul);
@@ -1509,6 +1511,7 @@ describe('JHipster generator', () => {
             it('creates expected files with the microservice application type', () => {
                 assert.file(expectedFiles.jwtServer);
                 assert.file(expectedFiles.microservice);
+                assert.file(expectedFiles.feignConfig);
                 assert.file(expectedFiles.microserviceGradle);
                 assert.file(expectedFiles.eureka);
                 assert.noFile(expectedFiles.consul);

diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js
@@ -544,14 +544,17 @@ const expectedFiles = {
         `${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/gateway/ratelimiting/RateLimitingFilter.java`,
         `${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/web/rest/vm/RouteVM.java`,
         `${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/web/rest/GatewayResource.java`,
-        `${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/config/FeignConfiguration.java`,
-        `${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/client/UserFeignClientInterceptor.java`,
         `${CLIENT_MAIN_SRC_DIR}app/admin/gateway/gateway.component.ts`,
         `${CLIENT_MAIN_SRC_DIR}app/admin/gateway/gateway.route.ts`,
         `${CLIENT_MAIN_SRC_DIR}app/admin/gateway/gateway.component.html`,
         `${CLIENT_MAIN_SRC_DIR}app/admin/gateway/gateway-routes.service.ts`
     ],
 
+    feignConfig: [
+        `${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/config/FeignConfiguration.java`,
+        `${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/client/UserFeignClientInterceptor.java`
+    ],
+
     microservice: [
         `${SERVER_MAIN_RES_DIR}static/index.html`,
         `${SERVER_MAIN_SRC_DIR}com/mycompany/myapp/config/SecurityConfiguration.java`,