Skip to content

Commit a3e6b58

Browse files
committed
fix(material/slide-toggle): remove slide-toggle deps on legacy-slide-toggle
1 parent 5e34770 commit a3e6b58

File tree

5 files changed

+27
-24
lines changed

5 files changed

+27
-24
lines changed

src/material/legacy-slide-toggle/testing/BUILD.bazel

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

23-
ng_test_library(
24-
name = "harness_tests_lib",
25-
srcs = ["shared.spec.ts"],
26-
deps = [
27-
":testing",
28-
"//src/cdk/testing",
29-
"//src/cdk/testing/testbed",
30-
"//src/material/legacy-slide-toggle",
31-
"@npm//@angular/forms",
32-
"@npm//@angular/platform-browser",
33-
],
34-
)
35-
3623
ng_test_library(
3724
name = "unit_tests_lib",
3825
srcs = glob(
3926
["**/*.spec.ts"],
4027
exclude = ["shared.spec.ts"],
4128
),
4229
deps = [
43-
":harness_tests_lib",
4430
":testing",
4531
"//src/material/legacy-slide-toggle",
32+
"//src/material/slide-toggle/testing:harness_tests_lib",
4633
],
4734
)
4835

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

55
describe('Non-MDC-based MatSlideToggleHarness', () => {
6-
runHarnessTests(MatLegacySlideToggleModule, MatLegacySlideToggleHarness);
6+
runHarnessTests(MatLegacySlideToggleModule, MatLegacySlideToggleHarness as any);
77
});

src/material/slide-toggle/testing/BUILD.bazel

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ ts_library(
2121

2222
ng_test_library(
2323
name = "unit_tests_lib",
24-
srcs = glob(["**/*.spec.ts"]),
24+
srcs = glob(
25+
["**/*.spec.ts"],
26+
exclude = ["shared.spec.ts"],
27+
),
2528
deps = [
29+
":harness_tests_lib",
2630
":testing",
27-
"//src/material/legacy-slide-toggle/testing:harness_tests_lib",
2831
"//src/material/slide-toggle",
2932
],
3033
)
@@ -35,3 +38,16 @@ ng_web_test_suite(
3538
":unit_tests_lib",
3639
],
3740
)
41+
42+
ng_test_library(
43+
name = "harness_tests_lib",
44+
srcs = ["shared.spec.ts"],
45+
deps = [
46+
":testing",
47+
"//src/cdk/testing",
48+
"//src/cdk/testing/testbed",
49+
"//src/material/slide-toggle",
50+
"@npm//@angular/forms",
51+
"@npm//@angular/platform-browser",
52+
],
53+
)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {Component} from '@angular/core';
44
import {ComponentFixture, TestBed} from '@angular/core/testing';
55
import {FormControl, ReactiveFormsModule} from '@angular/forms';
6-
import {MatLegacySlideToggleModule} from '@angular/material/legacy-slide-toggle';
7-
import {MatLegacySlideToggleHarness} from '@angular/material/legacy-slide-toggle/testing/slide-toggle-harness';
6+
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
7+
import {MatSlideToggleHarness} from '@angular/material/slide-toggle/testing';
88

99
/** Shared tests to run on both the original and MDC-based slide-toggles. */
1010
export function runHarnessTests(
11-
slideToggleModule: typeof MatLegacySlideToggleModule,
12-
slideToggleHarness: typeof MatLegacySlideToggleHarness,
11+
slideToggleModule: typeof MatSlideToggleModule,
12+
slideToggleHarness: typeof MatSlideToggleHarness,
1313
) {
1414
let fixture: ComponentFixture<SlideToggleHarnessTest>;
1515
let loader: HarnessLoader;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {runHarnessTests} from '@angular/material/legacy-slide-toggle/testing/shared.spec';
1+
import {runHarnessTests} from './shared.spec';
22
import {MatSlideToggleModule} from '../index';
33
import {MatSlideToggleHarness} from './slide-toggle-harness';
44

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

0 commit comments

Comments
 (0)