Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions src/material-experimental/mdc-slide-toggle/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])

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

ng_module(
name = "mdc-slide-toggle",
Expand All @@ -28,18 +28,6 @@ ng_module(
],
)

ts_library(
name = "harness",
srcs = glob(
["harness/**/*.ts"],
exclude = ["**/*.spec.ts"],
),
deps = [
"//src/cdk/coercion",
"//src/cdk/testing",
],
)

sass_library(
name = "mdc_slide_toggle_scss_lib",
srcs = glob(["**/_*.scss"]),
Expand Down Expand Up @@ -68,11 +56,9 @@ ng_test_library(
exclude = ["**/*.e2e.spec.ts"],
),
deps = [
":harness",
":mdc-slide-toggle",
"//src/cdk/bidi",
"//src/cdk/testing",
"//src/cdk/testing/testbed",
"//src/material/slide-toggle",
"@npm//@angular/forms",
"@npm//@angular/platform-browser",
Expand Down
1 change: 0 additions & 1 deletion src/material-experimental/mdc-slider/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ ng_web_test_suite(
deps = [
":slider_tests_lib",
"//src/material-experimental:mdc_require_config.js",
"//src/material-experimental/mdc-slider/harness:tests_lib",
],
)

Expand Down
26 changes: 0 additions & 26 deletions src/material-experimental/mdc-slider/harness/BUILD.bazel

This file was deleted.

47 changes: 47 additions & 0 deletions src/material/slider/testing/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package(default_visibility = ["//visibility:public"])

load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")

ng_module(
name = "testing",
srcs = glob(
["**/*.ts"],
exclude = ["**/*.spec.ts"],
),
module_name = "@angular/material/slider/testing",
deps = [
"//src/cdk/coercion",
"//src/cdk/testing",
],
)

ng_test_library(
name = "harness_tests_lib",
srcs = ["shared.spec.ts"],
deps = [
":testing",
"//src/cdk/testing",
"//src/cdk/testing/testbed",
"//src/material/slider",
"@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/slider",
],
)

ng_web_test_suite(
name = "unit_tests",
deps = [":unit_tests_lib"],
)
9 changes: 9 additions & 0 deletions src/material/slider/testing/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

export * from './public-api';
10 changes: 10 additions & 0 deletions src/material/slider/testing/public-api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

export * from './slider-harness';
export * from './slider-harness-filters';
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,28 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
import {Component} from '@angular/core';
import {ComponentFixture, TestBed} from '@angular/core/testing';
import {MatSliderModule} from '@angular/material/slider';
import {MatSliderHarness} from './slider-harness';

let fixture: ComponentFixture<SliderHarnessTest>;
let loader: HarnessLoader;
let sliderHarness: typeof MatSliderHarness;

describe('MatSliderHarness', () => {
describe('non-MDC-based', () => {
beforeEach(async () => {
await TestBed
.configureTestingModule({
imports: [MatSliderModule],
declarations: [SliderHarnessTest],
})
.compileComponents();

fixture = TestBed.createComponent(SliderHarnessTest);
fixture.detectChanges();
loader = TestbedHarnessEnvironment.loader(fixture);
sliderHarness = MatSliderHarness;
});

runTests();
});

describe(
'MDC-based',
() => {
// TODO: run tests for MDC based slider once implemented.
});
});
import {MatSliderHarness} from '@angular/material/slider/testing/slider-harness';

/** Shared tests to run on both the original and MDC-based sliders. */
function runTests() {
export function runHarnessTests(
sliderModule: typeof MatSliderModule,
sliderHarness: typeof MatSliderHarness) {
let fixture: ComponentFixture<SliderHarnessTest>;
let loader: HarnessLoader;

beforeEach(async () => {
await TestBed
.configureTestingModule({
imports: [sliderModule],
declarations: [SliderHarnessTest],
})
.compileComponents();

fixture = TestBed.createComponent(SliderHarnessTest);
fixture.detectChanges();
loader = TestbedHarnessEnvironment.loader(fixture);
});

it('should load all slider harnesses', async () => {
const sliders = await loader.getAllHarnesses(sliderHarness);
expect(sliders.length).toBe(3);
Expand Down
7 changes: 7 additions & 0 deletions src/material/slider/testing/slider-harness.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import {MatSliderModule} from '@angular/material/slider';
import {runHarnessTests} from '@angular/material/slider/testing/shared.spec';
import {MatSliderHarness} from './slider-harness';

describe('Non-MDC-based MatSliderHarness', () => {
runHarnessTests(MatSliderModule, MatSliderHarness);
});
2 changes: 2 additions & 0 deletions test/karma-system-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ System.config({
'@angular/material/slide-toggle/testing': 'dist/packages/material/slide-toggle/testing/index.js',
'@angular/material/slide-toggle/testing/shared.spec': 'dist/packages/material/slide-toggle/testing/shared.spec.js',
'@angular/material/slider': 'dist/packages/material/slider/index.js',
'@angular/material/slider/testing': 'dist/packages/material/slider/testing/index.js',
'@angular/material/slider/testing/shared.spec': 'dist/packages/material/slider/testing/shared.spec.js',
'@angular/material/snack-bar': 'dist/packages/material/snack-bar/index.js',
'@angular/material/sort': 'dist/packages/material/sort/index.js',
'@angular/material/stepper': 'dist/packages/material/stepper/index.js',
Expand Down