Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(focus-monitor): reenter ngzone before emitting #10549

Merged
merged 3 commits into from
May 4, 2018

Conversation

mmalerba
Copy link
Contributor

No description provided.

@mmalerba mmalerba added pr: needs review target: patch This PR is targeted for the next patch release labels Mar 23, 2018
@mmalerba mmalerba requested a review from jelbourn March 23, 2018 21:58
@mmalerba mmalerba requested a review from devversion as a code owner March 23, 2018 21:58
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Mar 23, 2018
expect(buttonElement.innerText).toBe('');
buttonElement.focus();
fixture.detectChanges();
expect(buttonElement.innerText).toBe('program');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than having the test go through change detection, you should be able to assert the same using NgZone:

const spy = jasmine.createSpy('zone spy');

focusMonitor.monitor(element).subscribe(() => {
  spy(NgZone.isInAngularZone());
});

expect(spy).toHaveBeenCalledWith(true);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

neat, didn't know that method existed

Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker and removed pr: needs review labels Mar 26, 2018
@andrewseguin andrewseguin added the presubmit failures This PR has failures in Google's internal presubmit process and cannot be immediately merged label Apr 26, 2018
@mmalerba mmalerba removed the presubmit failures This PR has failures in Google's internal presubmit process and cannot be immediately merged label Apr 26, 2018
@mmalerba
Copy link
Contributor Author

@andrewseguin I think we can just approve the screen diffs

@josephperrott josephperrott merged commit 37193d8 into angular:master May 4, 2018
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants