Skip to content

Commit 8229353

Browse files
mmalerbajelbourn
authored andcommitted
feat(slider): move harness out of experimental (#17136)
1 parent 9d6f4c2 commit 8229353

File tree

11 files changed

+96
-74
lines changed

11 files changed

+96
-74
lines changed

src/material-experimental/mdc-slide-toggle/BUILD.bazel

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
22

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library")
44
load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
5-
load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library")
5+
load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite")
66

77
ng_module(
88
name = "mdc-slide-toggle",
@@ -28,18 +28,6 @@ ng_module(
2828
],
2929
)
3030

31-
ts_library(
32-
name = "harness",
33-
srcs = glob(
34-
["harness/**/*.ts"],
35-
exclude = ["**/*.spec.ts"],
36-
),
37-
deps = [
38-
"//src/cdk/coercion",
39-
"//src/cdk/testing",
40-
],
41-
)
42-
4331
sass_library(
4432
name = "mdc_slide_toggle_scss_lib",
4533
srcs = glob(["**/_*.scss"]),
@@ -68,11 +56,9 @@ ng_test_library(
6856
exclude = ["**/*.e2e.spec.ts"],
6957
),
7058
deps = [
71-
":harness",
7259
":mdc-slide-toggle",
7360
"//src/cdk/bidi",
7461
"//src/cdk/testing",
75-
"//src/cdk/testing/testbed",
7662
"//src/material/slide-toggle",
7763
"@npm//@angular/forms",
7864
"@npm//@angular/platform-browser",

src/material-experimental/mdc-slider/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ ng_web_test_suite(
6969
deps = [
7070
":slider_tests_lib",
7171
"//src/material-experimental:mdc_require_config.js",
72-
"//src/material-experimental/mdc-slider/harness:tests_lib",
7372
],
7473
)
7574

src/material-experimental/mdc-slider/harness/BUILD.bazel

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
4+
5+
ng_module(
6+
name = "testing",
7+
srcs = glob(
8+
["**/*.ts"],
9+
exclude = ["**/*.spec.ts"],
10+
),
11+
module_name = "@angular/material/slider/testing",
12+
deps = [
13+
"//src/cdk/coercion",
14+
"//src/cdk/testing",
15+
],
16+
)
17+
18+
ng_test_library(
19+
name = "harness_tests_lib",
20+
srcs = ["shared.spec.ts"],
21+
deps = [
22+
":testing",
23+
"//src/cdk/testing",
24+
"//src/cdk/testing/testbed",
25+
"//src/material/slider",
26+
"@npm//@angular/forms",
27+
"@npm//@angular/platform-browser",
28+
],
29+
)
30+
31+
ng_test_library(
32+
name = "unit_tests_lib",
33+
srcs = glob(
34+
["**/*.spec.ts"],
35+
exclude = ["shared.spec.ts"],
36+
),
37+
deps = [
38+
":harness_tests_lib",
39+
":testing",
40+
"//src/material/slider",
41+
],
42+
)
43+
44+
ng_web_test_suite(
45+
name = "unit_tests",
46+
deps = [":unit_tests_lib"],
47+
)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
export * from './public-api';
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
export * from './slider-harness';
10+
export * from './slider-harness-filters';
Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,28 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {Component} from '@angular/core';
44
import {ComponentFixture, TestBed} from '@angular/core/testing';
55
import {MatSliderModule} from '@angular/material/slider';
6-
import {MatSliderHarness} from './slider-harness';
7-
8-
let fixture: ComponentFixture<SliderHarnessTest>;
9-
let loader: HarnessLoader;
10-
let sliderHarness: typeof MatSliderHarness;
11-
12-
describe('MatSliderHarness', () => {
13-
describe('non-MDC-based', () => {
14-
beforeEach(async () => {
15-
await TestBed
16-
.configureTestingModule({
17-
imports: [MatSliderModule],
18-
declarations: [SliderHarnessTest],
19-
})
20-
.compileComponents();
21-
22-
fixture = TestBed.createComponent(SliderHarnessTest);
23-
fixture.detectChanges();
24-
loader = TestbedHarnessEnvironment.loader(fixture);
25-
sliderHarness = MatSliderHarness;
26-
});
27-
28-
runTests();
29-
});
30-
31-
describe(
32-
'MDC-based',
33-
() => {
34-
// TODO: run tests for MDC based slider once implemented.
35-
});
36-
});
6+
import {MatSliderHarness} from '@angular/material/slider/testing/slider-harness';
377

388
/** Shared tests to run on both the original and MDC-based sliders. */
39-
function runTests() {
9+
export function runHarnessTests(
10+
sliderModule: typeof MatSliderModule,
11+
sliderHarness: typeof MatSliderHarness) {
12+
let fixture: ComponentFixture<SliderHarnessTest>;
13+
let loader: HarnessLoader;
14+
15+
beforeEach(async () => {
16+
await TestBed
17+
.configureTestingModule({
18+
imports: [sliderModule],
19+
declarations: [SliderHarnessTest],
20+
})
21+
.compileComponents();
22+
23+
fixture = TestBed.createComponent(SliderHarnessTest);
24+
fixture.detectChanges();
25+
loader = TestbedHarnessEnvironment.loader(fixture);
26+
});
27+
4028
it('should load all slider harnesses', async () => {
4129
const sliders = await loader.getAllHarnesses(sliderHarness);
4230
expect(sliders.length).toBe(3);
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import {MatSliderModule} from '@angular/material/slider';
2+
import {runHarnessTests} from '@angular/material/slider/testing/shared.spec';
3+
import {MatSliderHarness} from './slider-harness';
4+
5+
describe('Non-MDC-based MatSliderHarness', () => {
6+
runHarnessTests(MatSliderModule, MatSliderHarness);
7+
});

0 commit comments

Comments
 (0)