fix(material/tooltip): remove tooltip deps on legacy-tooltip

angular · Sep 8, 2022 · 04ea76c · 04ea76c
1 parent c586fe6
commit 04ea76c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/src/material/legacy-tooltip/testing/BUILD.bazel b/src/material/legacy-tooltip/testing/BUILD.bazel
@@ -19,28 +19,16 @@ filegroup(
     srcs = glob(["**/*.ts"]),
 )
 
-ng_test_library(
-    name = "harness_tests_lib",
-    srcs = ["shared.spec.ts"],
-    deps = [
-        ":testing",
-        "//src/cdk/testing",
-        "//src/cdk/testing/testbed",
-        "//src/material/legacy-tooltip",
-        "@npm//@angular/platform-browser",
-    ],
-)
-
 ng_test_library(
     name = "unit_tests_lib",
     srcs = glob(
         ["**/*.spec.ts"],
         exclude = ["shared.spec.ts"],
     ),
     deps = [
-        ":harness_tests_lib",
         ":testing",
         "//src/material/legacy-tooltip",
+        "//src/material/tooltip/testing:harness_tests_lib",
     ],
 )
 

diff --git a/src/material/legacy-tooltip/testing/tooltip-harness.spec.ts b/src/material/legacy-tooltip/testing/tooltip-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatLegacyTooltipModule} from '@angular/material/legacy-tooltip';
-import {runHarnessTests} from '@angular/material/legacy-tooltip/testing/shared.spec';
+import {runHarnessTests} from '@angular/material/tooltip/testing/shared.spec';
 import {MatLegacyTooltipHarness} from './tooltip-harness';
 
 describe('Non-MDC-based MatTooltipHarness', () => {
-  runHarnessTests(MatLegacyTooltipModule, MatLegacyTooltipHarness);
+  runHarnessTests(MatLegacyTooltipModule, MatLegacyTooltipHarness as any);
 });
diff --git a/src/material/tooltip/testing/BUILD.bazel b/src/material/tooltip/testing/BUILD.bazel
@@ -20,10 +20,13 @@ filegroup(
 
 ng_test_library(
     name = "unit_tests_lib",
-    srcs = glob(["**/*.spec.ts"]),
+    srcs = glob(
+        ["**/*.spec.ts"],
+        exclude = ["shared.spec.ts"],
+    ),
     deps = [
+        ":harness_tests_lib",
         ":testing",
-        "//src/material/legacy-tooltip/testing:harness_tests_lib",
         "//src/material/tooltip",
     ],
 )
@@ -34,3 +37,15 @@ ng_web_test_suite(
         ":unit_tests_lib",
     ],
 )
+
+ng_test_library(
+    name = "harness_tests_lib",
+    srcs = ["shared.spec.ts"],
+    deps = [
+        ":testing",
+        "//src/cdk/testing",
+        "//src/cdk/testing/testbed",
+        "//src/material/tooltip",
+        "@npm//@angular/platform-browser",
+    ],
+)
diff --git a/...ial/legacy-tooltip/testing/shared.spec.ts → src/material/tooltip/testing/shared.spec.ts b/...ial/legacy-tooltip/testing/shared.spec.ts → src/material/tooltip/testing/shared.spec.ts
@@ -2,14 +2,14 @@ import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatLegacyTooltipModule} from '@angular/material/legacy-tooltip';
-import {MatLegacyTooltipHarness} from '@angular/material/legacy-tooltip/testing/tooltip-harness';
+import {MatTooltipModule} from '@angular/material/tooltip';
+import {MatTooltipHarness} from '@angular/material/tooltip/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 
 /** Shared tests to run on both the original and MDC-based tooltips. */
 export function runHarnessTests(
-  tooltipModule: typeof MatLegacyTooltipModule,
-  tooltipHarness: typeof MatLegacyTooltipHarness,
+  tooltipModule: typeof MatTooltipModule,
+  tooltipHarness: typeof MatTooltipHarness,
 ) {
   let fixture: ComponentFixture<TooltipHarnessTest>;
   let loader: HarnessLoader;

diff --git a/src/material/tooltip/testing/tooltip-harness.spec.ts b/src/material/tooltip/testing/tooltip-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatTooltipModule} from '@angular/material/tooltip';
-import {runHarnessTests} from '@angular/material/legacy-tooltip/testing/shared.spec';
+import {runHarnessTests} from './shared.spec';
 import {MatTooltipHarness} from './index';
 
 describe('MDC-based MatTooltipHarness', () => {
-  runHarnessTests(MatTooltipModule, MatTooltipHarness as any);
+  runHarnessTests(MatTooltipModule, MatTooltipHarness);
 });