test(@angular-devkit/schematics): add bazel tests

Author: filipesilva

packages/angular_devkit/schematics/BUILD

@@ -5,20 +5,24 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 licenses(["notice"])  # MIT License
 
+# @angular-devkit/schematics
+
 ts_library(
     name = "schematics",
     srcs = glob(
         include = ["src/**/*.ts"],
         exclude = [
             "src/**/*_spec.ts",
+            "src/**/*_spec_large.ts",
             "src/**/*_benchmark.ts",
         ],
     ),
     module_name = "@angular-devkit/schematics",
-    module_root = "src",
+    module_root = "src/index.d.ts",
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
@@ -28,6 +32,38 @@ ts_library(
     ],
 )
 
+ts_library(
+    name = "schematics_test_lib",
+    srcs = glob(
+        include = [
+            "src/**/*_spec.ts",
+            "src/**/*_spec_large.ts",
+        ],
+        exclude = [
+            # Instances of extended errors are showing Error as the constructor instead.
+            # TODO(@filipesilva): figure out why that is.
+            "src/rules/call_spec.ts",
+        ],
+    ),
+    deps = [
+        ":schematics",
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
+        "@rxjs",
+        "@rxjs//operators",
+        # @typings: jasmine
+        # @typings: node
+    ],
+)
+
+jasmine_node_test(
+    name = "schematics_test",
+    srcs = [":schematics_test_lib"],
+)
+
+
+# @angular-devkit/schematics/tasks
+
 ts_library(
     name = "tasks",
     srcs = glob(
@@ -38,8 +74,7 @@ ts_library(
         ],
     ),
     module_name = "@angular-devkit/schematics/tasks",
-    module_root = "tasks",
-    tsconfig = "//:tsconfig.json",
+    module_root = "tasks/index.d.ts",
     deps = [
         ":schematics",
         "//packages/angular_devkit/core",
@@ -53,72 +88,115 @@ ts_library(
 )
 
 ts_library(
-    name = "tools",
+    name = "tasks_test_lib",
     srcs = glob(
-        include = ["tools/**/*.ts"],
+        include = [
+            "tasks/**/*_spec.ts",
+            "tasks/**/*_spec_large.ts",
+        ],
         exclude = [
-            "tools/**/*_spec.ts",
-            "tools/**/*_benchmark.ts",
+            # Disabled because 'collection.json' cannot be resolved in bazel.
+            # TODO(@filipesilva): figure out how to make data files resolve correctly.
+            "tasks/tslint-fix/executor_spec.ts",
         ],
     ),
-    module_name = "@angular-devkit/schematics/tools",
-    module_root = "tools",
     deps = [
-        ":schematics",
         ":tasks",
+        ":testing",
+        ":schematics",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
+        "//packages/angular_devkit/core:node_testing",
         "@rxjs",
         "@rxjs//operators",
+        # @typings: jasmine
         # @typings: node
     ],
 )
 
+
+# Disabled since we are excluding the only test in tasks.
+# jasmine_node_test(
+#     name = "tasks_test",
+#     srcs = [":tasks_test_lib"],
+#     data = [
+#         "tasks/tslint-fix/test/collection.json"    
+#     ],
+# )
+
+
+# @angular-devkit/schematics/tools
+
 ts_library(
-    name = "testing",
+    name = "tools",
     srcs = glob(
-        include = ["testing/**/*.ts"],
-        exclude = [],
+        include = ["tools/**/*.ts"],
+        exclude = [
+            "tools/**/*_spec.ts",
+            "tools/**/*_benchmark.ts",
+        ],
     ),
-    module_name = "@angular-devkit/schematics/testing",
-    module_root = "testing",
+    module_name = "@angular-devkit/schematics/tools",
+    module_root = "tools/index.d.ts",
     deps = [
         ":schematics",
         ":tasks",
-        ":tools",
         "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
+        # @typings: node
     ],
 )
 
 ts_library(
-    name = "spec",
+    name = "tools_test_lib",
     srcs = glob(
-        include = ["src/**/*_spec.ts"],
+        include = [
+            "tools/**/*_spec.ts",
+            "tools/**/*_spec_large.ts",
+        ],
+        exclude = [
+            # The node resolve spec uses the _devKitRoot global, which isn't available in Bazel.
+            # TODO(@filipesilva): figure out an alternative to that global.
+            "tools/file-system-engine-host_spec.ts",
+        ],
     ),
     deps = [
+        ":tools",
+        ":tasks",
         ":schematics",
         "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
         # @typings: jasmine
+        # @typings: node
     ],
 )
 
+jasmine_node_test(
+    name = "tools_test",
+    srcs = [":tools_test_lib"],
+)
+
+
+# @angular-devkit/schematics/testing
+
 ts_library(
-    name = "tools_spec",
+    name = "testing",
     srcs = glob(
-        include = ["tools/**/*_spec.ts"],
+        include = ["testing/**/*.ts"],
+        exclude = [],
     ),
+    module_name = "@angular-devkit/schematics/testing",
+    module_root = "testing/index.d.ts",
     deps = [
         ":schematics",
+        ":tasks",
         ":tools",
         "//packages/angular_devkit/core",
-        "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
     ],
-)
+)

packages/angular_devkit/schematics/src/sink/host_spec.ts

@@ -8,7 +8,6 @@
 // tslint:disable:no-implicit-dependencies
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { HostSink } from '@angular-devkit/schematics';
-import { fileBufferToString } from '../../../core/src/virtual-fs/host';
 import { HostCreateTree, HostTree } from '../tree/host-tree';
 import { optimize } from '../tree/static';
 
@@ -133,7 +132,7 @@ describe('FileSystemSink', () => {
           .toPromise()
           .then(() => {
             expect(host.sync.read(normalize('/file0')).toString()).toBe('hello');
-            expect(fileBufferToString(host.sync.read(normalize('/file1')))).toBe('world');
+            expect(virtualFs.fileBufferToString(host.sync.read(normalize('/file1')))).toBe('world');
           })
           .then(done, done.fail);
     });

packages/angular_devkit/schematics/tasks/tslint-fix/executor_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
-import { getSystemPath, normalize, virtualFs } from '@angular-devkit/core';
+import { getSystemPath, logging, normalize, virtualFs } from '@angular-devkit/core';
 import { TempScopedNodeJsSyncHost } from '@angular-devkit/core/node/testing';
 import { HostTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
@@ -52,7 +52,7 @@ describe('TsLintTaskExecutor', () => {
       testRunner.runSchematicAsync('run-task', null, tree),
       new Observable<void>(obs => {
         process.chdir(getSystemPath(host.root));
-        testRunner.logger.subscribe(x => messages.push(x.message));
+        testRunner.logger.subscribe((x: logging.LogEntry) => messages.push(x.message));
         testRunner.engine.executePostTasks().subscribe(obs);
       }).pipe(
         catchError(() => {
@@ -88,7 +88,7 @@ describe('TsLintTaskExecutor', () => {
       testRunner.runSchematicAsync('custom-rule', { shouldPass: true }, tree),
       new Observable<void>(obs => {
         process.chdir(getSystemPath(host.root));
-        testRunner.logger.subscribe(x => messages.push(x.message));
+        testRunner.logger.subscribe((x: logging.LogEntry) => messages.push(x.message));
         testRunner.engine.executePostTasks().subscribe(obs);
       }),
     ).toPromise().then(done, done.fail);
@@ -113,7 +113,7 @@ describe('TsLintTaskExecutor', () => {
       testRunner.runSchematicAsync('custom-rule', { shouldPass: false }, tree),
       new Observable<void>(obs => {
         process.chdir(getSystemPath(host.root));
-        testRunner.logger.subscribe(x => messages.push(x.message));
+        testRunner.logger.subscribe((x: logging.LogEntry) => messages.push(x.message));
         testRunner.engine.executePostTasks().subscribe(obs);
       }).pipe(
         catchError(() => {

packages/angular_devkit/schematics/tools/export-ref_spec.ts

@@ -11,28 +11,32 @@ import { ExportStringRef } from './export-ref';
 
 
 describe('ExportStringRef', () => {
+  // Depending on how the package is built the module might be either .js or .ts.
+  // To make expectations easier, we strip the extension.
+  const stripExtension = (p: string) => p.replace(/\.(j|t)s$/, '');
+
   it('works', () => {
     // META
     const ref = new ExportStringRef('./export-ref#ExportStringRef', __dirname);
     expect(ref.ref).toBe(ExportStringRef);
     expect(ref.path).toBe(__dirname);
-    expect(ref.module).toBe(path.join(__dirname, 'export-ref.ts'));
+    expect(stripExtension(ref.module)).toBe(path.join(__dirname, 'export-ref'));
   });
 
   it('works without an inner ref', () => {
     // META
     const ref = new ExportStringRef(path.join(__dirname, 'export-ref'));
     expect(ref.ref).toBe(undefined);
     expect(ref.path).toBe(__dirname);
-    expect(ref.module).toBe(path.join(__dirname, 'export-ref.ts'));
+    expect(stripExtension(ref.module)).toBe(path.join(__dirname, 'export-ref'));
   });
 
   it('returns the exports', () => {
     // META
     const ref = new ExportStringRef('./export-ref#ExportStringRef', __dirname, false);
     expect(ref.ref).toEqual({ ExportStringRef });
     expect(ref.path).toBe(__dirname);
-    expect(ref.module).toBe(path.join(__dirname, 'export-ref.ts'));
+    expect(stripExtension(ref.module)).toBe(path.join(__dirname, 'export-ref'));
   });
 
   it('works on package names', () => {
@@ -42,13 +46,13 @@ describe('ExportStringRef', () => {
     );
     expect(ref.ref).toEqual(CollectionCannotBeResolvedException);
     expect(ref.path).toBe(__dirname);
-    expect(ref.module).toBe(path.join(__dirname, 'index.ts'));
+    expect(stripExtension(ref.module)).toBe(path.join(__dirname, 'index'));
   });
 
   it('works on directory', () => {
     // META
     const ref = new ExportStringRef(__dirname);
     expect(ref.path).toBe(__dirname);
-    expect(ref.module).toBe(path.join(__dirname, 'index.ts'));
+    expect(stripExtension(ref.module)).toBe(path.join(__dirname, 'index'));
   });
 });