feat: Add template sub-list to all frameworks

SecJS · Oct 25, 2021 · d4d84d6 · d4d84d6
1 parent 328b020
commit d4d84d6
Show file tree

Hide file tree

Showing 72 changed files with 55 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -40,6 +40,6 @@ yo secjs Foo --path=./Bar
 
 ...
 
-## License
+---
 
-MIT © [João Lenon](https://github.com/SecJS/Generator/blob/master/LICENSE)
+Made with 🖤 by [jlenon7](https://github.com/jlenon7) :wave
diff --git a/app/index.js b/app/index.js
@@ -41,45 +41,52 @@ class SecGenerator extends Generator {
         name: 'framework',
         message: 'Select your framework:',
         choices: [
-          { name: 'Laravel', value: 'laravel' },
-          { name: 'NestJS TypeORM', value: 'nestjsTypeOrm' },
-          { name: 'NestJS Mongoose', value: 'nestjsMongoose' },
-          { name: 'NestJS PrismaORM', value: 'nestjsPrismaOrm' },
+          { name: 'NestJS', value: 'nestjs' },
           { name: 'ReactJS', value: 'reactjs' },
+          { name: 'Laravel', value: 'laravel' },
         ],
       },
       {
         when: answers => answers.framework === 'reactjs',
         type: 'list',
-        name: 'reactjs',
-        message: 'Select your component type:',
+        name: 'template',
+        message: 'Select your template:',
         choices: [
+          { name: 'ReactJS Hook', value: 'reactjsHook' },
           { name: 'ReactJS Component', value: 'reactjsComponent' },
+          { name: 'ReactJS ContextAPI', value: 'reactjsContext' },
           { name: 'ReactJS Material-UI', value: 'reactjsMui' },
           { name: 'ReactJS StyledComponents', value: 'reactjsStyled' },
-          { name: 'ReactJS ContextAPI', value: 'reactjsContext' },
-          { name: 'ReactJS Hook', value: 'reactjsHook' },
         ],
       },
+      {
+        when: answers => answers.framework === 'nestjs',
+        type: 'list',
+        name: 'template',
+        message: 'Select your template:',
+        choices: [
+          { name: 'NestJS TypeOrm', value: 'nestjsTypeOrm' },
+          { name: 'NestJS Mongoose', value: 'nestjsMongoose' },
+          { name: 'NestJS PrismaOrm', value: 'nestjsPrismaOrm' },
+        ],
+      },
+      {
+        when: answers => answers.framework === 'laravel',
+        type: 'list',
+        name: 'template',
+        message: 'Select your template:',
+        choices: [{ name: 'Default', value: 'default' }],
+      },
     ])
   }
 
