File tree Expand file tree Collapse file tree 5 files changed +26
-23
lines changed Expand file tree Collapse file tree 5 files changed +26
-23
lines changed Original file line number Diff line number Diff line change @@ -19,28 +19,16 @@ filegroup(
19
19
srcs = glob (["**/*.ts" ]),
20
20
)
21
21
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
-
34
22
ng_test_library (
35
23
name = "unit_tests_lib" ,
36
24
srcs = glob (
37
25
["**/*.spec.ts" ],
38
26
exclude = ["shared.spec.ts" ],
39
27
),
40
28
deps = [
41
- ":harness_tests_lib" ,
42
29
":testing" ,
43
30
"//src/material/legacy-tooltip" ,
31
+ "//src/material/tooltip/testing:harness_tests_lib" ,
44
32
],
45
33
)
46
34
Original file line number Diff line number Diff line change 1
1
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' ;
3
3
import { MatLegacyTooltipHarness } from './tooltip-harness' ;
4
4
5
5
describe ( 'Non-MDC-based MatTooltipHarness' , ( ) => {
6
- runHarnessTests ( MatLegacyTooltipModule , MatLegacyTooltipHarness ) ;
6
+ runHarnessTests ( MatLegacyTooltipModule , MatLegacyTooltipHarness as any ) ;
7
7
} ) ;
Original file line number Diff line number Diff line change @@ -20,10 +20,13 @@ filegroup(
20
20
21
21
ng_test_library (
22
22
name = "unit_tests_lib" ,
23
- srcs = glob (["**/*.spec.ts" ]),
23
+ srcs = glob (
24
+ ["**/*.spec.ts" ],
25
+ exclude = ["shared.spec.ts" ],
26
+ ),
24
27
deps = [
28
+ ":harness_tests_lib" ,
25
29
":testing" ,
26
- "//src/material/legacy-tooltip/testing:harness_tests_lib" ,
27
30
"//src/material/tooltip" ,
28
31
],
29
32
)
@@ -34,3 +37,15 @@ ng_web_test_suite(
34
37
":unit_tests_lib" ,
35
38
],
36
39
)
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
+ )
Original file line number Diff line number Diff line change @@ -2,14 +2,14 @@ import {HarnessLoader} from '@angular/cdk/testing';
2
2
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed' ;
3
3
import { Component } from '@angular/core' ;
4
4
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' ;
7
7
import { NoopAnimationsModule } from '@angular/platform-browser/animations' ;
8
8
9
9
/** Shared tests to run on both the original and MDC-based tooltips. */
10
10
export function runHarnessTests (
11
- tooltipModule : typeof MatLegacyTooltipModule ,
12
- tooltipHarness : typeof MatLegacyTooltipHarness ,
11
+ tooltipModule : typeof MatTooltipModule ,
12
+ tooltipHarness : typeof MatTooltipHarness ,
13
13
) {
14
14
let fixture : ComponentFixture < TooltipHarnessTest > ;
15
15
let loader : HarnessLoader ;
Original file line number Diff line number Diff line change 1
1
import { MatTooltipModule } from '@angular/material/tooltip' ;
2
- import { runHarnessTests } from '@angular/material/legacy-tooltip/testing /shared.spec' ;
2
+ import { runHarnessTests } from '. /shared.spec' ;
3
3
import { MatTooltipHarness } from './index' ;
4
4
5
5
describe ( 'MDC-based MatTooltipHarness' , ( ) => {
6
- runHarnessTests ( MatTooltipModule , MatTooltipHarness as any ) ;
6
+ runHarnessTests ( MatTooltipModule , MatTooltipHarness ) ;
7
7
} ) ;
You can’t perform that action at this time.
0 commit comments