build: schematics unit tests not being run

src/cdk/schematics/BUILD.bazel

@@ -1,10 +1,10 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin", "pkg_npm")
 load("//:packages.bzl", "VERSION_PLACEHOLDER_REPLACEMENTS")
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
-filegroup(
+copy_to_bin(
     name = "schematics_assets",
     srcs = glob([
         "**/files/**/*",
@@ -47,9 +47,11 @@ ts_library(
 # This package is intended to be combined into the main @angular/cdk package as a dep.
 pkg_npm(
     name = "npm_package",
-    srcs = [":schematics_assets"],
     substitutions = VERSION_PLACEHOLDER_REPLACEMENTS,
-    deps = [":schematics"],
+    deps = [
+        ":schematics",
+        ":schematics_assets",
+    ],
 )
 
 ### Testing rules

src/cdk/schematics/ng-add/index.spec.ts

@@ -1,6 +1,6 @@
 import {Tree} from '@angular-devkit/schematics';
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
-import {COLLECTION_PATH} from '../index.spec';
+import {COLLECTION_PATH} from '../paths';
 import {createTestApp, getFileContent} from '../testing';
 import {addPackageToPackageJson} from './package-config';
 

src/cdk/schematics/ng-generate/drag-drop/index.spec.ts

@@ -1,5 +1,5 @@
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
-import {COLLECTION_PATH} from '../../index.spec';
+import {COLLECTION_PATH} from '../../paths';
 import {createTestApp, getFileContent} from '../../testing';
 import {Schema} from './schema';
 

src/cdk/schematics/ng-update/test-cases/index.spec.ts

@@ -1,5 +1,5 @@
 import {defineJasmineTestCases, findBazelVersionTestCases} from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../index.spec';
+import {MIGRATION_PATH} from '../../paths';
 import {getAllVersionNames} from '../../update-tool/target-version';
 
 describe('CDK upgrade test cases', () => {

src/cdk/schematics/ng-update/test-cases/misc/external-resource-resolution.spec.ts

@@ -1,5 +1,5 @@
 import {resolveBazelPath} from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../../index.spec';
+import {MIGRATION_PATH} from '../../../paths';
 import {createTestCaseSetup} from '../../../testing';
 
 describe('ng-update external resource resolution', () => {

src/cdk/schematics/ng-update/test-cases/misc/global-stylesheets.spec.ts

@@ -1,6 +1,6 @@
 import {resolveBazelPath} from '@angular/cdk/schematics/testing';
 import {readFileSync} from 'fs';
-import {MIGRATION_PATH} from '../../../index.spec';
+import {MIGRATION_PATH} from '../../../paths';
 import {createTestCaseSetup} from '../../../testing';
 
 describe('global stylesheets migration', () => {

src/cdk/schematics/ng-update/test-cases/misc/method-call-checks.spec.ts

@@ -1,5 +1,5 @@
 import {resolveBazelPath} from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../../index.spec';
+import {MIGRATION_PATH} from '../../../paths';
 import {createTestCaseSetup} from '../../../testing';
 
 describe('v6 method call checks', () => {

src/cdk/schematics/paths.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {join} from 'path';
+
+/** Path to the schematic collection for non-migration schematics. */
+export const COLLECTION_PATH = join(__dirname, 'collection.json');
+
+/** Path to the schematic collection that includes the migrations. */
+export const MIGRATION_PATH = join(__dirname, 'migration.json');

src/material/schematics/BUILD.bazel

@@ -1,10 +1,10 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin", "pkg_npm")
 load("//:packages.bzl", "VERSION_PLACEHOLDER_REPLACEMENTS")
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
-filegroup(
+copy_to_bin(
     name = "schematics_assets",
     srcs = ["ng-update/migrations/hammer-gestures-v9/gesture-config.template"] + glob([
         "ng-generate/*/files/**/*",
@@ -44,9 +44,11 @@ ts_library(
 # This package is intended to be combined into the main @angular/material package as a dep.
 pkg_npm(
     name = "npm_package",
-    srcs = [":schematics_assets"],
     substitutions = VERSION_PLACEHOLDER_REPLACEMENTS,
-    deps = [":schematics"],
+    deps = [
+        ":schematics",
+        ":schematics_assets",
+    ],
 )
 
 ### Testing rules

src/material/schematics/ng-add/index.spec.ts

@@ -10,7 +10,7 @@ import {
 } from '@angular/cdk/schematics';
 import {createTestApp, createTestLibrary, getFileContent} from '@angular/cdk/schematics/testing';
 import {getWorkspace} from '@schematics/angular/utility/workspace';
-import {COLLECTION_PATH} from '../index.spec';
+import {COLLECTION_PATH} from '../paths';
 import {addPackageToPackageJson} from './package-config';
 
 interface PackageJson {

src/material/schematics/ng-generate/address-form/index.spec.ts

@@ -1,6 +1,6 @@
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
 import {createTestApp, getFileContent} from '@angular/cdk/schematics/testing';
-import {COLLECTION_PATH} from '../../index.spec';
+import {COLLECTION_PATH} from '../../paths';
 import {Schema} from './schema';
 
 describe('Material address-form schematic', () => {

src/material/schematics/ng-generate/dashboard/index.spec.ts

@@ -1,6 +1,6 @@
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
 import {createTestApp, getFileContent} from '@angular/cdk/schematics/testing';
-import {COLLECTION_PATH} from '../../index.spec';
+import {COLLECTION_PATH} from '../../paths';
 import {Schema} from './schema';
 
 describe('material-dashboard-schematic', () => {

src/material/schematics/ng-generate/navigation/index.spec.ts

@@ -1,6 +1,6 @@
 import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
 import {createTestApp, getFileContent} from '@angular/cdk/schematics/testing';
-import {COLLECTION_PATH} from '../../index.spec';
+import {COLLECTION_PATH} from '../../paths';
 
 import {Schema} from './schema';
 

src/material/schematics/ng-generate/table/index.spec.ts

@@ -1,6 +1,6 @@
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
 import {createTestApp, getFileContent} from '@angular/cdk/schematics/testing';
-import {COLLECTION_PATH} from '../../index.spec';
+import {COLLECTION_PATH} from '../../paths';
 import {Schema} from './schema';
 
 describe('material-table-schematic', () => {

src/material/schematics/ng-generate/tree/index.spec.ts

@@ -1,6 +1,6 @@
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
 import {createTestApp, getFileContent} from '@angular/cdk/schematics/testing';
-import {COLLECTION_PATH} from '../../index.spec';
+import {COLLECTION_PATH} from '../../paths';
 import {Schema} from './schema';
 
 describe('Material tree schematic', () => {

src/material/schematics/ng-update/test-cases/index.spec.ts

@@ -1,6 +1,6 @@
 import {getAllVersionNames} from '@angular/cdk/schematics';
 import {defineJasmineTestCases, findBazelVersionTestCases} from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../index.spec';
+import {MIGRATION_PATH} from '../../paths';
 
 describe('Material upgrade test cases', () => {
   const versionNames = getAllVersionNames().map(versionName => versionName.toLowerCase());

src/material/schematics/ng-update/test-cases/misc/class-inheritance.spec.ts

@@ -1,5 +1,5 @@
 import {createTestCaseSetup, resolveBazelPath} from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../../index.spec';
+import {MIGRATION_PATH} from '../../../paths';
 
 describe('class inheritance misc checks', () => {
   describe('v6 class which extends MatFormFieldControl', () => {

src/material/schematics/ng-update/test-cases/misc/constructor-checks.spec.ts

@@ -1,5 +1,5 @@
 import {createTestCaseSetup, resolveBazelPath} from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../../index.spec';
+import {MIGRATION_PATH} from '../../../paths';
 
 describe('constructor checks', () => {
   it('should properly report invalid constructor expression signatures', async () => {

src/material/schematics/ng-update/test-cases/misc/import-checks.spec.ts

@@ -1,5 +1,5 @@
 import {createTestCaseSetup, resolveBazelPath} from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../../index.spec';
+import {MIGRATION_PATH} from '../../../paths';
 
 describe('v6 import misc checks', () => {
   it('should report imports for deleted animation constants', async () => {

src/material/schematics/ng-update/test-cases/v8/misc/material-imports.spec.ts

@@ -3,7 +3,7 @@ import {
   readFileContent,
   resolveBazelPath
 } from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../../../index.spec';
+import {MIGRATION_PATH} from '../../../../paths';
 
 describe('v8 material imports', () => {
   it('should re-map top-level material imports to the proper entry points', async () => {

src/material/schematics/ng-update/test-cases/v9/misc/hammer-migration-v9.spec.ts

@@ -3,7 +3,7 @@ import {dedent} from '@angular/cdk/testing/private';
 import {addPackageToPackageJson} from '@angular/cdk/schematics/ng-add/package-config';
 import {createTestCaseSetup, resolveBazelPath} from '@angular/cdk/schematics/testing';
 import {readFileSync} from 'fs';
-import {MIGRATION_PATH} from '../../../../index.spec';
+import {MIGRATION_PATH} from '../../../../paths';
 
 
 interface PackageJson {

src/material/schematics/ng-update/test-cases/v9/misc/material-imports.spec.ts

@@ -1,5 +1,5 @@
 import {createTestCaseSetup, readFileContent, resolveBazelPath} from '@angular/cdk/schematics/testing';
-import {MIGRATION_PATH} from '../../../../index.spec';
+import {MIGRATION_PATH} from '../../../../paths';
 
 describe('v9 material imports', () => {
   it('should re-map top-level material imports to the proper entry points when top-level ' +

src/material/schematics/paths.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {join} from 'path';
+
+/** Path to the schematic collection for non-migration schematics. */
+export const COLLECTION_PATH = join(__dirname, 'collection.json');
+
+/** Path to the schematic collection that includes the migrations. */
+export const MIGRATION_PATH = join(__dirname, 'migration.json');