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
2 changes: 1 addition & 1 deletion src/cdk/scrolling/scroll-dispatcher.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe('ScrollDispatcher', () => {
scroll.register(scrollable);
scroll.deregister(scrollable);

dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll');
dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll', false);
fixture.detectChanges();

expect(scrollSpy).not.toHaveBeenCalled();
Expand Down
6 changes: 3 additions & 3 deletions src/cdk/testing/testbed/fake-events/element-focus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function triggerFocusChange(element: HTMLElement, event: 'focus' | 'blur') {
element[event]();
element.removeEventListener(event, handler);
if (!eventFired) {
dispatchFakeEvent(element, event);
dispatchFakeEvent(element, event, false);
}
}

Expand All @@ -28,8 +28,8 @@ function triggerFocusChange(element: HTMLElement, event: 'focus' | 'blur') {
// TODO: Check if this element focus patching is still needed for local testing,
// where browser is not necessarily focused.
export function patchElementFocus(element: HTMLElement) {
element.focus = () => dispatchFakeEvent(element, 'focus');
element.blur = () => dispatchFakeEvent(element, 'blur');
element.focus = () => dispatchFakeEvent(element, 'focus', false);
element.blur = () => dispatchFakeEvent(element, 'blur', false);
}

/** @docs-private */
Expand Down
6 changes: 3 additions & 3 deletions src/cdk/testing/testbed/fake-events/type-in-element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,15 @@ export function typeInElement(element: HTMLElement, ...modifiersAndKeys: any[])
if (isInput && key.key && key.key.length === 1) {
if (enterValueIncrementally) {
(element as HTMLInputElement | HTMLTextAreaElement).value += key.key;
dispatchFakeEvent(element, 'input');
dispatchFakeEvent(element, 'input', true);
}
}
dispatchKeyboardEvent(element, 'keyup', key.keyCode, key.key, modifiers, key.code);
}

// Since we weren't dispatching `input` events while sending the keys, we have to do it now.
if (!enterValueIncrementally) {
dispatchFakeEvent(element, 'input');
dispatchFakeEvent(element, 'input', true);
}
}

Expand All @@ -182,5 +182,5 @@ export function typeInElement(element: HTMLElement, ...modifiersAndKeys: any[])
export function clearElement(element: HTMLInputElement | HTMLTextAreaElement) {
triggerFocus(element as HTMLElement);
element.value = '';
dispatchFakeEvent(element, 'input');
dispatchFakeEvent(element, 'input', true);
}
2 changes: 1 addition & 1 deletion src/cdk/testing/testbed/unit-test-element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ export class UnitTestElement implements TestElement {

if (option.selected !== wasSelected) {
hasChanged = true;
dispatchFakeEvent(this.element, 'change');
dispatchFakeEvent(this.element, 'change', true);
}
}

Expand Down
Loading