fix(material/slide-toggle): remove slide-toggle deps on legacy-slide-…

…toggle
angular · Sep 8, 2022 · a3e6b58 · a3e6b58
1 parent 5e34770
commit a3e6b58
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/src/material/legacy-slide-toggle/testing/BUILD.bazel b/src/material/legacy-slide-toggle/testing/BUILD.bazel
@@ -20,29 +20,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-slide-toggle",
-        "@npm//@angular/forms",
-        "@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-slide-toggle",
+        "//src/material/slide-toggle/testing:harness_tests_lib",
     ],
 )
 

diff --git a/src/material/legacy-slide-toggle/testing/slide-toggle-harness.spec.ts b/src/material/legacy-slide-toggle/testing/slide-toggle-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatLegacySlideToggleModule} from '@angular/material/legacy-slide-toggle';
-import {runHarnessTests} from '@angular/material/legacy-slide-toggle/testing/shared.spec';
+import {runHarnessTests} from '@angular/material/slide-toggle/testing/shared.spec';
 import {MatLegacySlideToggleHarness} from './slide-toggle-harness';
 
 describe('Non-MDC-based MatSlideToggleHarness', () => {
-  runHarnessTests(MatLegacySlideToggleModule, MatLegacySlideToggleHarness);
+  runHarnessTests(MatLegacySlideToggleModule, MatLegacySlideToggleHarness as any);
 });
diff --git a/src/material/slide-toggle/testing/BUILD.bazel b/src/material/slide-toggle/testing/BUILD.bazel
@@ -21,10 +21,13 @@ ts_library(
 
 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-slide-toggle/testing:harness_tests_lib",
         "//src/material/slide-toggle",
     ],
 )
@@ -35,3 +38,16 @@ 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/slide-toggle",
+        "@npm//@angular/forms",
+        "@npm//@angular/platform-browser",
+    ],
+)
diff --git a/...egacy-slide-toggle/testing/shared.spec.ts → ...erial/slide-toggle/testing/shared.spec.ts b/...egacy-slide-toggle/testing/shared.spec.ts → ...erial/slide-toggle/testing/shared.spec.ts
@@ -3,13 +3,13 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {FormControl, ReactiveFormsModule} from '@angular/forms';
-import {MatLegacySlideToggleModule} from '@angular/material/legacy-slide-toggle';
-import {MatLegacySlideToggleHarness} from '@angular/material/legacy-slide-toggle/testing/slide-toggle-harness';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
+import {MatSlideToggleHarness} from '@angular/material/slide-toggle/testing';
 
 /** Shared tests to run on both the original and MDC-based slide-toggles. */
 export function runHarnessTests(
-  slideToggleModule: typeof MatLegacySlideToggleModule,
-  slideToggleHarness: typeof MatLegacySlideToggleHarness,
+  slideToggleModule: typeof MatSlideToggleModule,
+  slideToggleHarness: typeof MatSlideToggleHarness,
 ) {
   let fixture: ComponentFixture<SlideToggleHarnessTest>;
   let loader: HarnessLoader;

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