Migrate more jasmine tests

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -3,8 +3,12 @@
 # This file should be checked into version control along with the pnpm-lock.yaml file.
 .npmrc=-2023857461
 package.json=-1983260945
-packages/angular_devkit/architect/package.json=-107274537
+packages/angular/cli/package.json=-1878910022
+packages/angular_devkit/architect/package.json=-1496633956
+packages/angular_devkit/architect_cli/package.json=1551210941
 packages/angular_devkit/core/package.json=339935828
-pnpm-lock.yaml=-2133021503
-pnpm-workspace.yaml=-1853274682
+packages/angular_devkit/schematics/package.json=673943597
+packages/schematics/angular/package.json=251715148
+pnpm-lock.yaml=-318777127
+pnpm-workspace.yaml=-1051214858
 yarn.lock=577341343

WORKSPACE

@@ -186,8 +186,12 @@ npm_translate_lock(
     data = [
         "//:package.json",
         "//:pnpm-workspace.yaml",
+        "//packages/angular/cli:package.json",
         "//packages/angular_devkit/architect:package.json",
+        "//packages/angular_devkit/architect_cli:package.json",
         "//packages/angular_devkit/core:package.json",
+        "//packages/angular_devkit/schematics:package.json",
+        "//packages/schematics/angular:package.json",
     ],
     npmrc = "//:.npmrc",
     patches = {

goldens/public-api/angular_devkit/schematics/tools/index.api.md

@@ -12,9 +12,9 @@ import { Observable } from 'rxjs';
 import { Path } from '@angular-devkit/core';
 import { PathFragment } from '@angular-devkit/core';
 import { schema } from '@angular-devkit/core';
+import { Subject } from 'rxjs';
 import { Url } from 'url';
 import { virtualFs } from '@angular-devkit/core';
-import { workflow } from '@angular-devkit/schematics';
 
 // @public (undocumented)
 export class CollectionCannotBeResolvedException extends BaseException {

packages/angular/cli/BUILD.bazel

@@ -3,15 +3,17 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.dev/license
 
-load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults2.bzl", "npm_package", "ts_project")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ng_cli_schema_generator.bzl", "cli_json_schema")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])
 
