Fix JDL Import command (#209)

jhipster · Nov 24, 2019 · 0915089 · 0915089
1 parent 532ed34
commit 0915089
Show file tree

Hide file tree

Showing 10 changed files with 1,162 additions and 1,026 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ atlassian-ide-plugin.xml
 test/temp/
 *debug.log*
 .vscode
+*.tgz
diff --git a/generator-jhipster-ionic-4.3.1.tgz b/generator-jhipster-ionic-4.3.1.tgz
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -183,7 +183,7 @@ module.exports = class extends BaseGenerator {
 
       let installAuthCmd;
       const params = '--configUri=http://localhost:8080/api/auth-info --issuer=null --clientId=null';
-      const schematicsVersion = '1.0.0';
+      const schematicsVersion = '1.0.1';
 
       // use `schematics` when testing and expect it to be installed
       if (this.installDeps) {
@@ -318,6 +318,6 @@ module.exports = class extends BaseGenerator {
           process.exit(0);
         }
       }
-    }
+    };
   }
 };
diff --git a/generators/import-jdl/index.js b/generators/import-jdl/index.js
@@ -30,7 +30,7 @@ const fs = require('fs-extra');
 function importJDL() {
   logger.info('The JDL is being parsed...');
 
-  const jdlImporter = new jhiCore.JDLImporter(this.jdlFiles, {
+  const jdlImporter = jhiCore.jdl.import.JDLImporter.createImporterFromFiles(this.jdlFiles, {
     databaseType: this.prodDatabaseType,
     applicationType: this.applicationType,
     applicationName: this.baseName

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,18 +30,18 @@
     "chalk": "3.0.0",
     "cross-spawn": "7.0.1",
     "fs-extra": "8.1.0",
-    "generator-jhipster": ">=6.4.1",
+    "generator-jhipster": ">=6.5.1",
     "jsonfile": "5.0.0",
     "lodash": "4.17.15",
     "pluralize": "8.0.0",
     "semver": "6.3.0",
     "shelljs": "0.8.3"
   },
   "devDependencies": {
-    "@angular-devkit/schematics-cli": "0.803.15",
-    "@oktadev/schematics": "1.0.0",
+    "@angular-devkit/schematics-cli": "0.803.19",
+    "@oktadev/schematics": "1.0.1",
     "chai": "4.2.0",
-    "eslint": "6.6.0",
+    "eslint": "6.7.0",
     "eslint-config-airbnb-base": "14.0.0",
     "eslint-plugin-import": "2.18.2",
     "jsdoc": "3.6.3",

diff --git a/test/templates/backend-jwt/.yo-rc.json b/test/templates/backend-jwt/.yo-rc.json
@@ -4,7 +4,7 @@
             "packageName": "com.okta.developer",
             "nativeLanguage": "en"
         },
-        "jhipsterVersion": "6.4.1",
+        "jhipsterVersion": "6.5.1",
         "baseName": "backend",
         "reactive": false,
         "packageName": "com.okta.developer",

diff --git a/test/templates/backend-oauth2/.yo-rc.json b/test/templates/backend-oauth2/.yo-rc.json
@@ -4,7 +4,7 @@
             "packageName": "com.okta.developer",
             "nativeLanguage": "en"
         },
-        "jhipsterVersion": "6.4.1",
+        "jhipsterVersion": "6.5.1",
         "baseName": "backend",
         "reactive": false,
         "packageName": "com.okta.developer",

diff --git a/test/test-app.js b/test/test-app.js
@@ -1,35 +1,33 @@
-/* global describe, beforeEach, it */
-
 const path = require('path');
 const fse = require('fs-extra');
 const assert = require('yeoman-assert');
 const helpers = require('yeoman-test');
 
 describe('JHipster generator jhipster-generator-ionic', () => {
-    describe('Test Generating Ionic App with JWT', () => {
-        beforeEach((done) => {
-            helpers
-                .run(path.join(__dirname, '../generators/app'))
-                .inTmpDir((dir) => {
-                    fse.copySync(path.join(__dirname, '../test/templates'), dir);
-                })
-                .withOptions({
-                    interactive: false,
-                    installDeps: false
-                })
-                .withPrompts({
-                    appName: 'ionic4j-jwt',
-                    directoryPath: 'backend-jwt'
-                })
-                .on('end', done);
-        });
+  describe('Test Generating Ionic App with JWT', () => {
+    beforeEach((done) => {
+      helpers
+        .run(path.join(__dirname, '../generators/app'))
+        .inTmpDir((dir) => {
+          fse.copySync(path.join(__dirname, '../test/templates'), dir);
+        })
+        .withOptions({
+          interactive: false,
+          installDeps: false
+        })
+        .withPrompts({
+          appName: 'ionic4j-jwt',
+          directoryPath: 'backend-jwt'
+        })
+        .on('end', done);
+    });
 
-        it('generates a ionic4j-jwt/package.json file', () => {
-            assert.file(['ionic4j-jwt/package.json']);
-        });
+    it('generates a ionic4j-jwt/package.json file', () => {
+      assert.file(['ionic4j-jwt/package.json']);
+    });
 
-        it('does not delete app/services/auth/auth-jwt.service.ts', () => {
-            assert.file('ionic4j-jwt/src/app/services/auth/auth-jwt.service.ts');
-        });
+    it('does not delete app/services/auth/auth-jwt.service.ts', () => {
+      assert.file('ionic4j-jwt/src/app/services/auth/auth-jwt.service.ts');
     });
+  });
 });
diff --git a/test/test-oauth.js b/test/test-oauth.js
@@ -1,42 +1,40 @@
-/* global describe, beforeEach, it */
-
 const path = require('path');
 const fse = require('fs-extra');
 const assert = require('yeoman-assert');
 const helpers = require('yeoman-test');
 
 describe('JHipster generator jhipster-generator-ionic', () => {
-    describe('Test Generating Ionic App with OAuth', () => {
-        beforeEach((done) => {
-            helpers
-                .run(path.join(__dirname, '../generators/app'))
-                .inTmpDir((dir) => {
-                    fse.copySync(path.join(__dirname, '../test/templates'), dir);
-                })
-                .withOptions({
-                    interactive: false,
-                    installDeps: false
-                })
-                .withPrompts({
-                    appName: 'ionic4j-oauth2',
-                    directoryPath: 'backend-oauth2'
-                })
-                .on('end', done);
-        });
+  describe('Test Generating Ionic App with OAuth', () => {
+    beforeEach((done) => {
+      helpers
+        .run(path.join(__dirname, '../generators/app'))
+        .inTmpDir((dir) => {
+          fse.copySync(path.join(__dirname, '../test/templates'), dir);
+        })
+        .withOptions({
+          interactive: false,
+          installDeps: false
+        })
+        .withPrompts({
+          appName: 'ionic4j-oauth2',
+          directoryPath: 'backend-oauth2'
+        })
+        .on('end', done);
+    });
 
-        it('deletes files that only apply to JWT', () => {
-            assert.noFile([
-                'ionic4j-oauth2/src/app/login',
-                'ionic4j-oauth2/src/app/tab1',
-                'ionic4j-oauth2/src/app/pages/signup',
-                'ionic4j-oauth2/src/app/services/auth/auth-jwt.service.ts',
-                'ionic4j-oauth2/src/app/services/auth/auth-jwt.service.spec.ts'
-            ]);
-        });
+    it('deletes files that only apply to JWT', () => {
+      assert.noFile([
+        'ionic4j-oauth2/src/app/login',
+        'ionic4j-oauth2/src/app/tab1',
+        'ionic4j-oauth2/src/app/pages/signup',
+        'ionic4j-oauth2/src/app/services/auth/auth-jwt.service.ts',
+        'ionic4j-oauth2/src/app/services/auth/auth-jwt.service.spec.ts'
+      ]);
+    });
 
-        it('adds @oktadev/schematics and keeps cordova-plugin-camera', () => {
-            assert.fileContent('ionic4j-oauth2/package.json', /@oktadev\/schematics/);
-            assert.fileContent('ionic4j-oauth2/package.json', /CAMERA_USAGE_DESCRIPTION/);
-        });
+    it('adds @oktadev/schematics and keeps cordova-plugin-camera', () => {
+      assert.fileContent('ionic4j-oauth2/package.json', /@oktadev\/schematics/);
+      assert.fileContent('ionic4j-oauth2/package.json', /CAMERA_USAGE_DESCRIPTION/);
     });
+  });
 });