Add tests

Author: TheZoker

.travis.yml

@@ -16,4 +16,5 @@ install:
 script:
   - npm run compile
   - npm run lint
+  - npm run test
 #  - npm run coveralls

generator-jsonforms/package-lock.json

@@ -22,8 +22,8 @@
     "@types/yeoman-generator": "^3.1.1",
     "chalk": "^2.4.2",
     "clear": "^0.1.0",
-    "fs-extra": "^7.0.1",
     "figlet": "^1.2.1",
+    "fs-extra": "^7.0.1",
     "jsonforms-react-seed": "git+https://github.com/eclipsesource/jsonforms-react-seed.git",
     "jsonforms-scaffolding-project": "git+https://github.com/eclipsesource/jsonforms-scaffolding-project.git",
     "make-it-happen-react": "git+https://github.com/eclipsesource/make-it-happen-react.git",
@@ -37,6 +37,8 @@
   "devDependencies": {
     "@types/figlet": "^1.2.0",
     "@types/fs-extra": "^5.0.5",
-    "typescript": "^3.4.2"
+    "typescript": "^3.4.2",
+    "yeoman-assert": "^3.1.1",
+    "yeoman-test": "^1.9.1"
   }
 }

generator-jsonforms/package.json

@@ -12,13 +12,13 @@ import { promisify } from 'util';
 const clear = require('clear');
 const validate = require('validate-npm-package-name');
 
-enum ProjectRepo {
+export enum ProjectRepo {
   Example = 'make-it-happen-react',
   Seed = 'jsonforms-react-seed',
   Scaffolding = 'jsonforms-scaffolding-project',
 }
 
-enum Project {
+export enum Project {
   Example = 'example',
   Seed = 'seed',
   Scaffolding = 'scaffolding',

generator-jsonforms/src/generators/app/index.ts

@@ -0,0 +1,52 @@
+// tslint:disable:no-var-requires
+// tslint:disable:no-require-imports
+
+/*import { join } from 'path';
+import { Project } from '../app/index';
+
+const helpers = require('yeoman-test');
+const assert = require('yeoman-assert');*/
+
+describe('Generators package tests', () => {
+  // jest.setTimeout(500000);
+
+  test('test to have one test', () => {
+    expect(true).toBe(true);
+  });
+
+  /*test('Generator with passed options', () => {
+    const path = './';
+    const options = {
+      project: Project.Seed,
+      path,
+      name: 'test-project',
+      schemaPath: '',
+      skipPrompting: true,
+    };
+    return helpers.run(join(__dirname, '../app'))
+    .withOptions( options )
+    .withPrompts( {} )
+    .then((dir: any) => {
+      assert.file(join(dir, 'package.json'));
+    });
+  });
+
+  test('Generator without passed options and prompting', async () => {
+    const path = './';
+    const prompt = {
+      project: ProjectRepo.Seed,
+      path,
+      name: 'test-project-2',
+      schemaPath: '',
+      skipPrompting: false,
+    };
+    return await helpers.run(join(__dirname, '../app'))
+    .withOptions( {} )
+    .withPrompts( prompt )
+    .withLocalConfig({ lang: 'en' })
+    .then((dir: any) => {
+      assert.file(join(dir, 'package.json'));
+    });
+  });
+  */
+});

generator-jsonforms/src/generators/test/index.test.ts

@@ -1,4 +1,9 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  globals: {
+    'ts-jest': {
+      tsConfig: 'tsconfig.base.json'
+    }
+  }
 };

jest.config.js

@@ -24,11 +24,12 @@
     "react-redux": "^6.0.0",
     "redux": "^3.0.0",
     "util": "^0.11.1",
+    "rimraf": "^2.6.2",
     "yeoman-environment": "^2.3.4"
   },
   "type-check": "tsc",
   "devDependencies": {
     "@types/chokidar": "^2.1.3",
-    "rimraf": "^2.6.2"
+    "@types/rimraf": "2.0.2"
   }
 }

jsonforms-tooling-common/package-lock.json

@@ -1,17 +1,17 @@
 // tslint:disable:no-use-before-declare
 
 import { generateDefaultUISchema } from '@jsonforms/core';
-import { sep } from 'path';
+import { dirname, join } from 'path';
 import { existsSync } from 'fs';
 
-import { MessageType, readFileWithPromise, showMessage, writeFileWithPromise } from './utils';
+import { MessageType, readFileWithPromise, showMessage, validateUiSchema, writeFileWithPromise } from './utils';
 
 /**
  * Generates the default UI Schema from a json schema
  * @param {any} editorInstance the instance of the editor
- * @param {string} path the path to the schema file
+ * @param {any} path the path to the schema file
  */
-export const generateUISchema = async (editorInstance: any, path: string) => {
+export const generateUISchema = async (editorInstance: any, path: any) => {
   if (!path) {
     let fileUri = null;
     try  {
@@ -23,23 +23,47 @@ export const generateUISchema = async (editorInstance: any, path: string) => {
         filters: {
           'Json Files': ['json'],
         },
+        id: 'selectSchema',
       });
       if (fileUri && fileUri[0].fsPath) {
         path = fileUri[0].fsPath;
       } else {
-        showMessage(editorInstance, 'Please select a json schema file', MessageType.Error);
-        return;
+        throw new Error('Please select a json schema file');
       }
     } catch (err) {
-      return;
+      showMessage(editorInstance, err.message, MessageType.Error);
+      return err;
     }
   }
 
+  // Read JSON Schema file
+  let jsonContent = null;
+  try {
+    const content = await readFileWithPromise(path, 'utf8');
+    jsonContent = JSON.parse(content);
+  } catch (err) {
+    showMessage(editorInstance, err.message, MessageType.Error);
+    return err;
+  }
+
+  // Check if file is already a uischema file and throw an error
+  try {
+    const validUiSchema = await validateUiSchema(jsonContent);
+    if (validUiSchema) {
+      throw new Error('It seems you selected a uischema. This functions does only work with a'
+      + ' schema file');
+    }
+  } catch (err) {
+    showMessage(editorInstance, err.message, MessageType.Error);
+    return err;
+  }
+
   let fileName = '';
   try {
     fileName = await editorInstance.window.showInputBox(editorInstance.InputBoxOptions = {
       prompt: 'Label: ',
       placeHolder: 'Enter a filename for your UI Schema (default: uischema.json)',
+      id: 'fileName',
     });
     if (fileName === undefined) {
       throw new Error('UI schema generation canceled');
@@ -49,46 +73,43 @@ export const generateUISchema = async (editorInstance: any, path: string) => {
     }
   } catch (err) {
     showMessage(editorInstance, err.message, MessageType.Error);
-    return;
+    return err;
   }
 
   // Check if file already exist and ask user if it should be overwritten
-  const newPath = path.substring(0, path.lastIndexOf(sep)) + sep + fileName;
+  const newPath = join(dirname(path), fileName);
   if (existsSync(newPath)) {
     let decision = 'No';
     try {
       decision = await editorInstance.window.showQuickPick(['Yes', 'No'], editorInstance.QuickPickOptions = {
         canSelectMany: false,
-        placeHolder:  `This file ${fileName} does already exist. Should it be overwritten?`
+        placeHolder:  `This file ${fileName} does already exist. Should it be overwritten?`,
+        id: 'overwrite',
       });
       if (decision !== 'Yes') {
         throw new Error('UI schema generation canceled');
       }
     } catch (err) {
       showMessage(editorInstance, err.message, MessageType.Error);
-      return;
+      return err;
     }
   }
 
-  // Read JSON Schema file
-  let jsonContent = null;
+  // Generate the default UI schema
+  let jsonUISchema = null;
   try {
-    const content = await readFileWithPromise(path, 'utf8');
-    jsonContent = JSON.parse(content);
+    jsonUISchema = await generateDefaultUISchema(jsonContent);
   } catch (err) {
     showMessage(editorInstance, err.message, MessageType.Error);
     return;
   }
 
-  // Generate the default UI schema
-  const jsonUISchema = generateDefaultUISchema(jsonContent);
-
   // Write UI Schema file
   try {
     await writeFileWithPromise(newPath, JSON.stringify(jsonUISchema, null, 2));
   } catch (err) {
     showMessage(editorInstance, err.message, MessageType.Error);
-    return;
+    return err;
   }
   showMessage(editorInstance, 'Successfully generated UI schema');
   return jsonUISchema;

jsonforms-tooling-common/package.json

@@ -81,7 +81,7 @@ export const uiMetaSchema: JsonSchema7 = {
           'default': 'Control'
         },
         'label': {
-          'type': 'string'
+          'type': ['string', 'boolean']
         },
         'scope': {
           '$ref': '#/definitions/scope'