Skip to content

Commit 921d7dc

Browse files
committed
fix lint and tests
1 parent ecc72e1 commit 921d7dc

File tree

6 files changed

+18
-15
lines changed

6 files changed

+18
-15
lines changed

src/cdk/testing/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ng_web_test_suite(
3333
],
3434
deps = [
3535
":require-config.js",
36-
"//src/cdk/testing/tests:unit_test_sources"
36+
"//src/cdk/testing/tests:unit_test_sources",
3737
],
3838
)
3939

src/cdk/testing/protractor/protractor-harness-environment.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
*/
88

99
import {HarnessEnvironment, HarnessLoader, TestElement} from '@angular/cdk/testing';
10-
import {
11-
by,
12-
element as protractorElement,
13-
ElementArrayFinder,
14-
ElementFinder,
15-
Locator
16-
} from 'protractor';
10+
import {by, element as protractorElement, ElementArrayFinder, ElementFinder} from 'protractor';
1711
import {ProtractorElement} from './protractor-element';
1812

1913
/** The default query function that respects shadow boundaries. */

src/cdk/testing/tests/test-shadow-boundary.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
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+
19
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';
210

311
@Component({

src/cdk/tsconfig-tests.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
},
2121
"include": [
2222
"**/index.ts",
23-
"**/*.spec.ts"
23+
"**/*.spec.ts",
24+
"testing/kagekiri.d.ts"
2425
],
2526
"exclude": [
2627
"testing/protractor/**.ts",

tools/public_api_guard/cdk/testing/protractor.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ export declare class ProtractorElement implements TestElement {
1818
}
1919

2020
export declare class ProtractorHarnessEnvironment extends HarnessEnvironment<ElementFinder> {
21-
protected constructor(rawRootElement: ElementFinder);
21+
protected constructor(rawRootElement: ElementFinder, _queryFn?: (selector: string, root: ElementFinder) => ElementArrayFinder);
2222
protected createEnvironment(element: ElementFinder): HarnessEnvironment<ElementFinder>;
2323
protected createTestElement(element: ElementFinder): TestElement;
2424
forceStabilize(): Promise<void>;
2525
protected getAllRawElements(selector: string): Promise<ElementFinder[]>;
2626
protected getDocumentRoot(): ElementFinder;
2727
waitForTasksOutsideAngular(): Promise<void>;
28-
static loader(): HarnessLoader;
28+
static loader(queryFn?: (selector: string, root: ElementFinder) => ElementArrayFinder): HarnessLoader;
2929
}

tools/public_api_guard/cdk/testing/testbed.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
export declare class TestbedHarnessEnvironment extends HarnessEnvironment<Element> {
2-
protected constructor(rawRootElement: Element, _fixture: ComponentFixture<unknown>);
2+
protected constructor(rawRootElement: Element, _fixture: ComponentFixture<unknown>, _queryFn?: (selector: string, root: Element) => ArrayLike<Element>);
33
protected createEnvironment(element: Element): HarnessEnvironment<Element>;
44
protected createTestElement(element: Element): TestElement;
55
forceStabilize(): Promise<void>;
66
protected getAllRawElements(selector: string): Promise<Element[]>;
77
protected getDocumentRoot(): Element;
88
waitForTasksOutsideAngular(): Promise<void>;
9-
static documentRootLoader(fixture: ComponentFixture<unknown>): HarnessLoader;
10-
static harnessForFixture<T extends ComponentHarness>(fixture: ComponentFixture<unknown>, harnessType: ComponentHarnessConstructor<T>): Promise<T>;
11-
static loader(fixture: ComponentFixture<unknown>): HarnessLoader;
9+
static documentRootLoader(fixture: ComponentFixture<unknown>, queryFn?: (selector: string, root: Element) => ArrayLike<Element>): HarnessLoader;
10+
static harnessForFixture<T extends ComponentHarness>(fixture: ComponentFixture<unknown>, harnessType: ComponentHarnessConstructor<T>, queryFn?: (selector: string, root: Element) => ArrayLike<Element>): Promise<T>;
11+
static loader(fixture: ComponentFixture<unknown>, queryFn?: (selector: string, root: Element) => ArrayLike<Element>): HarnessLoader;
1212
}
1313

1414
export declare class UnitTestElement implements TestElement {

0 commit comments

Comments
 (0)