Skip to content

Commit 04ea76c

Browse files
committed
fix(material/tooltip): remove tooltip deps on legacy-tooltip
1 parent c586fe6 commit 04ea76c

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

src/material/legacy-tooltip/testing/BUILD.bazel

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,16 @@ filegroup(
1919
srcs = glob(["**/*.ts"]),
2020
)
2121

22-
ng_test_library(
23-
name = "harness_tests_lib",
24-
srcs = ["shared.spec.ts"],
25-
deps = [
26-
":testing",
27-
"//src/cdk/testing",
28-
"//src/cdk/testing/testbed",
29-
"//src/material/legacy-tooltip",
30-
"@npm//@angular/platform-browser",
31-
],
32-
)
33-
3422
ng_test_library(
3523
name = "unit_tests_lib",
3624
srcs = glob(
3725
["**/*.spec.ts"],
3826
exclude = ["shared.spec.ts"],
3927
),
4028
deps = [
41-
":harness_tests_lib",
4229
":testing",
4330
"//src/material/legacy-tooltip",
31+
"//src/material/tooltip/testing:harness_tests_lib",
4432
],
4533
)
4634

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {MatLegacyTooltipModule} from '@angular/material/legacy-tooltip';
2-
import {runHarnessTests} from '@angular/material/legacy-tooltip/testing/shared.spec';
2+
import {runHarnessTests} from '@angular/material/tooltip/testing/shared.spec';
33
import {MatLegacyTooltipHarness} from './tooltip-harness';
44

55
describe('Non-MDC-based MatTooltipHarness', () => {
6-
runHarnessTests(MatLegacyTooltipModule, MatLegacyTooltipHarness);
6+
runHarnessTests(MatLegacyTooltipModule, MatLegacyTooltipHarness as any);
77
});

src/material/tooltip/testing/BUILD.bazel

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ filegroup(
2020

2121
ng_test_library(
2222
name = "unit_tests_lib",
23-
srcs = glob(["**/*.spec.ts"]),
23+
srcs = glob(
24+
["**/*.spec.ts"],
25+
exclude = ["shared.spec.ts"],
26+
),
2427
deps = [
28+
":harness_tests_lib",
2529
":testing",
26-
"//src/material/legacy-tooltip/testing:harness_tests_lib",
2730
"//src/material/tooltip",
2831
],
2932
)
@@ -34,3 +37,15 @@ ng_web_test_suite(
3437
":unit_tests_lib",
3538
],
3639
)
40+
41+
ng_test_library(
42+
name = "harness_tests_lib",
43+
srcs = ["shared.spec.ts"],
44+
deps = [
45+
":testing",
46+
"//src/cdk/testing",
47+
"//src/cdk/testing/testbed",
48+
"//src/material/tooltip",
49+
"@npm//@angular/platform-browser",
50+
],
51+
)

src/material/legacy-tooltip/testing/shared.spec.ts renamed to src/material/tooltip/testing/shared.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import {HarnessLoader} from '@angular/cdk/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {Component} from '@angular/core';
44
import {ComponentFixture, TestBed} from '@angular/core/testing';
5-
import {MatLegacyTooltipModule} from '@angular/material/legacy-tooltip';
6-
import {MatLegacyTooltipHarness} from '@angular/material/legacy-tooltip/testing/tooltip-harness';
5+
import {MatTooltipModule} from '@angular/material/tooltip';
6+
import {MatTooltipHarness} from '@angular/material/tooltip/testing';
77
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
88

99
/** Shared tests to run on both the original and MDC-based tooltips. */
1010
export function runHarnessTests(
11-
tooltipModule: typeof MatLegacyTooltipModule,
12-
tooltipHarness: typeof MatLegacyTooltipHarness,
11+
tooltipModule: typeof MatTooltipModule,
12+
tooltipHarness: typeof MatTooltipHarness,
1313
) {
1414
let fixture: ComponentFixture<TooltipHarnessTest>;
1515
let loader: HarnessLoader;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {MatTooltipModule} from '@angular/material/tooltip';
2-
import {runHarnessTests} from '@angular/material/legacy-tooltip/testing/shared.spec';
2+
import {runHarnessTests} from './shared.spec';
33
import {MatTooltipHarness} from './index';
44

55
describe('MDC-based MatTooltipHarness', () => {
6-
runHarnessTests(MatTooltipModule, MatTooltipHarness as any);
6+
runHarnessTests(MatTooltipModule, MatTooltipHarness);
77
});

0 commit comments

Comments
 (0)