Fix lint and format with Prettier

pascalgrimaud · Jul 12, 2020 · 66f5152 · 66f5152
1 parent aa923aa
commit 66f5152
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 38 deletions.
diff --git a/generators/client/files-vue.js b/generators/client/files-vue.js
@@ -23,7 +23,6 @@ const utils = require('../utils');
 const MAIN_SRC_DIR = constants.CLIENT_MAIN_SRC_DIR;
 const TEST_SRC_DIR = constants.CLIENT_TEST_SRC_DIR;
 const VUE_DIR = constants.ANGULAR_DIR;
-const CLIENT_VUE_TEMPLATES_DIR = 'vue';
 
 module.exports = {
     writeFiles,

diff --git a/generators/page/index.js b/generators/page/index.js
@@ -75,7 +75,7 @@ module.exports = class extends BaseBlueprintGenerator {
                 this.clientFramework = configuration.clientFramework;
 
                 if (this.clientFramework !== VUE) {
-                    this.error('This sub generator page is not supported for ' + this.clientFramework);
+                    this.error(`This sub generator page is not supported for ${this.clientFramework}`);
                 }
             },
         };

diff --git a/test/needle-api/needle-client-vue.spec.js b/test/needle-api/needle-client-vue.spec.js
@@ -95,51 +95,51 @@ describe('needle API Vue: JHipster client generator with blueprint', () => {
         assert.fileContent(
             `${CLIENT_MAIN_SRC_DIR}app/core/jhi-navbar/jhi-navbar.vue`,
             '<b-dropdown-item to="/routerName">\n' +
-            '                        <font-awesome-icon icon="asterisk" />\n' +
-            '                        <span>Router Name</span>\n' +
-            '                    </b-dropdown-item>'
+                '                        <font-awesome-icon icon="asterisk" />\n' +
+                '                        <span>Router Name</span>\n' +
+                '                    </b-dropdown-item>'
         );
     });
 
     it('menu contains the item in router import', () => {
         assert.fileContent(
             `${CLIENT_MAIN_SRC_DIR}app/router/entities.ts`,
             '// prettier-ignore\n' +
-            "const entityName = () => import('@/entities/entityFolderName/entityFileName.vue');\n" +
-            '// prettier-ignore\n' +
-            "const entityNameUpdate = () => import('@/entities/entityFolderName/entityFileName-update.vue');\n" +
-            '// prettier-ignore\n' +
-            "const entityNameDetails = () => import('@/entities/entityFolderName/entityFileName-details.vue');"
+                "const entityName = () => import('@/entities/entityFolderName/entityFileName.vue');\n" +
+                '// prettier-ignore\n' +
+                "const entityNameUpdate = () => import('@/entities/entityFolderName/entityFileName-update.vue');\n" +
+                '// prettier-ignore\n' +
+                "const entityNameDetails = () => import('@/entities/entityFolderName/entityFileName-details.vue');"
         );
     });
 
     it('menu contains the item in router', () => {
         assert.fileContent(
             `${CLIENT_MAIN_SRC_DIR}app/router/entities.ts`,
-            "  {\n" +
-            "    path: '/entityFileName',\n" +
-            "    name: 'entityName',\n" +
-            "    component: entityName,\n" +
-            "    meta: { authorities: [Authority.USER] }\n" +
-            "  },\n" +
-            "  {\n" +
-            "    path: '/entityFileName/new',\n" +
-            "    name: 'entityNameCreate',\n" +
-            "    component: entityNameUpdate,\n" +
-            "    meta: { authorities: [Authority.USER] }\n" +
-            "  },\n" +
-            "  {\n" +
-            "    path: '/entityFileName/:entityInstanceId/edit',\n" +
-            "    name: 'entityNameEdit',\n" +
-            "    component: entityNameUpdate,\n" +
-            "    meta: { authorities: [Authority.USER] }\n" +
-            "  },\n" +
-            "  {\n" +
-            "    path: '/entityFileName/:entityInstanceId/view',\n" +
-            "    name: 'entityNameView',\n" +
-            "    component: entityNameDetails,\n" +
-            "    meta: { authorities: [Authority.USER] }\n" +
-            "  },\n"            
+            '  {\n' +
+                "    path: '/entityFileName',\n" +
+                "    name: 'entityName',\n" +
+                '    component: entityName,\n' +
+                '    meta: { authorities: [Authority.USER] }\n' +
+                '  },\n' +
+                '  {\n' +
+                "    path: '/entityFileName/new',\n" +
+                "    name: 'entityNameCreate',\n" +
+                '    component: entityNameUpdate,\n' +
+                '    meta: { authorities: [Authority.USER] }\n' +
+                '  },\n' +
+                '  {\n' +
+                "    path: '/entityFileName/:entityInstanceId/edit',\n" +
+                "    name: 'entityNameEdit',\n" +
+                '    component: entityNameUpdate,\n' +
+                '    meta: { authorities: [Authority.USER] }\n' +
+                '  },\n' +
+                '  {\n' +
+                "    path: '/entityFileName/:entityInstanceId/view',\n" +
+                "    name: 'entityNameView',\n" +
+                '    component: entityNameDetails,\n' +
+                '    meta: { authorities: [Authority.USER] }\n' +
+                '  },\n'
         );
     });
 
@@ -151,9 +151,6 @@ describe('needle API Vue: JHipster client generator with blueprint', () => {
     });
 
     it('menu contains the item in service', () => {
-        assert.fileContent(
-            `${CLIENT_MAIN_SRC_DIR}app/main.ts`,
-            "entityInstanceService: () => new entityNameService(),"
-        );
+        assert.fileContent(`${CLIENT_MAIN_SRC_DIR}app/main.ts`, 'entityInstanceService: () => new entityNameService(),');
     });
 });