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.

Sign up for GitHub

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

Jump to bottom

Import jest zone patch #214

Merged
merged 24 commits into from
Dec 13, 2018
Merged

Import jest zone patch #214

merged 24 commits into from
Dec 13, 2018

Conversation

JLHwung
Copy link
Contributor

@JLHwung JLHwung commented Dec 13, 2018 •
edited
Loading

This PR is addressed to thymikee/jest-zone-patch#9 (comment).

For the sake of complete git history, I merge the commits into this repository.

There is another LICENSE issue: The jest-zone-patch is licensed under BSD-3-Clause while this repository under MIT. I keep the original BSD LICENSE on this PR and left it as-is.

thymikee and others added 24 commits March 28, 2017 21:00
@thymikee
Initial commit
cc62d01
@thymikee
Setup package.json
e149f93
@thymikee
Add index.js with a patch
4ad51e9
@thymikee
v0.0.2
f349475
@thymikee
Remove trailing commas
621d54b
@thymikee
Create README.md
cf8aa9c
@thymikee
v0.0.3
7068af5
@thymikee
v0.0.4
26f1232
@thymikee
Add .gitignore
d347513
@thymikee
v0.0.5
d04cced
@thymikee
Wrap ifs in curly brackets
b7b5838
@thymikee
Add zone.js as peerDep
2972987
@thymikee
Ignore node_modules
e99bb6e
@4kochi @thymikee
Bump zone.js peerDependency, use a valid SPDX license expression (thy…
caf977a 
…mikee#4)
@smithad15 @thymikee
fix: allow empty test bodies (thymikee#5)
f4cfb55
@thymikee
v0.0.6
a81ee42
@thymikee
v0.0.7
457631e
@thymikee
v0.0.8
b89a5a5
@JLHwung @thymikee
feat: support jest-each method (thymikee#8)
72ec465 
* feat: support jest-each method

* feat: support fdescribe.each and xdescribe.each

* feat: support xtest and xtest.each

* fix: align signature with jest

* fix: pass through `describe` arguments
@thymikee
v0.0.9
3c8aa04
@JLHwung @thymikee
fix: improper bindings of arguments (thymikee#9)
4466073
@thymikee
v0.0.10
562be0a
@JLHwung
refactor: imported jest-zone-patch as a subtree
58b292d
@JLHwung
refactor: cleanup jest-zone-patch reference
8acde82
@thymikee
Copy link
Owner

Please change the license to MIT, I used BSD-3 because just because I was more familiar with it at the time :D

thymikee
thymikee approved these changes Dec 13, 2018
View reviewed changes
Copy link
Owner

@thymikee thymikee left a comment

Choose a reason for hiding this comment

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

Awesome, thank you so much! ❤️

@thymikee thymikee requested review from wtho and ahnpnl December 13, 2018 13:04
@JLHwung
Copy link
Contributor Author

JLHwung commented Dec 13, 2018

@thymikee Technically speaking we should inform every contributor of jest-zone-patch to ask them if they allow to relicense the code under MIT license.

As this PR is not an emergent one, I think we should stick to a relicensing procedure and then we can merge and go forward.

@thymikee
Copy link
Owner

Ok, so we can leave that for now :)

ahnpnl
ahnpnl approved these changes Dec 13, 2018
View reviewed changes
Copy link
Collaborator

@ahnpnl ahnpnl left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM, thanks 👍 I'll tag this to 7.0.0 too

@ahnpnl ahnpnl modified the milestones: next, 7.0.0 Dec 13, 2018
@JLHwung
Copy link
Contributor Author

JLHwung commented Dec 13, 2018

@thymikee Cool, I will draft an issue on jest-zone-patch to asking allowance from our contributors.

@thymikee
Copy link
Owner

Trying to rebase & merge through GitHub results in conflicts. Are you OK with squashing & merging it? I'm certainly not very interested in the commit history of jest-zone-patch, and it's still gonna be available in the original repository, just archived.

@JLHwung
Copy link
Contributor Author

JLHwung commented Dec 13, 2018

@thymikee rebase and merge might fail on this unusual cases.

Personally I tend to keep the complete history since it helps during git blame. But if you insist on squashing & merging, I am good to go.

@thymikee thymikee merged commit 66987ed into thymikee:master Dec 13, 2018
@thymikee
Copy link
Owner

Thanks!

@JLHwung JLHwung deleted the import-jest-zone-patch branch December 13, 2018 13:33
wtho
wtho reviewed Dec 14, 2018
View reviewed changes
Copy link
Collaborator

@wtho wtho left a comment

Choose a reason for hiding this comment

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

Great this came in!

thymikee added a commit that referenced this pull request Jan 26, 2019
@thymikee
Merge remote-tracking branch 'origin/master' into release/7
c538a9a 
* origin/master:
  Upgraded ts-jest version. (#219)
  docs: add astTransformers in configuration example (#218)
  feat: Import jest-zone-patch (#214)
  chore: Migrate CI config to CircleCI v2 (#212)
  Transform templateUrl, styleUrls and styles everywhere (#211)
  feat: adjust semver range of jest-zone-patch (#209)
  Adjust CHANGELOG (#208)
@krokofant krokofant mentioned this pull request Apr 7, 2019
Merged
thymikee pushed a commit that referenced this pull request Apr 7, 2019
@krokofant @thymikee
📝 Improve docs (#258)
3b88d0c 
* jest-zone-patch is embeded (#214) as a dependency and should not be mentioned as being installed at the same time as this package is not found in package.json, package-lock.json or yarn.lock - and can be presumed missing.
* @types/jest might not be installed so install it explicitly
* Specify how to avoid karma conflicts (ref #233)
  - Otherwise consumers might get `TypeError: Cannot read property 'prototype' of undefined` while jest processes new angular cli projects
@wtho wtho mentioned this pull request Oct 26, 2019
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wtho wtho wtho left review comments

@thymikee thymikee thymikee approved these changes

@ahnpnl ahnpnl ahnpnl approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.0.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@JLHwung @thymikee @wtho @ahnpnl @4kochi @smithad15