Skip to content

Commit c586fe6

Browse files
mmalerbammalerba
committed
fix(material/tabs): remove tabs deps on legacy-tabs
1 parent b70c18b commit c586fe6

File tree

8 files changed

+42
-36
lines changed

8 files changed

+42
-36
lines changed

‎src/material/legacy-tabs/testing/BUILD.bazel

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

22-
ng_test_library(
23-
name = "harness_tests_lib",
24-
srcs = [
25-
"tab-group-shared.spec.ts",
26-
"tab-nav-bar-shared.spec.ts",
27-
],
28-
deps = [
29-
":testing",
30-
"//src/cdk/testing",
31-
"//src/cdk/testing/private",
32-
"//src/cdk/testing/testbed",
33-
"//src/material/legacy-tabs",
34-
"@npm//@angular/forms",
35-
"@npm//@angular/platform-browser",
36-
],
37-
)
38-
3922
ng_test_library(
4023
name = "unit_tests_lib",
4124
srcs = glob(
@@ -46,9 +29,9 @@ ng_test_library(
4629
],
4730
),
4831
deps = [
49-
":harness_tests_lib",
5032
":testing",
5133
"//src/material/legacy-tabs",
34+
"//src/material/tabs/testing:harness_tests_lib",
5235
],
5336
)
5437

‎src/material/legacy-tabs/testing/tab-group-harness.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
2-
import {runTabGroupHarnessTests} from '@angular/material/legacy-tabs/testing/tab-group-shared.spec';
2+
import {runTabGroupHarnessTests} from '@angular/material/tabs/testing/tab-group-shared.spec';
33
import {MatLegacyTabGroupHarness} from './tab-group-harness';
44

55
describe('Non-MDC-based MatTabGroupHarness', () => {
6-
runTabGroupHarnessTests(MatLegacyTabsModule, MatLegacyTabGroupHarness);
6+
runTabGroupHarnessTests(MatLegacyTabsModule, MatLegacyTabGroupHarness as any);
77
});

‎src/material/legacy-tabs/testing/tab-nav-bar-harness.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
2-
import {runTabNavBarHarnessTests} from '@angular/material/legacy-tabs/testing/tab-nav-bar-shared.spec';
2+
import {runTabNavBarHarnessTests} from '@angular/material/tabs/testing/tab-nav-bar-shared.spec';
33
import {MatLegacyTabNavBarHarness} from './tab-nav-bar-harness';
44

55
describe('Non-MDC-based MatTabNavBarHarness', () => {
6-
runTabNavBarHarnessTests(MatLegacyTabsModule, MatLegacyTabNavBarHarness);
6+
runTabNavBarHarnessTests(MatLegacyTabsModule, MatLegacyTabNavBarHarness as any);
77
});

‎src/material/tabs/testing/BUILD.bazel

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@ filegroup(
2121

2222
ng_test_library(
2323
name = "unit_tests_lib",
24-
srcs = glob(["**/*.spec.ts"]),
24+
srcs = glob(
25+
["**/*.spec.ts"],
26+
exclude = [
27+
"tab-group-shared.spec.ts",
28+
"tab-nav-bar-shared.spec.ts",
29+
],
30+
),
2531
deps = [
32+
":harness_tests_lib",
2633
":testing",
27-
"//src/material/legacy-tabs/testing:harness_tests_lib",
2834
"//src/material/tabs",
2935
],
3036
)
@@ -35,3 +41,20 @@ ng_web_test_suite(
3541
":unit_tests_lib",
3642
],
3743
)
44+
45+
ng_test_library(
46+
name = "harness_tests_lib",
47+
srcs = [
48+
"tab-group-shared.spec.ts",
49+
"tab-nav-bar-shared.spec.ts",
50+
],
51+
deps = [
52+
":testing",
53+
"//src/cdk/testing",
54+
"//src/cdk/testing/private",
55+
"//src/cdk/testing/testbed",
56+
"//src/material/tabs",
57+
"@npm//@angular/forms",
58+
"@npm//@angular/platform-browser",
59+
],
60+
)

‎src/material/tabs/testing/tab-group-harness.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {MatTabsModule} from '@angular/material/tabs';
2-
import {runTabGroupHarnessTests} from '@angular/material/legacy-tabs/testing/tab-group-shared.spec';
2+
import {runTabGroupHarnessTests} from './tab-group-shared.spec';
33
import {MatTabGroupHarness} from './tab-group-harness';
44

55
describe('MDC-based MatTabGroupHarness', () => {
6-
runTabGroupHarnessTests(MatTabsModule, MatTabGroupHarness as any);
6+
runTabGroupHarnessTests(MatTabsModule, MatTabGroupHarness);
77
});

‎src/material/legacy-tabs/testing/tab-group-shared.spec.ts renamed to ‎src/material/tabs/testing/tab-group-shared.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import {ComponentHarness, 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 {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
5+
import {MatTabsModule} from '@angular/material/tabs';
66
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
7-
import {MatLegacyTabGroupHarness} from './tab-group-harness';
7+
import {MatTabGroupHarness} from './tab-group-harness';
88

99
/** Shared tests to run on both the original and MDC-based tab-group's. */
1010
export function runTabGroupHarnessTests(
11-
tabsModule: typeof MatLegacyTabsModule,
12-
tabGroupHarness: typeof MatLegacyTabGroupHarness,
11+
tabsModule: typeof MatTabsModule,
12+
tabGroupHarness: typeof MatTabGroupHarness,
1313
) {
1414
let fixture: ComponentFixture<TabGroupHarnessTest>;
1515
let loader: HarnessLoader;

‎src/material/tabs/testing/tab-nav-bar-harness.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {MatTabsModule} from '@angular/material/tabs';
2-
import {runTabNavBarHarnessTests} from '@angular/material/legacy-tabs/testing/tab-nav-bar-shared.spec';
2+
import {runTabNavBarHarnessTests} from './tab-nav-bar-shared.spec';
33
import {MatTabNavBarHarness} from './tab-nav-bar-harness';
44

55
describe('MDC-based MatTabNavBarHarness', () => {
6-
runTabNavBarHarnessTests(MatTabsModule, MatTabNavBarHarness as any);
6+
runTabNavBarHarnessTests(MatTabsModule, MatTabNavBarHarness);
77
});

‎src/material/legacy-tabs/testing/tab-nav-bar-shared.spec.ts renamed to ‎src/material/tabs/testing/tab-nav-bar-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 {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
5+
import {MatTabsModule} from '@angular/material/tabs';
66
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
7-
import {MatLegacyTabNavBarHarness} from './tab-nav-bar-harness';
7+
import {MatTabNavBarHarness} from './tab-nav-bar-harness';
88

99
/** Shared tests to run on both the original and MDC-based tab nav bars. */
1010
export function runTabNavBarHarnessTests(
11-
tabsModule: typeof MatLegacyTabsModule,
12-
tabNavBarHarness: typeof MatLegacyTabNavBarHarness,
11+
tabsModule: typeof MatTabsModule,
12+
tabNavBarHarness: typeof MatTabNavBarHarness,
1313
) {
1414
let fixture: ComponentFixture<TabNavBarHarnessTest>;
1515
let loader: HarnessLoader;

0 commit comments

Comments
 (0)