';
+
+ try {
+ await fn();
+ } catch (e) {
+ error = (e as Error).message;
+ }
+
+ if (typeof expectedError === 'string') {
+ expect(error).toContain(expectedError);
+ } else {
+ expect(error).toMatch(expectedError);
+ }
+}
diff --git a/src/cdk/testing/tests/protractor.e2e.spec.ts b/src/cdk/testing/tests/protractor.e2e.spec.ts
index 49eaba3127d6..c4714f142759 100644
--- a/src/cdk/testing/tests/protractor.e2e.spec.ts
+++ b/src/cdk/testing/tests/protractor.e2e.spec.ts
@@ -2,7 +2,7 @@ import {HarnessLoader} from '../../testing';
import {ProtractorHarnessEnvironment} from '../../testing/protractor';
import {browser, by, element as protractorElement, ElementFinder} from 'protractor';
import {parallel} from '../change-detection';
-import {crossEnvironmentSpecs} from './cross-environment.spec';
+import {crossEnvironmentSpecs} from './cross-environment-tests';
import {MainComponentHarness} from './harnesses/main-component-harness';
// Kagekiri is available globally in the browser. We declare it here so we can use it in the
diff --git a/src/cdk/testing/tests/test-main-component.html b/src/cdk/testing/tests/test-main-component.html
index 263f6d235b5c..f7f87200aa36 100644
--- a/src/cdk/testing/tests/test-main-component.html
+++ b/src/cdk/testing/tests/test-main-component.html
@@ -1,15 +1,20 @@
-
-
+
{{clickResult.x}}-{{clickResult.y}}
-
+
{{modifiers}}
Main Component
-Hello {{username}} from Angular 2!
+Hello {{username}} from Angular!
-
+
{{counter}}
@@ -17,7 +22,7 @@
Main Component
@@ -69,16 +85,13 @@
Main Component
Has comma inside attribute
-
+
@if (_shadowDomSupported) {
}
-
Main Component
(mouseleave)="isHovering = false"
(mouseover)="isPointerOver = true"
(mouseout)="isPointerOver = false"
- style="width: 50px; height: 50px; background: hotpink;">
+ style="width: 50px; height: 50px; background: hotpink;"
+>
Hello
diff --git a/src/cdk/testing/tests/test-sub-component.ts b/src/cdk/testing/tests/test-sub-component.ts
index 4adbdfb2f711..acf34ee9166d 100644
--- a/src/cdk/testing/tests/test-sub-component.ts
+++ b/src/cdk/testing/tests/test-sub-component.ts
@@ -21,6 +21,6 @@ import {ChangeDetectionStrategy, Component, Input, ViewEncapsulation} from '@ang
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class TestSubComponent {
- @Input() title: string;
- @Input() items: string[];
+ @Input() title = '';
+ @Input() items: string[] = [];
}
diff --git a/src/cdk/testing/tests/testbed.spec.ts b/src/cdk/testing/tests/testbed.spec.ts
index 3c60a45db041..7eadcfb07f06 100644
--- a/src/cdk/testing/tests/testbed.spec.ts
+++ b/src/cdk/testing/tests/testbed.spec.ts
@@ -4,7 +4,7 @@ import {TestbedHarnessEnvironment} from '../../testing/testbed';
import {waitForAsync, ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
import {provideZoneChangeDetection} from '@angular/core';
import {querySelectorAll as piercingQuerySelectorAll} from 'kagekiri';
-import {crossEnvironmentSpecs} from './cross-environment.spec';
+import {crossEnvironmentSpecs} from './cross-environment-tests';
import {FakeOverlayHarness} from './harnesses/fake-overlay-harness';
import {MainComponentHarness} from './harnesses/main-component-harness';
import {TestMainComponent} from './test-main-component';
@@ -63,7 +63,7 @@ describe('TestbedHarnessEnvironment', () => {
expect(subcomponents[0]).not.toBeNull();
const globalEl = await subcomponents[0]!.globalElement();
expect(globalEl).not.toBeNull();
- expect(await globalEl.text()).toBe('Hello Yi from Angular 2!');
+ expect(await globalEl.text()).toBe('Hello Yi from Angular!');
});
it('should be able to wait for tasks outside of Angular within native async/await', async () => {
diff --git a/src/cdk/testing/tests/webdriver.e2e.spec.ts b/src/cdk/testing/tests/webdriver.e2e.spec.ts
index b1629e67156f..2c2de9e6015c 100644
--- a/src/cdk/testing/tests/webdriver.e2e.spec.ts
+++ b/src/cdk/testing/tests/webdriver.e2e.spec.ts
@@ -4,7 +4,7 @@ import {
waitForAngularReady,
} from '../../testing/selenium-webdriver';
import * as webdriver from 'selenium-webdriver';
-import {crossEnvironmentSpecs} from './cross-environment.spec';
+import {crossEnvironmentSpecs} from './cross-environment-tests';
import {MainComponentHarness} from './harnesses/main-component-harness';
import {Options, setDefaultService, ServiceBuilder} from 'selenium-webdriver/chrome';
import path from 'path';
diff --git a/tslint.json b/tslint.json
index b8c41104390a..c99361b9aadc 100644
--- a/tslint.json
+++ b/tslint.json
@@ -182,6 +182,7 @@
"**/src/cdk/testing/testbed/task-state-zone-interceptor.ts",
"**/src/cdk/testing/testbed/testbed-harness-environment.ts",
"**/src/cdk/testing/tests/testbed.spec.ts",
+ "**/integration/vitest/src/vitest.spec.ts",
// TODO: Tooltip harness still relies on Zone.js.
"**/src/material/tooltip/testing/tooltip-harness.spec.ts",
// TODO: Migrate docs app to zoneless.