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/improve es3 compat #2305

Closed
wants to merge 3 commits into from
Closed

Fix/improve es3 compat #2305

wants to merge 3 commits into from

Conversation

boneskull
Copy link
Member

see #2259 for original PR.

@boneskull boneskull added the type: bug a defect, confirmed by a maintainer label Jun 11, 2016
@boneskull boneskull added this to the 2.6.0 milestone Jun 11, 2016
@boneskull
Copy link
Member Author

I'll squash my contribution

@ScottFreeCode
Copy link
Contributor

Looks good to me.

@dasilvacontin
Copy link
Contributor

Any reason JSON is not imported in:

  • lib/reporters/json-stream.js
  • lib/reporters/json-cov.js

?

@ScottFreeCode
Copy link
Contributor

Would they be used in-browser in any way?

@boneskull
Copy link
Member Author

@ScottFreeCode maybe headlessly.

@boneskull
Copy link
Member Author

@ScottFreeCode in the future you can simply rebase the branch onto master, unless you are philosophically opposed to such a thing

@ScottFreeCode
Copy link
Contributor

ScottFreeCode commented Jul 1, 2016

I do generally rebase my own branches rather than merging updates; in this case I just wasn't sure if I should mess with ndhoule's commit.

Either way, looks like this is ready to roll? (Or as ready as it will be once we work out any unrelated Windows/AppVeyor kinks... EDIT: Actually, looks like AppVeyor's not passing simply because it's turned on for the project but hasn't been added to this code yet at all.)

@boneskull boneskull modified the milestones: v3.0.0, 2.6.0 Jul 2, 2016
@boneskull
Copy link
Member Author

fixed in v3.0.0 branch by af9e297, 39ba880 and d7c459b.

@boneskull boneskull closed this Jul 2, 2016
@dasilvacontin dasilvacontin deleted the fix/improve-es3-compat branch August 18, 2016 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: bug a defect, confirmed by a maintainer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants