test: fix component and module tests (#68)

Author: Alexander Vakrilov

.gitignore

@@ -1,6 +1,8 @@
 # Outputs
 src/**/*.js
 src/**/*.js.map
+jasmine-config/**/*.js
+jasmine-config/**/*.js.map
 
 # Schematics template files
 !src/**/_*/**/*.js

.npmignore

@@ -1,6 +1,6 @@
 **/*.tgz
 !*.d.ts
 *.js.map
-
+/jasmine-config
 /tsconfig.json
 

jasmine-config/jasmine.json

@@ -0,0 +1,11 @@
+{
+  "spec_dir": ".",
+  "spec_files": [
+    "src/**/*_spec.js"
+  ],
+  "helpers": [
+    "jasmine-config/**/*.js"
+  ],
+  "stopSpecOnExpectationFailure": false,
+  "random": false
+}

jasmine-config/reporter.ts

@@ -0,0 +1,4 @@
+import { SpecReporter } from "jasmine-spec-reporter";
+
+jasmine.getEnv().clearReporters();
+jasmine.getEnv().addReporter(new SpecReporter());

package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "watch": "tsc -w -p tsconfig.json",
-    "test": "npm run build && jasmine **/*_spec.js",
+    "test": "npm run build && npm run jasmine",
+    "jasmine": "jasmine --config=jasmine-config/jasmine.json",
     "prepare": "npm run build",
     "debug": "node --debug-brk $(which ng) g command",
     "debug-v8": "node --inspect-brk $(which ng) g command",
@@ -23,6 +24,7 @@
     "@types/node": "^8.0.31",
     "conventional-changelog-cli": "^2.0.1",
     "jasmine": "^2.8.0",
+    "jasmine-spec-reporter": "^4.2.1",
     "typescript": "2.7.2"
   },
   "repository": {

src/angular-json/_files/angular.json

@@ -8,7 +8,7 @@
   "projects": {
     "<%= name %>": {
       "root": "",
-      "sourceRoot": ".",
+      "sourceRoot": "<%= sourceRoot %>",
       "projectType": "application",
       "prefix": "<%= prefix %>"
     }

src/angular-json/index.ts

@@ -6,18 +6,16 @@ import {
   url,
   mergeWith,
   TemplateOptions,
+  noop,
 } from '@angular-devkit/schematics';
 
 import { Schema as NgCliConfigSchema } from './schema';
 
 export default function (options: NgCliConfigSchema) {
   return branchAndMerge(mergeWith(
     apply(url('./_files'), [
-      template(<TemplateOptions>{
-        prefix: options.prefix,
-        name: options.name
-      }),
-      move(options.path)
+      template(<TemplateOptions>{ ...options }),
+      (options.path) ? move(options.path) : noop
     ])
   ));
 }

src/angular-json/index_spec.ts

@@ -1,35 +1,58 @@
-import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
-import { getFileContent } from '@schematics/angular/utility/test';
 import * as path from 'path';
-
-import { Schema as NgCliConfigOptions } from './schema';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { getFileContent } from '@schematics/angular/utility/test';
+import { Schema as angularJsonOptions } from './schema';
 
 describe('Angular JSON Config Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     'nativescript-schematics',
     path.join(__dirname, '../collection.json'),
   );
-  const appPath = 'foo';
-  const defaultOptions: NgCliConfigOptions = {
-    name: 'test', // TODO: make sure it is a correct name
-    path: appPath,
-    prefix: 'app',
+
+  const projName = "leproj"
+  const defaultOptions: angularJsonOptions = {
+    name: projName,
   };
-  const configPath = `/${appPath}/angular.json`;
+  const configPath = `/angular.json`;
 
-  it('should create all files of an application', () => {
-    const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('angular-json', options);
-    const files = tree.files;
-    expect(files.indexOf(configPath)).toBeGreaterThanOrEqual(0);
-  }); 
+  describe("with default options (name only)", () => {
+    let tree: UnitTestTree;
+    beforeAll(() => {
+      tree = schematicRunner.runSchematic('angular-json', defaultOptions);
+    })
 
-  it('should handle the prefix option', () => {
-    const prefix = 'my-app-prefix';
-    const options = { ...defaultOptions, prefix };
+    it('should create angular.json files', () => {
+      expect(tree.files.indexOf(configPath)).toBeGreaterThanOrEqual(0);
+    });
 
-    const tree = schematicRunner.runSchematic('angular-json', options);
+    it('should insert the project name', () => {
+      expect(getFileContent(tree, configPath)).toContain(`"${projName}":`);
+    });
+
+    it('should insert "." as sourceRoot', () => {
+      expect(getFileContent(tree, configPath)).toContain(`"sourceRoot": "."`);
+    });
+  })
+
+  it('should insert the prefix option', () => {
+    const prefix = 'custom-prefix';
+    const tree = schematicRunner.runSchematic('angular-json', { ...defaultOptions, prefix });
     expect(getFileContent(tree, configPath)).toContain(`"prefix": "${prefix}"`);
   });
+
+  it('should insert the sourceRoot option', () => {
+    const sourceRoot = 'src';
+    const tree = schematicRunner.runSchematic('angular-json', { ...defaultOptions, sourceRoot });
+    expect(getFileContent(tree, configPath)).toContain(`"sourceRoot": "${sourceRoot}"`);
+  });
+
+  it('should create files inside path when specified', () => {
+    const path = "/path/to/my/app";
+    const appJsonPath = `${path}/angular.json`;
+    const options = { ...defaultOptions, path };
+
+    const tree = schematicRunner.runSchematic('angular-json', options);
+    expect(tree.files.indexOf(appJsonPath)).toBeGreaterThanOrEqual(0);
+  });
 });

src/angular-json/schema.d.ts

@@ -3,12 +3,19 @@ export interface Schema {
      * Specifies the name of the project.
      */
     name: string;
+
     /**
      * Specifies the destination path.
      */
-    path: string;
+    path?: string;
+
     /**
      * The prefix to apply to generated selectors.
      */
-    prefix: string;
+    prefix?: string;
+
+    /**
+     * The source root folder to be used in the generated angular project.
+     */
+    sourceRoot?: string;
  }

src/angular-json/schema.json

@@ -11,12 +11,16 @@
     "path": {
       "type": "string",
       "description": "Specifies the destination path.",
-      "default": "."
     },
     "prefix": {
       "type": "string",
       "description": "The prefix to apply to generated selectors.",
       "default": "app"
+    },
+    "sourceRoot": {
+      "type": "string",
+      "description": "The source root folder to be used in the generated angular project",
+      "default": "."
     }
   },
   "required": [

src/generate/component/index.ts

@@ -26,7 +26,7 @@ class ComponentInfo {
   templatePath: string;
   name: string;
 
-  constructor() {}
+  constructor() { }
 }
 
 let extensions: Extensions;
@@ -39,12 +39,6 @@ export default function (options: ComponentOptions): Rule {
     (tree: Tree) => {
       platformUse = getPlatformUse(tree, options);
 
-      // TODO: Remove after @angular/[email protected] is complete
-      if (!options.path) {
-        const settings = getProjectObject(tree, options.project);
-        options.path = normalize(settings.sourceRoot + '/app');
-      }
-      
       if (platformUse.nsOnly && options.spec !== true) {
         options.spec = false;
       }
@@ -63,41 +57,29 @@ export default function (options: ComponentOptions): Rule {
       componentInfo = parseComponentInfo(tree, options);
     },
 
-    (tree: Tree, context: SchematicContext) => {
+    (tree: Tree) => {
       if (platformUse.nsOnly) {
-        // return renameWebTemplate(tree, component.templatePath);
-        // don't do anything to the template file, as it its content will be replaced in the next step
-        return;
+        insertModuleId(tree, componentInfo.classPath);
       }
+    },
+
+    (tree: Tree, context: SchematicContext) => {
       if (platformUse.useWeb) {
         return renameWebTemplate(tree, componentInfo.templatePath);
       } else {
         return removeWebTemplate(tree, context, componentInfo.templatePath);
       }
     },
 
-    (tree: Tree) => {
-      if (platformUse.nsOnly) {
-        insertModuleId(tree, componentInfo.classPath);
-      }
-    },
-
     (tree: Tree, context: SchematicContext) => {
-      if (platformUse.nsOnly) {
-        tree.overwrite(componentInfo.templatePath, `<Button text="${componentInfo.name} works!" class="btn btn-primary"></Button>`);
-        return tree;
-      }
-
       if (platformUse.useNs) {
-        // return performNsModifications(component)(tree, context);
         return addNativeScriptFiles(componentInfo)(tree, context);
       }
     }
   ]);
 };
 
-const validateOptions = (platformUse: PlatformUse, options: ComponentOptions) =>
-  () => {
+const validateOptions = (platformUse: PlatformUse, options: ComponentOptions) => {
   if (platformUse.webReady && options.inlineTemplate) {
     throw new SchematicsException('You cannot use the --inlineTemplate option for web+ns component!');
   }
@@ -107,10 +89,10 @@ const validateOptions = (platformUse: PlatformUse, options: ComponentOptions) =>
   }
 
   if (!platformUse.useNs && !platformUse.useWeb) {
-    if(options.nativescript) {
+    if (options.nativescript) {
       throw new SchematicsException(`Project is not configured for NativeScript, while --web is set to false`);
     }
-    
+
     if (options.web) {
       throw new SchematicsException(`Project is not configured for Angular Web, while --nativescript is set to false`);
     }
@@ -120,11 +102,11 @@ const validateOptions = (platformUse: PlatformUse, options: ComponentOptions) =>
 const parseComponentInfo = (tree: Tree, options: ComponentOptions): ComponentInfo => {
   // const path = `/${projectSettings.root}/${projectSettings.sourceRoot}/app`;
   const component = new ComponentInfo();
-  
+
   const parsedPath = parseName(options.path || '', options.name);
 
   component.name = dasherize(parsedPath.name);
-  const className = `/${component.name}.component.ts`; 
+  const className = `/${component.name}.component.ts`;
   const templateName = `/${component.name}.component.html`;
 
   tree.actions.forEach(action => {
@@ -153,17 +135,10 @@ const renameWebTemplate = (tree: Tree, templatePath: string) => {
 };
 
 const removeWebTemplate = (tree: Tree, context: SchematicContext, templatePath: string) =>
-  // tree.delete(templatePath);
   filter(
     (path: Path) => !path.match(templatePath)
   )(tree, context)
 
-// const performNsModifications = (component: ComponentInfo) =>
-//   (tree: Tree, context: SchematicContext) => {
-//     insertModuleId(component.classPath)(tree);
-//     return addNativeScriptFiles(component)(tree, context);
-//   }
-
 const addNativeScriptFiles = (component: ComponentInfo) => {
   const parsedTemplate = parseName('', component.templatePath);
   parsedTemplate.name = parsedTemplate.name.replace('.html', `${extensions.ns}.html`);
@@ -180,4 +155,3 @@ const addNativeScriptFiles = (component: ComponentInfo) => {
   return mergeWith(templateSource);
 
 };
-