Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

fix(websocket): fix #824, patch websocket onproperties correctly in PhantomJS#826

Merged
mhevery merged 2 commits intoangular:masterfrom
JiaLiPassion:issue-824
Jul 12, 2017
Merged

fix(websocket): fix #824, patch websocket onproperties correctly in PhantomJS#826
mhevery merged 2 commits intoangular:masterfrom
JiaLiPassion:issue-824

Conversation

@JiaLiPassion
Copy link
Copy Markdown
Collaborator

fix #824.

Patch websocket in phantomjs, from #768, we will check that the patch target's descriptor exists and is configurable. But for websocket, we create a proxySocket for some browsers which don't allow to override those properties. So we need to tell zone.js those proxySocket is also ok to be patched.

Copy link
Copy Markdown
Contributor

@mhevery mhevery left a comment

Choose a reason for hiding this comment

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

Can we have a test for this?

@JiaLiPassion
Copy link
Copy Markdown
Collaborator Author

@mhevery , sure , I will add PhantomJS test.

@JiaLiPassion JiaLiPassion force-pushed the issue-824 branch 2 times, most recently from 4940e59 to 6da774d Compare July 7, 2017 08:35
@JiaLiPassion
Copy link
Copy Markdown
Collaborator Author

@mhevery , I have added phantomjs test and added it to travis. I have confirmed without this PR, websocket test will fail in phantomjs test, please review.

@mhevery mhevery merged commit 273cb85 into angular:master Jul 12, 2017
@JiaLiPassion JiaLiPassion deleted the issue-824 branch July 13, 2017 04:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

PhantomJS fails to execute tests when using websockets, introduced in #768

3 participants