From e0601df59d153f570e5c23442ef5b4635c4041b2 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 8 Jan 2020 01:30:07 -0800
Subject: [PATCH] build: cleanup //tools/ts-api-guardian:tests target (#34736)

PR Close #34736
---
 tools/ts-api-guardian/BUILD.bazel       |  7 ++-----
 tools/ts-api-guardian/test/bootstrap.ts | 12 ++++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel
index 7841891db7..e27f2a55cf 100644
--- a/tools/ts-api-guardian/BUILD.bazel
+++ b/tools/ts-api-guardian/BUILD.bazel
@@ -1,7 +1,7 @@
 # BEGIN-INTERNAL
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
-load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test")
 
 ts_library(
     name = "lib",
@@ -95,16 +95,13 @@ jasmine_node_test(
     srcs = [
         ":test_lib",
     ],
+    bootstrap = [":bootstrap_es5"],
     data = glob([
         "test/fixtures/*.ts",
         "test/fixtures/*.patch",
     ]) + [
-        ":bootstrap_es5",
         ":ts-api-guardian",
-        # TODO: remove this once the boostrap.js workaround has been removed.
-        ":package.json",
     ],
-    templated_args = ["--node_options=--require=$(rlocation $(location :bootstrap_es5))"],
 )
 # END-INTERNAL
 
diff --git a/tools/ts-api-guardian/test/bootstrap.ts b/tools/ts-api-guardian/test/bootstrap.ts
index 6b57f8f54c..e29dd1fbdf 100644
--- a/tools/ts-api-guardian/test/bootstrap.ts
+++ b/tools/ts-api-guardian/test/bootstrap.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as path from 'path';
+const path = require('path');
+const runfiles = require(process.env['BAZEL_NODE_RUNFILES_HELPER']);
 
-// Resolve the path to the package.json of the ts-api-guardian. We need to resolve an actual
-// path of a runfile because we want to determine the path to the directory that includes all
+// Change directories to the path of the ts-api-guardian source tree. We need to resolve an actual
+// path of a tree because we want to determine the path to the directory that includes all
 // test fixture runfiles. On Windows this is usually the original non-sandboxed disk location,
 // otherwise this just refers to the runfile directory with all the proper symlinked files.
 // TODO: remove the whole bootstrap file once the tests are Bazel and Windows compatible.
-const runfilesDirectory = path.dirname(require.resolve('../package.json'));
-
-process.chdir(runfilesDirectory);
+process.chdir(path.dirname(path.dirname(
+    path.dirname(runfiles.resolve('angular/tools/ts-api-guardian/test/fixtures/empty.ts')))));