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

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

Hide file tree

Showing 8 changed files with 42 additions and 36 deletions.
diff --git a/src/material/legacy-tabs/testing/BUILD.bazel b/src/material/legacy-tabs/testing/BUILD.bazel
@@ -19,23 +19,6 @@ filegroup(
     srcs = glob(["**/*.ts"]),
 )
 
-ng_test_library(
-    name = "harness_tests_lib",
-    srcs = [
-        "tab-group-shared.spec.ts",
-        "tab-nav-bar-shared.spec.ts",
-    ],
-    deps = [
-        ":testing",
-        "//src/cdk/testing",
-        "//src/cdk/testing/private",
-        "//src/cdk/testing/testbed",
-        "//src/material/legacy-tabs",
-        "@npm//@angular/forms",
-        "@npm//@angular/platform-browser",
-    ],
-)
-
 ng_test_library(
     name = "unit_tests_lib",
     srcs = glob(
@@ -46,9 +29,9 @@ ng_test_library(
         ],
     ),
     deps = [
-        ":harness_tests_lib",
         ":testing",
         "//src/material/legacy-tabs",
+        "//src/material/tabs/testing:harness_tests_lib",
     ],
 )
 

diff --git a/src/material/legacy-tabs/testing/tab-group-harness.spec.ts b/src/material/legacy-tabs/testing/tab-group-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
-import {runTabGroupHarnessTests} from '@angular/material/legacy-tabs/testing/tab-group-shared.spec';
+import {runTabGroupHarnessTests} from '@angular/material/tabs/testing/tab-group-shared.spec';
 import {MatLegacyTabGroupHarness} from './tab-group-harness';
 
 describe('Non-MDC-based MatTabGroupHarness', () => {
-  runTabGroupHarnessTests(MatLegacyTabsModule, MatLegacyTabGroupHarness);
+  runTabGroupHarnessTests(MatLegacyTabsModule, MatLegacyTabGroupHarness as any);
 });
diff --git a/src/material/legacy-tabs/testing/tab-nav-bar-harness.spec.ts b/src/material/legacy-tabs/testing/tab-nav-bar-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
-import {runTabNavBarHarnessTests} from '@angular/material/legacy-tabs/testing/tab-nav-bar-shared.spec';
+import {runTabNavBarHarnessTests} from '@angular/material/tabs/testing/tab-nav-bar-shared.spec';
 import {MatLegacyTabNavBarHarness} from './tab-nav-bar-harness';
 
 describe('Non-MDC-based MatTabNavBarHarness', () => {
-  runTabNavBarHarnessTests(MatLegacyTabsModule, MatLegacyTabNavBarHarness);
+  runTabNavBarHarnessTests(MatLegacyTabsModule, MatLegacyTabNavBarHarness as any);
 });
diff --git a/src/material/tabs/testing/BUILD.bazel b/src/material/tabs/testing/BUILD.bazel
@@ -21,10 +21,16 @@ filegroup(
 
 ng_test_library(
     name = "unit_tests_lib",
-    srcs = glob(["**/*.spec.ts"]),
+    srcs = glob(
+        ["**/*.spec.ts"],
+        exclude = [
+            "tab-group-shared.spec.ts",
+            "tab-nav-bar-shared.spec.ts",
+        ],
+    ),
     deps = [
+        ":harness_tests_lib",
         ":testing",
-        "//src/material/legacy-tabs/testing:harness_tests_lib",
         "//src/material/tabs",
     ],
 )
@@ -35,3 +41,20 @@ ng_web_test_suite(
         ":unit_tests_lib",
     ],
 )
+
+ng_test_library(
+    name = "harness_tests_lib",
+    srcs = [
+        "tab-group-shared.spec.ts",
+        "tab-nav-bar-shared.spec.ts",
+    ],
+    deps = [
+        ":testing",
+        "//src/cdk/testing",
+        "//src/cdk/testing/private",
+        "//src/cdk/testing/testbed",
+        "//src/material/tabs",
+        "@npm//@angular/forms",
+        "@npm//@angular/platform-browser",
+    ],
+)
diff --git a/src/material/tabs/testing/tab-group-harness.spec.ts b/src/material/tabs/testing/tab-group-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatTabsModule} from '@angular/material/tabs';
-import {runTabGroupHarnessTests} from '@angular/material/legacy-tabs/testing/tab-group-shared.spec';
+import {runTabGroupHarnessTests} from './tab-group-shared.spec';
 import {MatTabGroupHarness} from './tab-group-harness';
 
 describe('MDC-based MatTabGroupHarness', () => {
-  runTabGroupHarnessTests(MatTabsModule, MatTabGroupHarness as any);
+  runTabGroupHarnessTests(MatTabsModule, MatTabGroupHarness);
 });
diff --git a/...acy-tabs/testing/tab-group-shared.spec.ts → ...ial/tabs/testing/tab-group-shared.spec.ts b/...acy-tabs/testing/tab-group-shared.spec.ts → ...ial/tabs/testing/tab-group-shared.spec.ts
@@ -2,14 +2,14 @@ import {ComponentHarness, 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 {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
+import {MatTabsModule} from '@angular/material/tabs';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MatLegacyTabGroupHarness} from './tab-group-harness';
+import {MatTabGroupHarness} from './tab-group-harness';
 
 /** Shared tests to run on both the original and MDC-based tab-group's. */
 export function runTabGroupHarnessTests(
-  tabsModule: typeof MatLegacyTabsModule,
-  tabGroupHarness: typeof MatLegacyTabGroupHarness,
+  tabsModule: typeof MatTabsModule,
+  tabGroupHarness: typeof MatTabGroupHarness,
 ) {
   let fixture: ComponentFixture<TabGroupHarnessTest>;
   let loader: HarnessLoader;

diff --git a/src/material/tabs/testing/tab-nav-bar-harness.spec.ts b/src/material/tabs/testing/tab-nav-bar-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatTabsModule} from '@angular/material/tabs';
-import {runTabNavBarHarnessTests} from '@angular/material/legacy-tabs/testing/tab-nav-bar-shared.spec';
+import {runTabNavBarHarnessTests} from './tab-nav-bar-shared.spec';
 import {MatTabNavBarHarness} from './tab-nav-bar-harness';
 
 describe('MDC-based MatTabNavBarHarness', () => {
-  runTabNavBarHarnessTests(MatTabsModule, MatTabNavBarHarness as any);
+  runTabNavBarHarnessTests(MatTabsModule, MatTabNavBarHarness);
 });
diff --git a/...y-tabs/testing/tab-nav-bar-shared.spec.ts → ...l/tabs/testing/tab-nav-bar-shared.spec.ts b/...y-tabs/testing/tab-nav-bar-shared.spec.ts → ...l/tabs/testing/tab-nav-bar-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 {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
+import {MatTabsModule} from '@angular/material/tabs';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MatLegacyTabNavBarHarness} from './tab-nav-bar-harness';
+import {MatTabNavBarHarness} from './tab-nav-bar-harness';
 
 /** Shared tests to run on both the original and MDC-based tab nav bars. */
 export function runTabNavBarHarnessTests(
-  tabsModule: typeof MatLegacyTabsModule,
-  tabNavBarHarness: typeof MatLegacyTabNavBarHarness,
+  tabsModule: typeof MatTabsModule,
+  tabNavBarHarness: typeof MatTabNavBarHarness,
 ) {
   let fixture: ComponentFixture<TabNavBarHarnessTest>;
   let loader: HarnessLoader;