-  frameworkChoice(framework) {
-    switch (framework) {
-      case 'reactjs':
-        return this.answers.reactjs
-      default:
-        return this.answers.framework
-    }
-  }
-
   async writing() {
-    const framework = this.frameworkChoice(this.answers.framework)
-    const dir = path.join(__dirname, `templates/${framework}/`)
+    const template = `${this.answers.framework}/${this.answers.template}`
+    const dir = path.join(__dirname, `templates/${template}/`)
 
     for await (const f of makeFileTemplate(dir, this.variables.name)) {
       this.fs.copyTpl(
-        this.templatePath(`${framework}/${f.src}`),
+        this.templatePath(`${template}/${f.src}`),
         this.destinationPath(`${this.variables.path}/${f.dist}`),
         this.variables,
       )

diff --git a/...tp/Controllers/__name__Controller.php.txt → ...tp/Controllers/__name__Controller.php.txt b/...tp/Controllers/__name__Controller.php.txt → ...tp/Controllers/__name__Controller.php.txt
diff --git a/...ttp/Requests/__name__StoreRequest.php.txt → ...ttp/Requests/__name__StoreRequest.php.txt b/...ttp/Requests/__name__StoreRequest.php.txt → ...ttp/Requests/__name__StoreRequest.php.txt
diff --git a/...tp/Requests/__name__UpdateRequest.php.txt → ...tp/Requests/__name__UpdateRequest.php.txt b/...tp/Requests/__name__UpdateRequest.php.txt → ...tp/Requests/__name__UpdateRequest.php.txt
diff --git a/...p/Http/Resources/__name__Resource.php.txt → ...p/Http/Resources/__name__Resource.php.txt b/...p/Http/Resources/__name__Resource.php.txt → ...p/Http/Resources/__name__Resource.php.txt
diff --git a/...lates/laravel/app/Models/__name__.php.txt → ...ravel/default/app/Models/__name__.php.txt b/...lates/laravel/app/Models/__name__.php.txt → ...ravel/default/app/Models/__name__.php.txt
diff --git a/...p/Repositories/__name__Repository.php.txt → ...p/Repositories/__name__Repository.php.txt b/...p/Repositories/__name__Repository.php.txt → ...p/Repositories/__name__Repository.php.txt
diff --git a/...avel/app/Services/__name__Service.php.txt → ...ault/app/Services/__name__Service.php.txt b/...avel/app/Services/__name__Service.php.txt → ...ault/app/Services/__name__Service.php.txt
diff --git a/...atabase/factories/__name__Factory.php.txt → ...atabase/factories/__name__Factory.php.txt b/...atabase/factories/__name__Factory.php.txt → ...atabase/factories/__name__Factory.php.txt
diff --git a/...ns/__migration_plural_low___table.php.txt → ...ns/__migration_plural_low___table.php.txt b/...ns/__migration_plural_low___table.php.txt → ...ns/__migration_plural_low___table.php.txt
diff --git a/...l/database/seeders/__name__Seeder.php.txt → ...t/database/seeders/__name__Seeder.php.txt b/...l/database/seeders/__name__Seeder.php.txt → ...t/database/seeders/__name__Seeder.php.txt
diff --git a/...es/nestjsMongoose/Dtos/__name__Dto.ts.txt → ...js/nestjsMongoose/Dtos/__name__Dto.ts.txt b/...es/nestjsMongoose/Dtos/__name__Dto.ts.txt → ...js/nestjsMongoose/Dtos/__name__Dto.ts.txt
diff --git a/...sMongoose/E2E/__name__/delete.spec.ts.txt → ...sMongoose/E2E/__name__/delete.spec.ts.txt b/...sMongoose/E2E/__name__/delete.spec.ts.txt → ...sMongoose/E2E/__name__/delete.spec.ts.txt
diff --git a/...jsMongoose/E2E/__name__/index.spec.ts.txt → ...jsMongoose/E2E/__name__/index.spec.ts.txt b/...jsMongoose/E2E/__name__/index.spec.ts.txt → ...jsMongoose/E2E/__name__/index.spec.ts.txt
diff --git a/...tjsMongoose/E2E/__name__/show.spec.ts.txt → ...tjsMongoose/E2E/__name__/show.spec.ts.txt b/...tjsMongoose/E2E/__name__/show.spec.ts.txt → ...tjsMongoose/E2E/__name__/show.spec.ts.txt
diff --git a/...jsMongoose/E2E/__name__/store.spec.ts.txt → ...jsMongoose/E2E/__name__/store.spec.ts.txt b/...jsMongoose/E2E/__name__/store.spec.ts.txt → ...jsMongoose/E2E/__name__/store.spec.ts.txt
diff --git a/...sMongoose/E2E/__name__/update.spec.ts.txt → ...sMongoose/E2E/__name__/update.spec.ts.txt b/...sMongoose/E2E/__name__/update.spec.ts.txt → ...sMongoose/E2E/__name__/update.spec.ts.txt
diff --git a/app/templates/nestjsMongoose/__name__.ts.txt → ...tes/nestjs/nestjsMongoose/__name__.ts.txt b/app/templates/nestjsMongoose/__name__.ts.txt → ...tes/nestjs/nestjsMongoose/__name__.ts.txt
diff --git a/.../nestjsMongoose/__name__Controller.ts.txt → .../nestjsMongoose/__name__Controller.ts.txt b/.../nestjsMongoose/__name__Controller.ts.txt → .../nestjsMongoose/__name__Controller.ts.txt
diff --git a/...tes/nestjsMongoose/__name__Factory.ts.txt → ...tjs/nestjsMongoose/__name__Factory.ts.txt b/...tes/nestjsMongoose/__name__Factory.ts.txt → ...tjs/nestjsMongoose/__name__Factory.ts.txt
diff --git a/.../nestjsMongoose/__name__Repository.ts.txt → .../nestjsMongoose/__name__Repository.ts.txt b/.../nestjsMongoose/__name__Repository.ts.txt → .../nestjsMongoose/__name__Repository.ts.txt
diff --git a/...es/nestjsMongoose/__name__Resource.ts.txt → ...js/nestjsMongoose/__name__Resource.ts.txt b/...es/nestjsMongoose/__name__Resource.ts.txt → ...js/nestjsMongoose/__name__Resource.ts.txt
diff --git a/...ates/nestjsMongoose/__name__Seeder.ts.txt → ...stjs/nestjsMongoose/__name__Seeder.ts.txt b/...ates/nestjsMongoose/__name__Seeder.ts.txt → ...stjs/nestjsMongoose/__name__Seeder.ts.txt
diff --git a/...tes/nestjsMongoose/__name__Service.ts.txt → ...tjs/nestjsMongoose/__name__Service.ts.txt b/...tes/nestjsMongoose/__name__Service.ts.txt → ...tjs/nestjsMongoose/__name__Service.ts.txt
diff --git a/...s/nestjsMongoose/__name__Validator.ts.txt → ...s/nestjsMongoose/__name__Validator.ts.txt b/...s/nestjsMongoose/__name__Validator.ts.txt → ...s/nestjsMongoose/__name__Validator.ts.txt
diff --git a/...s/nestjsPrismaOrm/Dtos/__name__Dto.ts.txt → ...s/nestjsPrismaOrm/Dtos/__name__Dto.ts.txt b/...s/nestjsPrismaOrm/Dtos/__name__Dto.ts.txt → ...s/nestjsPrismaOrm/Dtos/__name__Dto.ts.txt
diff --git a/...PrismaOrm/E2E/__name__/delete.spec.ts.txt → ...PrismaOrm/E2E/__name__/delete.spec.ts.txt b/...PrismaOrm/E2E/__name__/delete.spec.ts.txt → ...PrismaOrm/E2E/__name__/delete.spec.ts.txt
diff --git a/...sPrismaOrm/E2E/__name__/index.spec.ts.txt → ...sPrismaOrm/E2E/__name__/index.spec.ts.txt b/...sPrismaOrm/E2E/__name__/index.spec.ts.txt → ...sPrismaOrm/E2E/__name__/index.spec.ts.txt
diff --git a/...jsPrismaOrm/E2E/__name__/show.spec.ts.txt → ...jsPrismaOrm/E2E/__name__/show.spec.ts.txt b/...jsPrismaOrm/E2E/__name__/show.spec.ts.txt → ...jsPrismaOrm/E2E/__name__/show.spec.ts.txt
diff --git a/...sPrismaOrm/E2E/__name__/store.spec.ts.txt → ...sPrismaOrm/E2E/__name__/store.spec.ts.txt b/...sPrismaOrm/E2E/__name__/store.spec.ts.txt → ...sPrismaOrm/E2E/__name__/store.spec.ts.txt
diff --git a/...PrismaOrm/E2E/__name__/update.spec.ts.txt → ...PrismaOrm/E2E/__name__/update.spec.ts.txt b/...PrismaOrm/E2E/__name__/update.spec.ts.txt → ...PrismaOrm/E2E/__name__/update.spec.ts.txt
diff --git a/...nestjsPrismaOrm/__name__Controller.ts.txt → ...nestjsPrismaOrm/__name__Controller.ts.txt b/...nestjsPrismaOrm/__name__Controller.ts.txt → ...nestjsPrismaOrm/__name__Controller.ts.txt
diff --git a/...es/nestjsPrismaOrm/__name__Factory.ts.txt → ...js/nestjsPrismaOrm/__name__Factory.ts.txt b/...es/nestjsPrismaOrm/__name__Factory.ts.txt → ...js/nestjsPrismaOrm/__name__Factory.ts.txt
diff --git a/...nestjsPrismaOrm/__name__Repository.ts.txt → ...nestjsPrismaOrm/__name__Repository.ts.txt b/...nestjsPrismaOrm/__name__Repository.ts.txt → ...nestjsPrismaOrm/__name__Repository.ts.txt
diff --git a/...s/nestjsPrismaOrm/__name__Resource.ts.txt → ...s/nestjsPrismaOrm/__name__Resource.ts.txt b/...s/nestjsPrismaOrm/__name__Resource.ts.txt → ...s/nestjsPrismaOrm/__name__Resource.ts.txt
diff --git a/...tes/nestjsPrismaOrm/__name__Seeder.ts.txt → ...tjs/nestjsPrismaOrm/__name__Seeder.ts.txt b/...tes/nestjsPrismaOrm/__name__Seeder.ts.txt → ...tjs/nestjsPrismaOrm/__name__Seeder.ts.txt
diff --git a/...es/nestjsPrismaOrm/__name__Service.ts.txt → ...js/nestjsPrismaOrm/__name__Service.ts.txt b/...es/nestjsPrismaOrm/__name__Service.ts.txt → ...js/nestjsPrismaOrm/__name__Service.ts.txt
diff --git a/.../nestjsPrismaOrm/__name__Validator.ts.txt → .../nestjsPrismaOrm/__name__Validator.ts.txt b/.../nestjsPrismaOrm/__name__Validator.ts.txt → .../nestjsPrismaOrm/__name__Validator.ts.txt
diff --git a/...tes/nestjsTypeOrm/Dtos/__name__Dto.ts.txt → ...tjs/nestjsTypeOrm/Dtos/__name__Dto.ts.txt b/...tes/nestjsTypeOrm/Dtos/__name__Dto.ts.txt → ...tjs/nestjsTypeOrm/Dtos/__name__Dto.ts.txt
diff --git a/...jsTypeOrm/E2E/__name__/delete.spec.ts.txt → ...jsTypeOrm/E2E/__name__/delete.spec.ts.txt b/...jsTypeOrm/E2E/__name__/delete.spec.ts.txt → ...jsTypeOrm/E2E/__name__/delete.spec.ts.txt
diff --git a/...tjsTypeOrm/E2E/__name__/index.spec.ts.txt → ...tjsTypeOrm/E2E/__name__/index.spec.ts.txt b/...tjsTypeOrm/E2E/__name__/index.spec.ts.txt → ...tjsTypeOrm/E2E/__name__/index.spec.ts.txt
diff --git a/...stjsTypeOrm/E2E/__name__/show.spec.ts.txt → ...stjsTypeOrm/E2E/__name__/show.spec.ts.txt b/...stjsTypeOrm/E2E/__name__/show.spec.ts.txt → ...stjsTypeOrm/E2E/__name__/show.spec.ts.txt
diff --git a/...tjsTypeOrm/E2E/__name__/store.spec.ts.txt → ...tjsTypeOrm/E2E/__name__/store.spec.ts.txt b/...tjsTypeOrm/E2E/__name__/store.spec.ts.txt → ...tjsTypeOrm/E2E/__name__/store.spec.ts.txt
diff --git a/...jsTypeOrm/E2E/__name__/update.spec.ts.txt → ...jsTypeOrm/E2E/__name__/update.spec.ts.txt b/...jsTypeOrm/E2E/__name__/update.spec.ts.txt → ...jsTypeOrm/E2E/__name__/update.spec.ts.txt
diff --git a/app/templates/nestjsTypeOrm/__name__.ts.txt → ...ates/nestjs/nestjsTypeOrm/__name__.ts.txt b/app/templates/nestjsTypeOrm/__name__.ts.txt → ...ates/nestjs/nestjsTypeOrm/__name__.ts.txt
diff --git a/...s/nestjsTypeOrm/__name__Controller.ts.txt → ...s/nestjsTypeOrm/__name__Controller.ts.txt b/...s/nestjsTypeOrm/__name__Controller.ts.txt → ...s/nestjsTypeOrm/__name__Controller.ts.txt
diff --git a/...ates/nestjsTypeOrm/__name__Factory.ts.txt → ...stjs/nestjsTypeOrm/__name__Factory.ts.txt b/...ates/nestjsTypeOrm/__name__Factory.ts.txt → ...stjs/nestjsTypeOrm/__name__Factory.ts.txt
diff --git a/...s/nestjsTypeOrm/__name__Repository.ts.txt → ...s/nestjsTypeOrm/__name__Repository.ts.txt b/...s/nestjsTypeOrm/__name__Repository.ts.txt → ...s/nestjsTypeOrm/__name__Repository.ts.txt
diff --git a/...tes/nestjsTypeOrm/__name__Resource.ts.txt → ...tjs/nestjsTypeOrm/__name__Resource.ts.txt b/...tes/nestjsTypeOrm/__name__Resource.ts.txt → ...tjs/nestjsTypeOrm/__name__Resource.ts.txt
diff --git a/...lates/nestjsTypeOrm/__name__Seeder.ts.txt → ...estjs/nestjsTypeOrm/__name__Seeder.ts.txt b/...lates/nestjsTypeOrm/__name__Seeder.ts.txt → ...estjs/nestjsTypeOrm/__name__Seeder.ts.txt
diff --git a/...ates/nestjsTypeOrm/__name__Service.ts.txt → ...stjs/nestjsTypeOrm/__name__Service.ts.txt b/...ates/nestjsTypeOrm/__name__Service.ts.txt → ...stjs/nestjsTypeOrm/__name__Service.ts.txt
diff --git a/...es/nestjsTypeOrm/__name__Validator.ts.txt → ...js/nestjsTypeOrm/__name__Validator.ts.txt b/...es/nestjsTypeOrm/__name__Validator.ts.txt → ...js/nestjsTypeOrm/__name__Validator.ts.txt
diff --git a/...ent/components/__name__/component.tsx.txt → ...ent/components/__name__/component.tsx.txt b/...ent/components/__name__/component.tsx.txt → ...ent/components/__name__/component.tsx.txt
diff --git a/...mponent/components/__name__/index.tsx.txt → ...mponent/components/__name__/index.tsx.txt b/...mponent/components/__name__/index.tsx.txt → ...mponent/components/__name__/index.tsx.txt
diff --git a/...sContext/contexts/__name__Context.tsx.txt → ...sContext/contexts/__name__Context.tsx.txt b/...sContext/contexts/__name__Context.tsx.txt → ...sContext/contexts/__name__Context.tsx.txt
diff --git a/...tes/reactjsHook/hooks/use__name__.tsx.txt → ...tjs/reactjsHook/hooks/use__name__.tsx.txt b/...tes/reactjsHook/hooks/use__name__.tsx.txt → ...tjs/reactjsHook/hooks/use__name__.tsx.txt
diff --git a/...Mui/components/__name__/component.tsx.txt → ...Mui/components/__name__/component.tsx.txt b/...Mui/components/__name__/component.tsx.txt → ...Mui/components/__name__/component.tsx.txt
diff --git a/...ctjsMui/components/__name__/index.tsx.txt → ...ctjsMui/components/__name__/index.tsx.txt b/...ctjsMui/components/__name__/index.tsx.txt → ...ctjsMui/components/__name__/index.tsx.txt
diff --git a/...led/components/__name__/component.tsx.txt → ...led/components/__name__/component.tsx.txt b/...led/components/__name__/component.tsx.txt → ...led/components/__name__/component.tsx.txt
diff --git a/...sStyled/components/__name__/index.tsx.txt → ...sStyled/components/__name__/index.tsx.txt b/...sStyled/components/__name__/index.tsx.txt → ...sStyled/components/__name__/index.tsx.txt
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-secjs",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "🧬 Generator for any NodeJS Project or Framework",
   "main": "app/index.js",
   "scripts": {

diff --git a/tests/laravel.spec.js → tests/laravel/default.spec.js b/tests/laravel.spec.js → tests/laravel/default.spec.js
@@ -7,10 +7,10 @@ const assert = require('yeoman-assert')
 describe('\n Laravel 😸', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'laravel' })
+      .withPrompts({ framework: 'laravel', template: 'default' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {

diff --git a/tests/nestjsMongoose.spec.js → tests/nestjs/nestjsMongoose.spec.js b/tests/nestjsMongoose.spec.js → tests/nestjs/nestjsMongoose.spec.js
@@ -7,10 +7,10 @@ const assert = require('yeoman-assert')
 describe('\n NestJS Mongoose 😸', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'nestjsMongoose' })
+      .withPrompts({ framework: 'nestjs', template: 'nestjsMongoose' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {

diff --git a/tests/nestjsPrismaOrm.spec.js → tests/nestjs/nestjsPrismaOrm.spec.js b/tests/nestjsPrismaOrm.spec.js → tests/nestjs/nestjsPrismaOrm.spec.js
@@ -7,10 +7,10 @@ const assert = require('yeoman-assert')
 describe('\n NestJS PrismaORM 😸', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'nestjsPrismaOrm' })
+      .withPrompts({ framework: 'nestjs', template: 'nestjsPrismaOrm' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {

diff --git a/tests/nestjsTypeOrm.spec.js → tests/nestjs/nestjsTypeOrm.spec.js b/tests/nestjsTypeOrm.spec.js → tests/nestjs/nestjsTypeOrm.spec.js
@@ -7,10 +7,10 @@ const assert = require('yeoman-assert')
 describe('\n NestJS TypeORM 😸', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'nestjsTypeOrm' })
+      .withPrompts({ framework: 'nestjs', template: 'nestjsTypeOrm' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {

diff --git a/tests/reactjsComponent.spec.js → tests/reactjs/reactjsComponent.spec.js b/tests/reactjsComponent.spec.js → tests/reactjs/reactjsComponent.spec.js
@@ -4,13 +4,13 @@ const path = require('path')
 const helpers = require('yeoman-test')
 const assert = require('yeoman-assert')
 
-describe('\n ReactJS 😸', () => {
+describe('\n ReactJS Component ⚛️', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'reactjsComponent' })
+      .withPrompts({ framework: 'reactjs', template: 'reactjsComponent' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {

diff --git a/tests/reactjsContext.spec.js → tests/reactjs/reactjsContext.spec.js b/tests/reactjsContext.spec.js → tests/reactjs/reactjsContext.spec.js
@@ -4,13 +4,13 @@ const path = require('path')
 const helpers = require('yeoman-test')
 const assert = require('yeoman-assert')
 
-describe('\n ReactJS 😸', () => {
+describe('\n ReactJS Context ⚛️', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'reactjsContext' })
+      .withPrompts({ framework: 'reactjs', template: 'reactjsContext' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {

diff --git a/tests/reactjsHook.spec.js → tests/reactjs/reactjsHook.spec.js b/tests/reactjsHook.spec.js → tests/reactjs/reactjsHook.spec.js
@@ -4,13 +4,13 @@ const path = require('path')
 const helpers = require('yeoman-test')
 const assert = require('yeoman-assert')
 
-describe('\n ReactJS 😸', () => {
+describe('\n ReactJS Hook ⚛️', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'reactjsHook' })
+      .withPrompts({ framework: 'reactjs', template: 'reactjsHook' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {

diff --git a/tests/reactjsMui.spec.js → tests/reactjs/reactjsMui.spec.js b/tests/reactjsMui.spec.js → tests/reactjs/reactjsMui.spec.js
@@ -4,13 +4,13 @@ const path = require('path')
 const helpers = require('yeoman-test')
 const assert = require('yeoman-assert')
 
-describe('\n ReactJS 😸', () => {
+describe('\n ReactJS Mui ⚛️', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'reactjsMui' })
+      .withPrompts({ framework: 'reactjs', template: 'reactjsMui' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {

diff --git a/tests/reactjsStyled.spec.js → tests/reactjs/reactjsStyled.spec.js b/tests/reactjsStyled.spec.js → tests/reactjs/reactjsStyled.spec.js
@@ -4,13 +4,13 @@ const path = require('path')
 const helpers = require('yeoman-test')
 const assert = require('yeoman-assert')
 
-describe('\n ReactJS 😸', () => {
+describe('\n ReactJS Styled ⚛️', () => {
   beforeAll(() => {
     return helpers
-      .run(path.join(__dirname, '../app'))
+      .run(path.join(__dirname, '../../app'))
       .withOptions({ path: './Foo' })
       .withArguments('Bar')
-      .withPrompts({ framework: 'reactjsStyled' })
+      .withPrompts({ framework: 'reactjs', template: 'reactjsStyled' })
   })
 
   it('should create all files from resource Bar in folder Foo', () => {