+npm_link_all_packages()
+
 RUNTIME_ASSETS = glob(
     include = [
         "bin/**/*",
@@ -43,6 +45,10 @@ ts_project(
     data = RUNTIME_ASSETS,
     module_name = "@angular/cli",
     deps = [
+        ":node_modules/@angular-devkit/architect",
+        ":node_modules/@angular-devkit/core",
+        ":node_modules/@angular-devkit/schematics",
+        ":node_modules/resolve",
         "//:node_modules/@angular/core",
         "//:node_modules/@inquirer/prompts",
         "//:node_modules/@listr2/prompt-adapter-inquirer",
@@ -62,14 +68,8 @@ ts_project(
         "//:node_modules/npm-pick-manifest",
         "//:node_modules/pacote",
         "//:node_modules/semver",
+        "//:node_modules/symbol-observable",
         "//:node_modules/yargs",
-        "//packages/angular_devkit/architect:architect_rjs",
-        "//packages/angular_devkit/architect/node:node_rjs",
-        "//packages/angular_devkit/core:core_rjs",
-        "//packages/angular_devkit/core/node:node_rjs",
-        "//packages/angular_devkit/schematics:schematics_rjs",
-        "//packages/angular_devkit/schematics/tasks:tasks_rjs",
-        "//packages/angular_devkit/schematics/tools:tools_rjs",
     ],
 )
 
@@ -148,9 +148,9 @@ ts_project(
     ],
 )
 
-jasmine_node_test(
+jasmine_test(
     name = "angular-cli_test",
-    srcs = [":angular-cli_test_lib"],
+    data = [":angular-cli_test_lib_rjs"],
 )
 
 genrule(

packages/angular/cli/package.json

@@ -22,12 +22,12 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
-    "@angular-devkit/core": "0.0.0-PLACEHOLDER",
-    "@angular-devkit/schematics": "0.0.0-PLACEHOLDER",
+    "@angular-devkit/architect": "workspace:0.0.0-EXPERIMENTAL-PLACEHOLDER",
+    "@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
+    "@angular-devkit/schematics": "workspace:0.0.0-PLACEHOLDER",
     "@inquirer/prompts": "7.2.3",
     "@listr2/prompt-adapter-inquirer": "2.0.18",
-    "@schematics/angular": "0.0.0-PLACEHOLDER",
+    "@schematics/angular": "workspace:0.0.0-PLACEHOLDER",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "5.0.0",
     "jsonc-parser": "3.3.1",

packages/angular_devkit/architect/package.json

@@ -6,7 +6,7 @@
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {
-    "@angular-devkit/core": "0.0.0-PLACEHOLDER",
+    "@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
     "rxjs": "7.8.1"
   },
   "builders": "./builders/builders.json"

packages/angular_devkit/architect_cli/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
@@ -8,21 +9,21 @@ licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])
 
+npm_link_all_packages()
+
 ts_project(
     name = "architect_cli",
     srcs = [
         "bin/architect.ts",
     ] + glob(["src/**/*.ts"]),
     module_name = "@angular-devkit/architect-cli",
     deps = [
+        ":node_modules/@angular-devkit/architect",
+        ":node_modules/@angular-devkit/core",
         "//:node_modules/@types/node",
         "//:node_modules/@types/progress",
         "//:node_modules/@types/yargs-parser",
         "//:node_modules/ansi-colors",
-        "//packages/angular_devkit/architect:architect_rjs",
-        "//packages/angular_devkit/architect/node:node_rjs",
-        "//packages/angular_devkit/core:core_rjs",
-        "//packages/angular_devkit/core/node:node_rjs",
     ],
 )
 

packages/angular_devkit/architect_cli/package.json

@@ -14,8 +14,8 @@
     "tooling"
   ],
   "dependencies": {
-    "@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
-    "@angular-devkit/core": "0.0.0-PLACEHOLDER",
+    "@angular-devkit/architect": "workspace:0.0.0-EXPERIMENTAL-PLACEHOLDER",
+    "@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
     "ansi-colors": "4.1.3",
     "progress": "2.0.3",
     "symbol-observable": "4.0.0",

packages/angular_devkit/core/BUILD.bazel

@@ -1,6 +1,5 @@
 load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
-load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults2.bzl", "npm_package", "ts_project")
+load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -60,9 +59,9 @@ ts_project(
     ],
 )
 
-jasmine_node_test(
+jasmine_test(
     name = "core_test",
-    srcs = [":core_test_lib"],
+    data = [":core_test_lib_rjs"],
 )
 
 genrule(

packages/angular_devkit/schematics/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
-load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults2.bzl", "npm_package", "ts_project")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -10,6 +10,8 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
+npm_link_all_packages()
+
 # @angular-devkit/schematics
 
 ts_project(
@@ -25,12 +27,11 @@ ts_project(
     ],
     module_name = "@angular-devkit/schematics",
     deps = [
+        ":node_modules/@angular-devkit/core",
         "//:node_modules/@types/node",
         "//:node_modules/jsonc-parser",
         "//:node_modules/magic-string",
         "//:node_modules/rxjs",
-        "//packages/angular_devkit/core:core_rjs",
-        "//packages/angular_devkit/core/node:node_rjs",  # TODO: get rid of this for 6.0
     ],
 )
 
@@ -39,18 +40,17 @@ ts_project(
     testonly = True,
     srcs = glob(["src/**/*_spec.ts"]),
     deps = [
+        ":node_modules/@angular-devkit/core",
         ":schematics",
         "//:node_modules/@types/jasmine",
         "//:node_modules/rxjs",
-        "//packages/angular_devkit/core:core_rjs",
-        "//packages/angular_devkit/core/node:node_rjs",
         "//packages/angular_devkit/schematics/testing:testing_rjs",
     ],
 )
 
-jasmine_node_test(
+jasmine_test(
     name = "schematics_test",
-    deps = [":schematics_test_lib"],
+    data = [":schematics_test_lib_rjs"],
 )
 
 genrule(

packages/angular_devkit/schematics/package.json

@@ -13,7 +13,7 @@
     "schematics"
   ],
   "dependencies": {
-    "@angular-devkit/core": "0.0.0-PLACEHOLDER",
+    "@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
     "jsonc-parser": "3.3.1",
     "magic-string": "0.30.17",
     "ora": "5.4.1",

packages/angular_devkit/schematics/src/rules/base_spec.ts

@@ -8,12 +8,12 @@
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Path, virtualFs } from '@angular-devkit/core';
-import { HostTree, MergeStrategy, partitionApplyMerge } from '@angular-devkit/schematics';
 import { lastValueFrom, of as observableOf } from 'rxjs';
 import { Rule, SchematicContext, Source } from '../engine/interface';
-import { Tree } from '../tree/interface';
+import { HostTree } from '../tree/host-tree';
+import { MergeStrategy, Tree } from '../tree/interface';
 import { empty } from '../tree/static';
-import { apply, applyToSubtree, chain } from './base';
+import { apply, applyToSubtree, chain, partitionApplyMerge } from './base';
 import { callRule, callSource } from './call';
 import { move } from './move';
 

packages/angular_devkit/schematics/src/rules/call_spec.ts

@@ -8,10 +8,9 @@
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { MergeStrategy } from '@angular-devkit/schematics';
 import { of as observableOf } from 'rxjs';
 import { Rule, SchematicContext, Source } from '../engine/interface';
-import { Tree } from '../tree/interface';
+import { MergeStrategy, Tree } from '../tree/interface';
 import { empty } from '../tree/static';
 import {
   InvalidRuleResultException,

packages/angular_devkit/schematics/src/rules/template_spec.ts

@@ -8,8 +8,8 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 import { normalize } from '@angular-devkit/core';
-import { UnitTestTree } from '@angular-devkit/schematics/testing';
 import { of as observableOf } from 'rxjs';
+import { UnitTestTree } from '../../testing';
 import { SchematicContext } from '../engine/interface';
 import { HostTree } from '../tree/host-tree';
 import { FileEntry, MergeStrategy } from '../tree/interface';

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

@@ -7,8 +7,8 @@
  */
 
 import { normalize, virtualFs } from '@angular-devkit/core';
-import { HostSink } from '@angular-devkit/schematics';
 import { HostCreateTree, HostTree } from '../tree/host-tree';
+import { HostSink } from './host';
 
 describe('FileSystemSink', () => {
   it('works', (done) => {

packages/angular_devkit/schematics/tools/file-system-utility.ts

@@ -7,9 +7,9 @@
  */
 
 import { JsonValue } from '@angular-devkit/core';
-import { FileDoesNotExistException } from '@angular-devkit/schematics';
 import { readFileSync } from 'fs';
 import { ParseError, parse, printParseErrorCode } from 'jsonc-parser';
+import { FileDoesNotExistException } from '../src/exception/exception';
 
 export function readJsonFile(path: string): JsonValue {
   let data;

packages/angular_devkit/schematics/tools/workflow/node-workflow.ts

@@ -8,7 +8,7 @@
 
 import { Path, getSystemPath, normalize, schema, virtualFs } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { workflow } from '@angular-devkit/schematics';
+import { workflow } from '../../src';
 import { BuiltinTaskExecutor } from '../../tasks/node';
 import { FileSystemEngine } from '../description';
 import { OptionTransform } from '../file-system-engine-host-base';

packages/schematics/angular/package.json

@@ -17,8 +17,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "0.0.0-PLACEHOLDER",
-    "@angular-devkit/schematics": "0.0.0-PLACEHOLDER",
+    "@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
+    "@angular-devkit/schematics": "workspace:0.0.0-PLACEHOLDER",
     "jsonc-parser": "3.3.1"
   }
 }